diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d05c0ca..19f7179a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ## Change Log +### 0.20.4: December 07, 2021 +- Enhancement: Weight all in one insertion (#230, Thank you @chaptergy) +- Enhancement: Added turkish translation (Thank you @Gokhungoktas) +- Bug: Fixed crash on Body Measure import (#240) +- Bug: Fixed pending record time (#232, Thank you @hhpmmd) +- Bug: Fixed import files being unselectable (#224) + ### 0.20.3: September 09, 2021 - Bug: Fixed bug introduced on 0.20.2 on muscles list (#220, Thank you @MatthewRFennell). Muscles created on 0.20.2 exclusively might need to be manually corrected by user. diff --git a/app/build.gradle b/app/build.gradle index 8f4fd24a..fe9f2978 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,8 +8,8 @@ android { applicationId "com.easyfitness" minSdkVersion 21 targetSdkVersion 30 - versionCode 60 - versionName "0.20.3" + versionCode 61 + versionName "0.20.4" vectorDrawables.useSupportLibrary true } diff --git a/app/src/main/java/com/easyfitness/DAO/CVSManager.java b/app/src/main/java/com/easyfitness/DAO/CVSManager.java index c756a0dd..2bfedf87 100644 --- a/app/src/main/java/com/easyfitness/DAO/CVSManager.java +++ b/app/src/main/java/com/easyfitness/DAO/CVSManager.java @@ -200,7 +200,6 @@ private boolean exportBodyMeasures(Profile pProfile, String destFolder) { cvsOutput.write(DAOBodyMeasure.DATE); cvsOutput.write("bodypart_label"); cvsOutput.write(DAOBodyMeasure.MEASURE); - cvsOutput.write(DAOBodyMeasure.UNIT); cvsOutput.write(DAOBodyMeasure.PROFIL_KEY); cvsOutput.write(DAOBodyMeasure.UNIT); cvsOutput.endRecord(); @@ -213,9 +212,8 @@ private boolean exportBodyMeasures(Profile pProfile, String destFolder) { BodyPart bp = daoBodyPart.getBodyPart(bodyMeasures.get(i).getBodyPartID()); cvsOutput.write(bp.getName(mContext)); // Write the full name of the BodyPart cvsOutput.write(Float.toString(bodyMeasures.get(i).getBodyMeasure().getValue())); - cvsOutput.write(Integer.toString(bodyMeasures.get(i).getBodyMeasure().getUnit().ordinal())); cvsOutput.write(Long.toString(bodyMeasures.get(i).getProfileID())); - cvsOutput.write(bodyMeasures.get(i).getUnit().toString()); + cvsOutput.write(bodyMeasures.get(i).getBodyMeasure().getUnit().toString()); cvsOutput.endRecord(); } diff --git a/app/src/main/java/com/easyfitness/bodymeasures/BodyPartListAdapter.java b/app/src/main/java/com/easyfitness/bodymeasures/BodyPartListAdapter.java index 628054ca..3f005a89 100644 --- a/app/src/main/java/com/easyfitness/bodymeasures/BodyPartListAdapter.java +++ b/app/src/main/java/com/easyfitness/bodymeasures/BodyPartListAdapter.java @@ -69,7 +69,7 @@ public View getView(int position, View convertView, ViewGroup parent) { viewHolder.txtName.setText(dataModel.getName(getContext())); if (dataModel.getLastMeasure() != null) - viewHolder.txtLastMeasure.setText(String.valueOf(dataModel.getLastMeasure().getBodyMeasure())); + viewHolder.txtLastMeasure.setText(String.valueOf(dataModel.getLastMeasure().getBodyMeasure().getValue())); else viewHolder.txtLastMeasure.setText("-"); if (!dataModel.getCustomPicture().isEmpty()) { diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index c6f49f1f..e4fd7b17 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -288,4 +288,5 @@ Selhat Aktualizujte program. Licence: + Musíte poskytnout váhu, abyste přidali více hodnot diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 1497edc2..56175cf8 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -293,4 +293,5 @@ Fallar Actualizar el programa Licencia: + Tienes que proporcionar un peso para agregar múltiples valores. diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 6e142a56..ea5cb481 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -281,4 +281,5 @@ Échouer Mettre à jour le programme Licence: + Vous devez fournir un poids pour ajouter plusieurs valeurs diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index d802b99d..2867f2c3 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -303,4 +303,5 @@ Fallire Aggiorna il programma Licenza: + Devi fornire un peso per aggiungere più valori diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 127c9ef2..08f734bb 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -270,4 +270,5 @@ Midje Vekt spor Programliste + Du må gi vekt for å legge til flere verdier diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 6ec942eb..e439a0d4 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -288,4 +288,5 @@ Mislukking Werk het programma bij Licentie: + Je moet een gewicht geven om meerdere waarden toe te voegen diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index e30249e7..e0aebd83 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -302,4 +302,5 @@ Falhar Atualize o programa Licença: + Você tem que fornecer um peso para adicionar vários valores diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index c5c61406..ceab4f26 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -268,4 +268,5 @@ Провал Обновите программу Лицензия: + Вы должны предоставить вес, чтобы добавить несколько значений diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index ac4af25a..4311294e 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -268,4 +268,6 @@ Uyarı Emin misin\? Onayla - \ No newline at end of file + Birden fazla değer eklemek için bir ağırlık vermeniz gerekir. + Lisans: + diff --git a/app/src/main/res/values/about.xml b/app/src/main/res/values/about.xml index 09251200..1aacc6f8 100644 --- a/app/src/main/res/values/about.xml +++ b/app/src/main/res/values/about.xml @@ -11,10 +11,12 @@ fastnfitnessapp@gmail.com Revision History: \n -0.20.4: December 06, 2021 \n - \t- Bug: Fixed crash on Body Measure import (#240) - \t- Bug: Fixed pending record time (#232, Thank you @hhpmmd) - \t- Bug: Fixed import files being unselectable (#224) +0.20.4: December 07, 2021 \n + \t- Enhancement: Weight all in one insertion (#230, Thank you @chaptergy) \n + \t- Enhancement: Added turkish translation (Thank you + \t- Bug: Fixed crash on Body Measure import (#240) \n + \t- Bug: Fixed pending record time (#232, Thank you @hhpmmd) \n + \t- Bug: Fixed import files being unselectable (#224) \n Libraries used in this app: MPAndroidChart (Apache 2.0)