Inconsistent behavior between datetime and date fields when used with…

… year and month-year appearances (getodk#357)
refaqtor · Jan 25, 2017 · 8b96c4b · 8b96c4b
1 parent 22121a7
commit 8b96c4b
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/DateTimeWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/DateTimeWidget.java
@@ -173,12 +173,14 @@ private void hideDayFieldIfNotInFormat(FormEntryPrompt prompt) {
                 this.mDatePicker.setCalendarViewShown(false);
                 this.mDatePicker.setSpinnersShown(true);
             }
+            mTimePicker.setVisibility(GONE);
         } else if ("year".equals(appearance)) {
             hideMonth = true;
             if (Build.VERSION.SDK_INT >= 11) {
                 this.mDatePicker.setCalendarViewShown(false);
                 this.mDatePicker.setSpinnersShown(true);
             }
+            mTimePicker.setVisibility(GONE);
         } else if ("no-calendar".equals(appearance)) {
             if (Build.VERSION.SDK_INT >= 11) {
                 this.mDatePicker.setCalendarViewShown(false);
@@ -286,9 +288,11 @@ public IAnswerData getAnswer() {
         }
         clearFocus();
         DateTime ldt =
-                new DateTime(mDatePicker.getYear(), mDatePicker.getMonth() + 1,
-                        mDatePicker.getDayOfMonth(), mTimePicker.getCurrentHour(),
-                        mTimePicker.getCurrentMinute(), 0);
+                new DateTime(mDatePicker.getYear(),
+                        (!showCalendar && hideMonth) ? 1 : mDatePicker.getMonth() + 1,
+                        (!showCalendar && (hideMonth || hideDay)) ? 1 : mDatePicker.getDayOfMonth(),
+                        (!showCalendar && (hideMonth || hideDay)) ? 0 : mTimePicker.getCurrentHour(),
+                        (!showCalendar && (hideMonth || hideDay)) ? 0 : mTimePicker.getCurrentMinute(), 0);
         //DateTime utc = ldt.withZone(DateTimeZone.forID("UTC"));
         return new DateTimeData(ldt.toDate());
     }