Compare commits

..

4 Commits

Author SHA1 Message Date
0cd8dd973b Bump version to 1.1.1 2016-02-24 18:30:29 -05:00
2898a21157 Disallow empty list of days 2016-02-24 15:58:58 -05:00
0fa25c6701 Internationalize string 2016-02-24 15:58:45 -05:00
843f3b06a1 Update translations 2016-02-24 15:58:12 -05:00
6 changed files with 27 additions and 4 deletions

View File

@@ -2,8 +2,8 @@
<manifest
package="org.isoron.uhabits"
xmlns:android="http://schemas.android.com/apk/res/android"
android:versionCode="6"
android:versionName="1.1.0">
android:versionCode="8"
android:versionName="1.1.1">
<uses-permission
android:name="android.permission.VIBRATE"/>

View File

@@ -7,6 +7,7 @@ import android.content.DialogInterface;
import android.os.Bundle;
import org.isoron.helpers.DateHelper;
import org.isoron.uhabits.R;
public class WeekdayPickerDialog extends DialogFragment
implements DialogInterface.OnMultiChoiceClickListener, DialogInterface.OnClickListener
@@ -34,7 +35,7 @@ public class WeekdayPickerDialog extends DialogFragment
public Dialog onCreateDialog(Bundle savedInstanceState)
{
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setTitle("Select weekdays")
builder.setTitle(R.string.select_weekdays)
.setMultiChoiceItems(DateHelper.getLongDayNames(), selectedDays, this)
.setPositiveButton(android.R.string.yes, this)
.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener()

View File

@@ -43,6 +43,8 @@ import org.isoron.uhabits.R;
import org.isoron.uhabits.dialogs.WeekdayPickerDialog;
import org.isoron.uhabits.models.Habit;
import java.util.Arrays;
public class EditHabitFragment extends DialogFragment
implements OnClickListener, WeekdayPickerDialog.OnWeekdaysPickedListener,
TimePickerDialog.OnTimeSetListener
@@ -318,6 +320,11 @@ public class EditHabitFragment extends DialogFragment
@Override
public void onWeekdaysPicked(boolean[] selectedDays)
{
int count = 0;
for(int i = 0; i < 7; i++)
if(selectedDays[i]) count++;
if(count == 0) Arrays.fill(selectedDays, true);
modifiedHabit.reminderDays = DateHelper.packWeekdayList(selectedDays);
updateReminder();
}

View File

@@ -100,4 +100,8 @@
<string name="delete_habits">Deletar hábitos</string>
<string name="toast_habit_restored">Hábitos restaurados.</string>
<string name="delete_habits_message">Os hábitos escolhidos serão deletados permanentemente. Esta ação não pode ser desfeita.</string>
<string name="weekends">Fim de semana</string>
<string name="any_weekday">Segunda a sexta</string>
<string name="any_day">Qualquer dia</string>
<string name="select_weekdays">Selecionar dias</string>
</resources>

View File

@@ -88,4 +88,14 @@
<string name="show_archived">显示存档的习惯</string>
<string name="settings">设置</string>
<string name="snooze_interval">延迟时间间隔</string>
<string name="any_day">任意</string>
<string name="any_weekday">工做日</string>
<string name="delete_habits">删除</string>
<string name="delete_habits_message">习惯会永久的删除,操作不可恢复</string>
<string name="hint_drag">如果要重新排列习惯,按住习惯的名字拖到想要的位置</string>
<string name="hint_landscape">横过来手机可以看到更多天数的习惯</string>
<string name="hint_title">你知道吗?</string>
<string name="select_weekdays">选择天数</string>
<string name="toast_habit_restored">习惯恢复成功</string>
<string name="weekends">周末</string>
</resources>

View File

@@ -108,8 +108,9 @@
<string name="delete_habits">Delete Habits</string>
<string name="delete_habits_message">The habits will be permanently deleted. This action cannot be undone.</string>
<string name="weekends">Weekends</string>
<string name="any_weekday">Any weekday</string>
<string name="any_weekday">Weekdays</string>
<string name="any_day">Any day</string>
<string name="select_weekdays">Select days</string>
<string-array name="hints">
<item>@string/hint_drag</item>