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

Choose 12/24h according to system settings

Browse Source
This commit is contained in:
Alinson S. Xavier
2016-02-20 07:09:12 -05:00
parent b24a8817b5
commit 1ee3fc79f0
2 changed files with 33 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/org/isoron/helpers/DateHelper.java
View File

@@ -16,6 +16,9 @@
package org.isoron.helpers; package org.isoron.helpers;
import android.content.Context;
import android.text.format.DateFormat;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
@@ -42,6 +45,17 @@ public class DateHelper
return getStartOfDay(DateHelper.getLocalTime()); return getStartOfDay(DateHelper.getLocalTime());
} }
public static String formatTime(Context context, int hours, int minutes)
{
int reminderMilliseconds = (hours * 60 + minutes) * 60 * 1000;
Date date = new Date(reminderMilliseconds);
java.text.DateFormat df = DateFormat.getTimeFormat(context);
df.setTimeZone(TimeZone.getTimeZone("UTC"));
return df.format(date);
}
// public static Date getStartOfDay(Date date) // public static Date getStartOfDay(Date date)
// { // {
// Calendar calendar = Calendar.getInstance(); // Calendar calendar = Calendar.getInstance();

27
app/src/main/java/org/isoron/uhabits/dialogs/EditHabitFragment.java
View File

@@ -16,18 +16,14 @@
package org.isoron.uhabits.dialogs; package org.isoron.uhabits.dialogs;
import org.isoron.helpers.ColorHelper;
import org.isoron.helpers.Command;
import org.isoron.helpers.DialogHelper.OnSavedListener;
import org.isoron.uhabits.R;
import org.isoron.uhabits.models.Habit;
import android.app.DialogFragment; import android.app.DialogFragment;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color; import android.graphics.Color;
import android.graphics.ColorMatrix; import android.graphics.ColorMatrix;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.text.format.DateFormat;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener; import android.view.View.OnClickListener;
@@ -42,6 +38,16 @@ import com.android.datetimepicker.time.RadialPickerLayout;
import com.android.datetimepicker.time.TimePickerDialog; import com.android.datetimepicker.time.TimePickerDialog;
import com.android.datetimepicker.time.TimePickerDialog.OnTimeSetListener; import com.android.datetimepicker.time.TimePickerDialog.OnTimeSetListener;
import org.isoron.helpers.ColorHelper;
import org.isoron.helpers.Command;
import org.isoron.helpers.DateHelper;
import org.isoron.helpers.DialogHelper.OnSavedListener;
import org.isoron.uhabits.R;
import org.isoron.uhabits.models.Habit;
import java.util.Date;
import java.util.TimeZone;
public class EditHabitFragment extends DialogFragment implements OnClickListener public class EditHabitFragment extends DialogFragment implements OnClickListener
{ {
private int mode; private int mode;
@@ -54,6 +60,7 @@ public class EditHabitFragment extends DialogFragment implements OnClickListener
private TextView tvName, tvDescription, tvFreqNum, tvFreqDen, tvInputReminder; private TextView tvName, tvDescription, tvFreqNum, tvFreqDen, tvInputReminder;
private SharedPreferences prefs; private SharedPreferences prefs;
private boolean is24HourMode;
static class SolidColorMatrix extends ColorMatrix static class SolidColorMatrix extends ColorMatrix
{ {
@@ -118,6 +125,8 @@ public class EditHabitFragment extends DialogFragment implements OnClickListener
Bundle args = getArguments(); Bundle args = getArguments();
mode = (Integer) args.get("editMode"); mode = (Integer) args.get("editMode");
is24HourMode = DateFormat.is24HourFormat(getContext());
if(mode == CREATE_MODE) if(mode == CREATE_MODE)
{ {
getDialog().setTitle("Create habit"); getDialog().setTitle("Create habit");
@@ -184,8 +193,8 @@ public class EditHabitFragment extends DialogFragment implements OnClickListener
if(modified_habit.reminder_hour != null) if(modified_habit.reminder_hour != null)
{ {
tvInputReminder.setTextColor(Color.BLACK); tvInputReminder.setTextColor(Color.BLACK);
tvInputReminder.setText(String.format("%02d:%02d", modified_habit.reminder_hour, tvInputReminder.setText(DateHelper.formatTime(getActivity(),
modified_habit.reminder_min)); modified_habit.reminder_hour, modified_habit.reminder_min));
} }
else else
{ {
@@ -237,7 +246,7 @@ public class EditHabitFragment extends DialogFragment implements OnClickListener
modified_habit.reminder_min = null; modified_habit.reminder_min = null;
updateReminder(); updateReminder();
} }
}, default_hour, default_min, true); }, default_hour, default_min, is24HourMode);
timePicker.show(getFragmentManager(), "timePicker"); timePicker.show(getFragmentManager(), "timePicker");
} }