From 2a463e9c4a1ddcb34b1efee74867810b03351aff Mon Sep 17 00:00:00 2001
From: Przemek Zygmunt <p.zygmunt@acsoftware.pl>
Date: Thu, 5 Mar 2020 12:43:21 +0100
Subject: [PATCH 1/3] Heat meter support. Closes #155

---
 .../main/java/org/supla/android/db/Channel.java |   3 +++
 .../java/org/supla/android/db/ChannelBase.java  |   7 +++++++
 .../java/org/supla/android/lib/SuplaConst.java  |   1 +
 .../supla/android/listview/ChannelLayout.java   |   4 +++-
 .../supla/android/listview/ChannelListView.java |   3 +++
 app/src/main/res/drawable/heatmeter.png         | Bin 0 -> 14021 bytes
 app/src/main/res/values-cs/strings.xml          |   1 +
 app/src/main/res/values-de/strings.xml          |   2 ++
 app/src/main/res/values-el/strings.xml          |   2 ++
 app/src/main/res/values-es/strings.xml          |   2 ++
 app/src/main/res/values-fr/strings.xml          |   2 ++
 app/src/main/res/values-hu/strings.xml          |   4 +++-
 app/src/main/res/values-it/strings.xml          |   2 ++
 app/src/main/res/values-lt/strings.xml          |   2 ++
 app/src/main/res/values-nb/strings.xml          |   2 ++
 app/src/main/res/values-nl/strings.xml          |   2 ++
 app/src/main/res/values-pl/strings.xml          |   2 ++
 app/src/main/res/values-pt/strings.xml          |   2 ++
 app/src/main/res/values-ro/strings.xml          |   4 +++-
 app/src/main/res/values-ru/strings.xml          |   1 +
 app/src/main/res/values-sk-rSK/strings.xml      |   2 ++
 app/src/main/res/values-sl/strings.xml          |   2 ++
 app/src/main/res/values/strings.xml             |   3 +++
 23 files changed, 52 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/drawable/heatmeter.png

diff --git a/app/src/main/java/org/supla/android/db/Channel.java b/app/src/main/java/org/supla/android/db/Channel.java
index db2f7588a..c7a154943 100644
--- a/app/src/main/java/org/supla/android/db/Channel.java
+++ b/app/src/main/java/org/supla/android/db/Channel.java
@@ -277,6 +277,9 @@ public String getUnit() {
                 case SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER:
                     dUnit = "m\u00B3";
                     break;
+                case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER:
+                    dUnit = "GJ";
+                    break;
             }
             return getUnit(dUnit);
         }
diff --git a/app/src/main/java/org/supla/android/db/ChannelBase.java b/app/src/main/java/org/supla/android/db/ChannelBase.java
index 0a302c118..1d7adad7b 100644
--- a/app/src/main/java/org/supla/android/db/ChannelBase.java
+++ b/app/src/main/java/org/supla/android/db/ChannelBase.java
@@ -224,6 +224,9 @@ public static String getFunctionName(int func, Context context) {
             case SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER:
                 idx = R.string.channel_func_watermeter;
                 break;
+            case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER:
+                idx = R.string.channel_func_heatmeter;
+                break;
             case SuplaConst.SUPLA_CHANNELFNC_THERMOSTAT:
                 idx = R.string.channel_func_thermostat;
                 break;
@@ -498,6 +501,10 @@ && getFunc() != SuplaConst.SUPLA_CHANNELFNC_HUMIDITYANDTEMPERATURE)
                 img_idx = R.drawable.watermeter;
                 break;
 
+            case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER:
+                img_idx = R.drawable.heatmeter;
+                break;
+
             case SuplaConst.SUPLA_CHANNELFNC_THERMOSTAT:
                 switch (getAltIcon()) {
                     case 1:
diff --git a/app/src/main/java/org/supla/android/lib/SuplaConst.java b/app/src/main/java/org/supla/android/lib/SuplaConst.java
index 15c9b0098..a2cf4e472 100644
--- a/app/src/main/java/org/supla/android/lib/SuplaConst.java
+++ b/app/src/main/java/org/supla/android/lib/SuplaConst.java
@@ -90,6 +90,7 @@ public class SuplaConst {
     public final static int SUPLA_CHANNELFNC_IC_ELECTRICITY_METER          = 315;
     public final static int SUPLA_CHANNELFNC_IC_GAS_METER                  = 320;
     public final static int SUPLA_CHANNELFNC_IC_WATER_METER                = 330;
+    public final static int SUPLA_CHANNELFNC_IC_HEAT_METER                 = 340;
     public final static int SUPLA_CHANNELFNC_THERMOSTAT                    = 400;
     public final static int SUPLA_CHANNELFNC_THERMOSTAT_HEATPOL_HOMEPLUS   = 410;
     public final static int SUPLA_CHANNELFNC_VALVE_OPENCLOSE               = 500;
diff --git a/app/src/main/java/org/supla/android/listview/ChannelLayout.java b/app/src/main/java/org/supla/android/listview/ChannelLayout.java
index 82f823403..25246d27c 100644
--- a/app/src/main/java/org/supla/android/listview/ChannelLayout.java
+++ b/app/src/main/java/org/supla/android/listview/ChannelLayout.java
@@ -245,7 +245,8 @@ private void SetDimensions() {
                     || mFunc == SuplaConst.SUPLA_CHANNELFNC_ELECTRICITY_METER
                     || mFunc == SuplaConst.SUPLA_CHANNELFNC_IC_ELECTRICITY_METER
                     || mFunc == SuplaConst.SUPLA_CHANNELFNC_IC_GAS_METER
-                    || mFunc == SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER) {
+                    || mFunc == SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER
+                    || mFunc == SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER) {
 
                 width *= 2.8;
 
@@ -974,6 +975,7 @@ public void setChannelData(ChannelBase cbase) {
                 case SuplaConst.SUPLA_CHANNELFNC_IC_ELECTRICITY_METER:
                 case SuplaConst.SUPLA_CHANNELFNC_IC_GAS_METER:
                 case SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER:
+                case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER:
                 case SuplaConst.SUPLA_CHANNELFNC_THERMOMETER:
                 case SuplaConst.SUPLA_CHANNELFNC_HUMIDITYANDTEMPERATURE:
                 case SuplaConst.SUPLA_CHANNELFNC_THERMOSTAT:
diff --git a/app/src/main/java/org/supla/android/listview/ChannelListView.java b/app/src/main/java/org/supla/android/listview/ChannelListView.java
index d909202e4..d625332d4 100644
--- a/app/src/main/java/org/supla/android/listview/ChannelListView.java
+++ b/app/src/main/java/org/supla/android/listview/ChannelListView.java
@@ -140,6 +140,7 @@ private DetailLayout getDetailLayout(ChannelBase cbase) {
                 case SuplaConst.SUPLA_CHANNELFNC_IC_ELECTRICITY_METER:
                 case SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER:
                 case SuplaConst.SUPLA_CHANNELFNC_IC_GAS_METER:
+                case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER:
 
                     // TODO: Remove channel type checking in future versions. Check function instead of type. # 140-issue
                     if (cbase.getType() == SuplaConst.SUPLA_CHANNELTYPE_IMPULSE_COUNTER) {
@@ -197,6 +198,8 @@ private DetailLayout getDetailLayout(ChannelBase cbase) {
                 case SuplaConst.SUPLA_CHANNELFNC_IC_ELECTRICITY_METER:
                 case SuplaConst.SUPLA_CHANNELFNC_IC_GAS_METER:
                 case SuplaConst.SUPLA_CHANNELFNC_IC_WATER_METER:
+                case SuplaConst.SUPLA_CHANNELFNC_IC_HEAT_METER:
+
                     // TODO: Remove channel type checking in future versions. Check function instead of type. # 140-issue
                     if (cbase.getType() == SuplaConst.SUPLA_CHANNELTYPE_IMPULSE_COUNTER) {
                         mDetailLayout = new ChannelDetailIC(getContext(), this);
diff --git a/app/src/main/res/drawable/heatmeter.png b/app/src/main/res/drawable/heatmeter.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e01e2bc1427d1a69935a2365413815ae22f6ade
GIT binary patch
literal 14021
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
D|J~(P

literal 0
HcmV?d00001

diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index b738a3190..4425bdbf0 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -189,4 +189,5 @@
     <string name="yes">Ano</string>
     <string name="no">Ne</string>
 
+    <string name="channel_func_heatmeter">Měřič tepla</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 72420ebaa..c7bc6dad7 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -200,4 +200,6 @@
     <string name="current_production">Produktion im laufenden Monat</string>
     <string name="production_acording_to_phases">Produktion nach Phase</string>
     <string name="enter_superuser_credentials">Geben Sie die Superuser-Anmeldeinformationen ein</string>
+
+    <string name="channel_func_heatmeter">Wärmezähler</string>
 </resources>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 0afdbb306..f1f2e066f 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -204,4 +204,6 @@
     <string name="production_acording_to_phases">Παραγωγή ανάλογα με τις φάσεις</string>
     <string name="current_production">Παραγωγή τον τρέχοντα μήνα</string>
     <string name="enter_superuser_credentials">Καταχωρίστε τα διαπιστευτήρια superuser</string>
+
+    <string name="channel_func_heatmeter">Μετρητής θερμότητας</string>
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 71ba2eb56..9e33da604 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -206,4 +206,6 @@
     <string name="current_production">Producción en el mes actual</string>
     <string name="production_acording_to_phases">Producción según fases</string>
     <string name="enter_superuser_credentials">Entrez les informations d\'identification du superutilisateur</string>
+
+    <string name="channel_func_heatmeter">Medidor de calor</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 48de78c49..815cb4440 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -206,4 +206,6 @@
     <string name="current_production">Production dans le mois courant</string>
     <string name="production_acording_to_phases">Production selon phases</string>
     <string name="enter_superuser_credentials">Entrez les informations d\'identification du superutilisateur</string>
+
+    <string name="channel_func_heatmeter">Compteur de chaleur</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 34d440f8d..b5b0f4476 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -203,5 +203,7 @@
     <string name="hp_error_5">Nincs hálózat megszakítás</string>
     <string name="production_acording_to_phases">Fázis szerinti gyártás</string>
     <string name="current_production">Termelés a folyó hónapban</string>
-    <string name="enter_superuser_credentials">Wprowadź poświadczenia głównego użytkownika</string>
+    <string name="enter_superuser_credentials">Írja be a fő felhasználó hitelesítő adatait</string>
+
+    <string name="channel_func_heatmeter">Hőmérő</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ff0a449be..a3bec9916 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -206,4 +206,6 @@
     <string name="current_production">Produzione del mese corrente</string>
     <string name="production_acording_to_phases">Produzione in base alle fasi</string>
     <string name="enter_superuser_credentials">Immettere le credenziali del superutente</string>
+
+    <string name="channel_func_heatmeter">Contatore di calore</string>
 </resources>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index a01ee93d4..9a2beecfb 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -184,4 +184,6 @@
     <string name="current_production">Gamyba einamąjį mėnesį</string>
     <string name="production_acording_to_phases">Gamyba pagal fazes</string>
     <string name="enter_superuser_credentials">Įveskite pagrindinio vartotojo kredencialus</string>
+
+    <string name="channel_func_heatmeter">Šilumos skaitiklis</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index 79def0eab..464d87179 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -204,4 +204,6 @@
     <string name="production_acording_to_phases">Produksjon i forhold til faser</string>
     <string name="current_production">Produksjon i gjeldende måned</string>
     <string name="enter_superuser_credentials">Skriv inn superbrukerens legitimasjon</string>
+
+    <string name="channel_func_heatmeter">Varmemåler</string>
 </resources>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 3b0cd0f75..61c2114d9 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -204,4 +204,6 @@
     <string name="production_acording_to_phases">Productie door fase</string>
     <string name="current_production">Productie in de huidige maand</string>
     <string name="enter_superuser_credentials">Voer de inloggegevens van de superuser in</string>
+
+    <string name="channel_func_heatmeter">Warmtemeter</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 49d343e48..093dde6f3 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -226,4 +226,6 @@
     <string name="no">Nie</string>
     <string name="channel_func_none">Brak funkcji</string>
 
+    <string name="channel_func_heatmeter">Licznik ciepła</string>
+    <string name="zwave_select_channel">Wybierz kanał mostu z-wave, który chcesz skonfigurować.</string>
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 4a34a64f4..02338e933 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -206,4 +206,6 @@
     <string name="production_acording_to_phases">Produção de acordo com fase</string>
     <string name="current_production">Produção no mês atual</string>
     <string name="enter_superuser_credentials">Digite as credenciais do superusuário</string>
+
+    <string name="channel_func_heatmeter">Medidor de calor</string>
 </resources>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 47442b2e0..ff057d8f6 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -203,5 +203,7 @@
     <string name="hp_error_5">Nu există întreruperi în rețea</string>
     <string name="production_acording_to_phases">Producția conform fazelor</string>
     <string name="current_production">Producția în luna curentă</string>
-    <string name="enter_superuser_credentials">Wprowadź poświadczenia głównego użytkownika</string>
+    <string name="enter_superuser_credentials">Introduceți datele de acreditare ale utilizatorului principal</string>
+
+    <string name="channel_func_heatmeter">Contorul de căldură</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index bc3dc22b2..35cc8d533 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -212,5 +212,6 @@
     <string name="current_production">Производство в текущем месяце</string>
     <string name="enter_superuser_credentials">Введите учетные данные суперпользователя</string>
 
+    <string name="channel_func_heatmeter">Теплосчетчик</string>
 </resources>
 
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index e4a8a928b..54beae96a 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -217,4 +217,6 @@
     <string name="production_acording_to_phases">Výroba podľa fáz</string>
     <string name="current_production">Výroba v aktuálnom mesiaci</string>
     <string name="enter_superuser_credentials">Zadajte poverenia superužívateľa</string>
+
+    <string name="channel_func_heatmeter">Merač tepla</string>
 </resources>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index e968b49bf..b4fc692b6 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -204,4 +204,6 @@
     <string name="production_acording_to_phases">Izdelava v skladu s fazami</string>
     <string name="current_production">Proizvodnja v tekočem mesecu</string>
     <string name="enter_superuser_credentials">Vnesite poverilnice podupravitelja</string>
+
+    <string name="channel_func_heatmeter">Merilnik toplote</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 31890e5e7..3f35ea016 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -224,4 +224,7 @@
     <string translatable="false" name="ok">OK</string>
     <string translatable="false" name="dots">....</string>
 
+    <string name="channel_func_heatmeter">Heat Meter</string>
+    <string translatable="false" name="zwave_select_channel">Select the z-wave bridge channel you want to configure.</string>
+
 </resources>

From 6c434b068cf8f8f25b7cf0e7ff426a41b2681c91 Mon Sep 17 00:00:00 2001
From: Przemek Zygmunt <p.zygmunt@acsoftware.pl>
Date: Thu, 5 Mar 2020 15:21:36 +0100
Subject: [PATCH 2/3] Battery icon changed

---
 app/src/main/res/drawable/battery.png      | Bin 1857 -> 6311 bytes
 app/src/main/res/values-sw600dp/dimens.xml |   2 +-
 app/src/main/res/values/dimens.xml         |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/drawable/battery.png b/app/src/main/res/drawable/battery.png
index dff118b907372d0b44f82572671e495bd9e7e82e..b3f88b55b8bc95f656a2e5319c588ce507561f48 100644
GIT binary patch
literal 6311
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
R=0XPxjOOg=bipAg_TR9L(R=^^

delta 1774
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

diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 20de48c39..e42399e67 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -4,7 +4,7 @@
     <dimen name="channel_layout_height">180dp</dimen>
     <dimen name="channel_layout_button_width">150dp</dimen>
     <dimen name="channel_dot_size">15dp</dimen>
-    <dimen name="channel_state_image_size">30dp</dimen>
+    <dimen name="channel_state_image_size">40dp</dimen>
     <dimen name="channel_btn_text_size">27sp</dimen>
     <dimen name="channel_caption_top_margin">25dp</dimen>
     <dimen name="channel_caption_text_size">17sp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 36865bf56..f4c94ca25 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,7 +8,7 @@
     <dimen name="channel_separator_text_margin">10dp</dimen>
     <dimen name="channel_layout_button_width">100dp</dimen>
     <dimen name="channel_dot_size">10dp</dimen>
-    <dimen name="channel_state_image_size">20dp</dimen>
+    <dimen name="channel_state_image_size">30dp</dimen>
     <dimen name="channel_dot_margin">20dp</dimen>
     <dimen name="channel_btn_text_size">18sp</dimen>
     <dimen name="channel_caption_top_margin">18dp</dimen>

From 17abadd2d212df5c6d3041475e72e2280a829b04 Mon Sep 17 00:00:00 2001
From: Przemek Zygmunt <p.zygmunt@acsoftware.pl>
Date: Thu, 5 Mar 2020 15:23:32 +0100
Subject: [PATCH 3/3] Version increment

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ab3baddbd..adffd7170 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.supla.android"
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionCode 82
-        versionName "2.3.28"
+        versionCode 83
+        versionName "2.3.29"
 
         sourceSets.main {
             jniLibs.srcDir 'src/main/libs'