isoron/loop
1
1
Fork 0
mirror of https://github.com/iSoron/uhabits.git synced 2025-12-06 09:08:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix CSV export in some locales; bump version to 1.7.11 (38)

Browse Source
This commit is contained in:
Alinson S. Xavier
2019-08-10 11:42:25 -05:00
parent 64cc9f78a8
commit 957a5b7c17
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@@ -1,5 +1,9 @@
# Changelog # Changelog
### 1.7.11 (Aug 10, 2019)
* Fix bug that produced corrupted CSV files in some countries
### 1.7.10 (June 15, 2019) ### 1.7.10 (June 15, 2019)
* Fix bug that prevented some devices from showing notifications. * Fix bug that prevented some devices from showing notifications.

4
app/src/main/AndroidManifest.xml
View File

@@ -21,8 +21,8 @@
<manifest <manifest
package="org.isoron.uhabits" package="org.isoron.uhabits"
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="37" android:versionCode="38"
android:versionName="1.7.10"> android:versionName="1.7.11">
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>

4
app/src/main/java/org/isoron/uhabits/io/HabitsCSVExporter.java
View File

@@ -119,7 +119,7 @@ public class HabitsCSVExporter
{ {
String sane = sanitizeFilename(h.getName()); String sane = sanitizeFilename(h.getName());
String habitDirName = String habitDirName =
String.format("%03d %s", allHabits.indexOf(h) + 1, sane); String.format(Locale.US, "%03d %s", allHabits.indexOf(h) + 1, sane);
habitDirName = habitDirName.trim() + "/"; habitDirName = habitDirName.trim() + "/";
new File(exportDirName + habitDirName).mkdirs(); new File(exportDirName + habitDirName).mkdirs();
@@ -202,7 +202,7 @@ public class HabitsCSVExporter
checksWriter.write(String.valueOf(checkmarks.get(j)[i])); checksWriter.write(String.valueOf(checkmarks.get(j)[i]));
checksWriter.write(DELIMITER); checksWriter.write(DELIMITER);
String score = String score =
String.format("%.4f", ((float) scores.get(j)[i]) / Score.MAX_VALUE); String.format(Locale.US, "%.4f", ((float) scores.get(j)[i]) / Score.MAX_VALUE);
scoresWriter.write(score); scoresWriter.write(score);
scoresWriter.write(DELIMITER); scoresWriter.write(DELIMITER);
} }

2
app/src/main/java/org/isoron/uhabits/models/ScoreList.java
View File

@@ -173,7 +173,7 @@ public abstract class ScoreList implements Iterable<Score>
{ {
String timestamp = dateFormat.format(s.getTimestamp()); String timestamp = dateFormat.format(s.getTimestamp());
String score = String score =
String.format("%.4f", ((float) s.getValue()) / Score.MAX_VALUE); String.format(Locale.US, "%.4f", ((float) s.getValue()) / Score.MAX_VALUE);
out.write(String.format("%s,%s\n", timestamp, score)); out.write(String.format("%s,%s\n", timestamp, score));
} }
} }