Merge tag 'v1.3.2' into dev

Version 1.3.2
This commit is contained in:
2016-03-18 11:36:48 -04:00
4 changed files with 13 additions and 5 deletions

View File

@@ -1,5 +1,11 @@
# Changelog # Changelog
### 1.3.2 (March 18, 2016)
* Arabic, Italian, Polish, Russian and Swedish translations
* Minor fixes to German and French translations
* Minor bug fixes
### 1.3.1 (March 15, 2016) ### 1.3.1 (March 15, 2016)
* Fixes crash on devices with large screen, such as the Nexus 10 * Fixes crash on devices with large screen, such as the Nexus 10

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="11" android:versionCode="12"
android:versionName="1.3.1"> android:versionName="1.3.2">
<uses-permission android:name="android.permission.VIBRATE"/> <uses-permission android:name="android.permission.VIBRATE"/>

View File

@@ -251,8 +251,10 @@ public class EditHabitFragment extends DialogFragment
{ {
modifiedHabit.name = tvName.getText().toString().trim(); modifiedHabit.name = tvName.getText().toString().trim();
modifiedHabit.description = tvDescription.getText().toString().trim(); modifiedHabit.description = tvDescription.getText().toString().trim();
modifiedHabit.freqNum = Integer.parseInt(tvFreqNum.getText().toString()); String freqNum = tvFreqNum.getText().toString();
modifiedHabit.freqDen = Integer.parseInt(tvFreqDen.getText().toString()); String freqDen = tvFreqDen.getText().toString();
if(!freqNum.isEmpty()) modifiedHabit.freqNum = Integer.parseInt(freqNum);
if(!freqDen.isEmpty()) modifiedHabit.freqDen = Integer.parseInt(freqDen);
if (!validate()) return; if (!validate()) return;

View File

@@ -147,7 +147,7 @@
<TextView <TextView
style="@style/aboutItemStyle" style="@style/aboutItemStyle"
android:text="dalecarlian (Svenska)"/> android:text="Dalecarlian (Svenska)"/>
<TextView <TextView
style="@style/aboutItemStyle" style="@style/aboutItemStyle"