Reversed due time change

Signed-off-by: Jonas Kalderstam <[email protected]>
spacecowboy · Nov 6, 2013 · 271bf99 · 271bf99
1 parent 441bfa7
commit 271bf99
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/NoNonsenseNotes/AndroidManifest.xml b/NoNonsenseNotes/AndroidManifest.xml
@@ -28,7 +28,7 @@
     package="com.nononsenseapps.notepad"
     android:installLocation="internalOnly"
     android:versionCode="103"
-    android:versionName="5.1" >
+    android:versionName="5.1-withduetime" >
 
     <uses-sdk
         android:minSdkVersion="14"

diff --git a/NoNonsenseNotes/src/com/nononsenseapps/notepad/fragments/TaskDetailFragment.java b/NoNonsenseNotes/src/com/nononsenseapps/notepad/fragments/TaskDetailFragment.java
@@ -468,10 +468,10 @@ public void onDateSet(final long time) {
 		mTask.due = localTime.getTimeInMillis();
 		setDueText();
 
-		// Dont ask for time for due date
-		// final TimePickerDialogFragment picker = getTimePickerFragment();
-		// picker.setListener(this);
-		// picker.show(getFragmentManager(), "time");
+		// and ask for time
+		 final TimePickerDialogFragment picker = getTimePickerFragment();
+		 picker.setListener(this);
+		 picker.show(getFragmentManager(), "time");
 	}
 
 	// @Override
@@ -486,7 +486,7 @@ private void setDueText() {
 		}
 		else {
 			// Due date
-			dueDateBox.setText(TimeFormatter.getLocalDateOnlyStringLong(
+			dueDateBox.setText(TimeFormatter.getLocalDateStringLong(
 					getActivity(), mTask.due));
 		}
 	}

diff --git a/NoNonsenseNotes/src/com/nononsenseapps/ui/DateView.java b/NoNonsenseNotes/src/com/nononsenseapps/ui/DateView.java
@@ -52,14 +52,14 @@ public class DateView extends TextView {
 	public DateView(Context context) {
 		super(context);
 		this.mContext = context;
-		mDateFormatter = TimeFormatter.getLocalFormatterShortDateOnly(context);
+		mDateFormatter = TimeFormatter.getLocalFormatterShort(context);
 	}
 
 	@SuppressLint("SimpleDateFormat") public DateView(Context context, AttributeSet attrs) {
 		super(context, attrs);
 		this.mContext = context;
 		try {
-			mDateFormatter = TimeFormatter.getLocalFormatterShortDateOnly(context);
+			mDateFormatter = TimeFormatter.getLocalFormatterShort(context);
 		} catch(Exception e) {
 			// Just to function in view
 			mDateFormatter = new SimpleDateFormat();
@@ -69,7 +69,7 @@ public DateView(Context context) {
 	public DateView(Context context, AttributeSet attrs, int defStyle) {
 		super(context, attrs, defStyle);
 		this.mContext = context;
-		mDateFormatter = TimeFormatter.getLocalFormatterShortDateOnly(context);
+		mDateFormatter = TimeFormatter.getLocalFormatterShort(context);
 	}
 
 	public void setTimeText(final long time) {