From 601dd7e75b2658dee05f0552321e5075fc4b8e2c Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sat, 10 Feb 2018 07:00:20 +0100 Subject: [PATCH 1/5] Discard changes when aborting edit --- .../com/health/openscale/gui/activities/DataEntryActivity.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java index ef9288eb..c6612694 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java @@ -267,6 +267,9 @@ public class DataEntryActivity extends AppCompatActivity { public void onBackPressed() { if (measurementViewMode == MeasurementView.MeasurementViewMode.EDIT) { setViewMode(MeasurementView.MeasurementViewMode.VIEW); + if (isDirty) { + scaleMeasurement = null; + } updateOnView(); } else { From 24966672506bb257d95cfd59f613f52ed9234b2e Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sat, 10 Feb 2018 07:04:23 +0100 Subject: [PATCH 2/5] Compare id instead of item string --- .../openscale/gui/activities/DataEntryActivity.java | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java index c6612694..1704d24c 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java @@ -191,15 +191,13 @@ public class DataEntryActivity extends AppCompatActivity { final Drawable wrapped = DrawableCompat.wrap(drawable.mutate()); - String menuTitle = item.getTitle().toString(); - - if (menuTitle == getResources().getString(R.string.save)) { + if (item.getItemId() == R.id.saveButton) { DrawableCompat.setTint(wrapped, Color.parseColor("#FFFFFF")); - } else if (menuTitle == getResources().getString(R.string.edit)) { + } else if (item.getItemId() == R.id.editButton) { DrawableCompat.setTint(wrapped, Color.parseColor("#99CC00")); - } else if (menuTitle == getResources().getString(R.string.toggle_expand)) { + } else if (item.getItemId() == R.id.expandButton) { DrawableCompat.setTint(wrapped, Color.parseColor("#FFBB33")); - } else if (menuTitle == getResources().getString(R.string.label_delete)) { + } else if (item.getItemId() == R.id.deleteButton) { DrawableCompat.setTint(wrapped, Color.parseColor("#FF4444")); } From 9c0573dc5cb486ab641cacdf735f3fbbe4513499 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sat, 10 Feb 2018 07:07:54 +0100 Subject: [PATCH 3/5] Don't enable left/right button if at start/end --- .../health/openscale/gui/activities/DataEntryActivity.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java index 1704d24c..10f2c512 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java @@ -345,8 +345,8 @@ public class DataEntryActivity extends AppCompatActivity { btnLeft.setVisibility(View.VISIBLE); btnRight.setVisibility(View.VISIBLE); - btnLeft.setEnabled(true); - btnRight.setEnabled(true); + btnLeft.setEnabled(previousMeasurement != null); + btnRight.setEnabled(nextMeasurement != null); dateTimeVisibility = View.GONE; break; From 735e6bf8c3b0ca2f3f1d87e52f53bb8944e64513 Mon Sep 17 00:00:00 2001 From: Erik Johansson Date: Sat, 10 Feb 2018 07:11:20 +0100 Subject: [PATCH 4/5] Avoid having left/right buttons jump back and forth Set a min width so that once it has grown it can't get smaller again. --- .../com/health/openscale/gui/activities/DataEntryActivity.java | 1 + 1 file changed, 1 insertion(+) diff --git a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java index 10f2c512..d4e3a475 100644 --- a/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java +++ b/android_app/app/src/main/java/com/health/openscale/gui/activities/DataEntryActivity.java @@ -328,6 +328,7 @@ public class DataEntryActivity extends AppCompatActivity { measurement.loadFrom(scaleMeasurement, previousMeasurement); } + txtDataNr.setMinWidth(txtDataNr.getWidth()); txtDataNr.setText(DateFormat.getDateTimeInstance( DateFormat.LONG, DateFormat.SHORT).format(scaleMeasurement.getDateTime())); } From 8d7f573f83e61c87f461beedde666da96945f558 Mon Sep 17 00:00:00 2001 From: OliE Date: Sat, 10 Feb 2018 07:24:18 +0100 Subject: [PATCH 5/5] set app name untranslatable and remove full stops of some sentences. --- android_app/app/src/main/res/values-ca/strings.xml | 7 +++---- android_app/app/src/main/res/values-de/strings.xml | 1 - android_app/app/src/main/res/values-es/strings.xml | 5 ++--- android_app/app/src/main/res/values-fr/strings.xml | 1 - android_app/app/src/main/res/values-ja/strings.xml | 1 - android_app/app/src/main/res/values-nl/strings.xml | 3 +-- android_app/app/src/main/res/values-pl/strings.xml | 1 - android_app/app/src/main/res/values-pt/strings.xml | 5 ++--- android_app/app/src/main/res/values-sk/strings.xml | 7 +++---- android_app/app/src/main/res/values-sv/strings.xml | 5 ++--- android_app/app/src/main/res/values-tr/strings.xml | 5 ++--- android_app/app/src/main/res/values/strings.xml | 8 ++++---- 12 files changed, 19 insertions(+), 30 deletions(-) diff --git a/android_app/app/src/main/res/values-ca/strings.xml b/android_app/app/src/main/res/values-ca/strings.xml index 5b27ab53..7f430f84 100644 --- a/android_app/app/src/main/res/values-ca/strings.xml +++ b/android_app/app/src/main/res/values-ca/strings.xml @@ -1,7 +1,6 @@ - openScale General Gràfica Taula @@ -100,7 +99,7 @@ Eliminar totes les dades de Bluetooth Les dades de Bluetooth s\'han eliminat Intentant connectar a - S\'ha perdut la connexió Bluetooth. + S\'ha perdut la connexió Bluetooth No s\'ha trobat un dispositiu Bluetooth La connexió s\'ha fet correctament Inicialitzar el dispositiu Bluetooth @@ -177,8 +176,8 @@ Línia de l\'objectiu - S\'ha assolit el nombre màxim d\'usuaris simultanis de la bàscula. - Si us plau, pose\'s descalç en la bàscula per prendre mesures de referència. + S\'ha assolit el nombre màxim d\'usuaris simultanis de la bàscula + Si us plau, pose\'s descalç en la bàscula per prendre mesures de referència Mesura del pes: %.2f obri tanca diff --git a/android_app/app/src/main/res/values-de/strings.xml b/android_app/app/src/main/res/values-de/strings.xml index 370888cd..199d2ca4 100644 --- a/android_app/app/src/main/res/values-de/strings.xml +++ b/android_app/app/src/main/res/values-de/strings.xml @@ -1,6 +1,5 @@ - openScale Einstellungen Fehler Körpergröße ist erforderlich Fehler beim Exportieren diff --git a/android_app/app/src/main/res/values-es/strings.xml b/android_app/app/src/main/res/values-es/strings.xml index 66169302..368d0acd 100644 --- a/android_app/app/src/main/res/values-es/strings.xml +++ b/android_app/app/src/main/res/values-es/strings.xml @@ -1,7 +1,6 @@ - openScale General Gráfica Tabla @@ -177,8 +176,8 @@ Línea del objetivo - Número máximo de usuarios de báscula concurrentes alcanzado. - Por favor, póngase descalzo en la báscula para tomar medidas de referencia. + Número máximo de usuarios de báscula concurrentes alcanzado + Por favor, póngase descalzo en la báscula para tomar medidas de referencia Medición de peso: %.2f diff --git a/android_app/app/src/main/res/values-fr/strings.xml b/android_app/app/src/main/res/values-fr/strings.xml index 8988b076..2fe17d70 100644 --- a/android_app/app/src/main/res/values-fr/strings.xml +++ b/android_app/app/src/main/res/values-fr/strings.xml @@ -1,7 +1,6 @@ - openScale Vue d\'ensemble Diagramme Tableau diff --git a/android_app/app/src/main/res/values-ja/strings.xml b/android_app/app/src/main/res/values-ja/strings.xml index 829998e8..7ebe3990 100644 --- a/android_app/app/src/main/res/values-ja/strings.xml +++ b/android_app/app/src/main/res/values-ja/strings.xml @@ -1,6 +1,5 @@ - openScale ユーザー 早見表 図表 diff --git a/android_app/app/src/main/res/values-nl/strings.xml b/android_app/app/src/main/res/values-nl/strings.xml index e7ab3544..2cb976b7 100644 --- a/android_app/app/src/main/res/values-nl/strings.xml +++ b/android_app/app/src/main/res/values-nl/strings.xml @@ -1,7 +1,6 @@ - openScale Overzicht Grafieken Tabel @@ -179,7 +178,7 @@ Doel lijn - Maximumaantal gelijktijdige schaalgebruikers bereikt. + Maximumaantal gelijktijdige schaalgebruikers bereikt Stapt alsjeblieft met blote voeten op de weegschaal voor een meting. Gewicht meten: %.2f diff --git a/android_app/app/src/main/res/values-pl/strings.xml b/android_app/app/src/main/res/values-pl/strings.xml index 6cbae2b5..0400b093 100644 --- a/android_app/app/src/main/res/values-pl/strings.xml +++ b/android_app/app/src/main/res/values-pl/strings.xml @@ -1,7 +1,6 @@ - openScale Przegląd Wykresy Tabele diff --git a/android_app/app/src/main/res/values-pt/strings.xml b/android_app/app/src/main/res/values-pt/strings.xml index 733f1acd..5d5382d3 100644 --- a/android_app/app/src/main/res/values-pt/strings.xml +++ b/android_app/app/src/main/res/values-pt/strings.xml @@ -1,6 +1,5 @@ - openScale Sexta Segunda Sábado @@ -17,7 +16,7 @@ Erro: circunferência do quadril é obrigatória Erro ao importar Erro: Peso inicial é obrigatório - Numero máximo de balanças concorrentes alcançado. + Numero máximo de balanças concorrentes alcançado Erro: Nome de usuário é obrigatório Valor não está no intervalo Valor é obrigatório @@ -50,7 +49,7 @@ em Nenhum usuário existe. Por favor, crie um novo usuário em Configurações. Definir nome de arquivo para - Por favor suba na balança para medidas de referência. + Por favor suba na balança para medidas de referência Sua gordura corporal foi Sua circunferência de quadril foi Sua porcentagem de massa muscular foi diff --git a/android_app/app/src/main/res/values-sk/strings.xml b/android_app/app/src/main/res/values-sk/strings.xml index c24f70cb..decb853b 100644 --- a/android_app/app/src/main/res/values-sk/strings.xml +++ b/android_app/app/src/main/res/values-sk/strings.xml @@ -1,7 +1,6 @@ - openScale - Prehľad + Prehľad Graf Tabuľka Štatistiky @@ -136,7 +135,7 @@ Vývoj úbytku hmotnosti Stupeň polynomiálnej regresie Cieľová línia - Dosiahli ste maximálny počet viacerých používateľov. - Prosím, postavte sa na váhu pre referenčné meranie. + Dosiahli ste maximálny počet viacerých používateľov + Prosím, postavte sa na váhu pre referenčné meranie Nameraná hmotnosť: %.2f diff --git a/android_app/app/src/main/res/values-sv/strings.xml b/android_app/app/src/main/res/values-sv/strings.xml index 1197f145..1f3cfeea 100644 --- a/android_app/app/src/main/res/values-sv/strings.xml +++ b/android_app/app/src/main/res/values-sv/strings.xml @@ -1,6 +1,5 @@ - openScale Översikt Graf Tabell @@ -152,8 +151,8 @@ Regressionsviktlinje Regressions-polynom-gradtal Mållinje - Maximalt antal samtidiga våganvändare har nåtts. - Kliv upp barfota på vågen för referensmätningar. + Maximalt antal samtidiga våganvändare har nåtts + Kliv upp barfota på vågen för referensmätningar Mäter vikt: %.2f öppna stäng diff --git a/android_app/app/src/main/res/values-tr/strings.xml b/android_app/app/src/main/res/values-tr/strings.xml index e3f813a4..4d4853aa 100644 --- a/android_app/app/src/main/res/values-tr/strings.xml +++ b/android_app/app/src/main/res/values-tr/strings.xml @@ -1,6 +1,5 @@ - openScale Genel Bakýþ Çizelge Tablo @@ -175,7 +174,7 @@ Hedef çizgisi - Maksimum eþzamanlý ölçekli kullanýcý sayýsý ulaþtý. - Referans ölçümleri için lütfen ölçekte çýplak ayakla adým atýn. + Maksimum eþzamanlý ölçekli kullanýcý sayýsý ulaþtý + Referans ölçümleri için lütfen ölçekte çýplak ayakla adým atýn Aðýrlýðý ölçme: %.2f \ No newline at end of file diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml index d4ca103f..ab138186 100644 --- a/android_app/app/src/main/res/values/strings.xml +++ b/android_app/app/src/main/res/values/strings.xml @@ -1,7 +1,7 @@ - openScale + openScale Overview Chart Table @@ -108,7 +108,7 @@ Clear all Bluetooth data Bluetooth data was successful cleared Trying to connect to - Lost Bluetooth connection. + Lost Bluetooth connection No Bluetooth device found No Bluetooth device selected Connection successful established @@ -199,8 +199,8 @@ Ok, sure No, thanks - Maximum number of concurrent scale users reached. - Please step barefoot on the scale for reference measurements. + Maximum number of concurrent scale users reached + Please step barefoot on the scale for reference measurements Measuring weight: %.2f An unexpected error occurred.\n\nPlease create a new issue including the detailed error details on\nhttps://github.com/oliexdev/openScale/issues