Merge pull request getodk#6 from meletis/master

SurveyCTO: Fix for issue 1169
miklobit · Oct 13, 2015 · 706be8a · 706be8a
2 parents bc242a1 + a86573c
commit 706be8a
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 52 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
@@ -14,6 +14,7 @@
 
 package org.odk.collect.android.widgets;
 
+import android.content.res.Resources;
 import org.javarosa.core.model.data.DateTimeData;
 import org.javarosa.core.model.data.IAnswerData;
 import org.javarosa.form.api.FormEntryPrompt;
@@ -189,32 +190,36 @@ private void hideDayFieldIfNotInFormat(FormEntryPrompt prompt) {
         }
 
         if ( hideMonth || hideDay ) {
-		    for (Field datePickerDialogField : this.mDatePicker.getClass().getDeclaredFields()) {
-		        if ("mDayPicker".equals(datePickerDialogField.getName()) ||
-		                "mDaySpinner".equals(datePickerDialogField.getName())) {
-		            datePickerDialogField.setAccessible(true);
-		            Object dayPicker = new Object();
-		            try {
-		                dayPicker = datePickerDialogField.get(this.mDatePicker);
-		            } catch (Exception e) {
-		                e.printStackTrace();
-		            }
-		            ((View) dayPicker).setVisibility(View.GONE);
-		        }
-		        if ( hideMonth ) {
-			        if ("mMonthPicker".equals(datePickerDialogField.getName()) ||
-			                "mMonthSpinner".equals(datePickerDialogField.getName())) {
-			            datePickerDialogField.setAccessible(true);
-			            Object monthPicker = new Object();
-			            try {
-			            	monthPicker = datePickerDialogField.get(this.mDatePicker);
-			            } catch (Exception e) {
-			                e.printStackTrace();
-			            }
-			            ((View) monthPicker).setVisibility(View.GONE);
-			        }
-		        }
-		    }
+            mDatePicker.findViewById(Resources.getSystem().getIdentifier("day", "id", "android")).setVisibility(View.GONE);
+            if (hideMonth) {
+                mDatePicker.findViewById(Resources.getSystem().getIdentifier("month", "id", "android")).setVisibility(View.GONE);
+            }
+//		    for (Field datePickerDialogField : this.mDatePicker.getClass().getDeclaredFields()) {
+//		        if ("mDayPicker".equals(datePickerDialogField.getName()) ||
+//		                "mDaySpinner".equals(datePickerDialogField.getName())) {
+//		            datePickerDialogField.setAccessible(true);
+//		            Object dayPicker = new Object();
+//		            try {
+//		                dayPicker = datePickerDialogField.get(this.mDatePicker);
+//		            } catch (Exception e) {
+//		                e.printStackTrace();
+//		            }
+//		            ((View) dayPicker).setVisibility(View.GONE);
+//		        }
+//		        if ( hideMonth ) {
+//			        if ("mMonthPicker".equals(datePickerDialogField.getName()) ||
+//			                "mMonthSpinner".equals(datePickerDialogField.getName())) {
+//			            datePickerDialogField.setAccessible(true);
+//			            Object monthPicker = new Object();
+//			            try {
+//			            	monthPicker = datePickerDialogField.get(this.mDatePicker);
+//			            } catch (Exception e) {
+//			                e.printStackTrace();
+//			            }
+//			            ((View) monthPicker).setVisibility(View.GONE);
+//			        }
+//		        }
+//		    }
         }
     }
 

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/DateWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/DateWidget.java
@@ -18,6 +18,7 @@
 import java.util.Calendar;
 import java.util.Date;
 
+import android.content.res.Resources;
 import org.javarosa.core.model.data.DateData;
 import org.javarosa.core.model.data.IAnswerData;
 import org.javarosa.form.api.FormEntryPrompt;
@@ -166,32 +167,36 @@ private void hideDayFieldIfNotInFormat(FormEntryPrompt prompt) {
         }
 
         if ( hideMonth || hideDay ) {
-		    for (Field datePickerDialogField : this.mDatePicker.getClass().getDeclaredFields()) {
-		        if ("mDayPicker".equals(datePickerDialogField.getName()) ||
-		                "mDaySpinner".equals(datePickerDialogField.getName())) {
-		            datePickerDialogField.setAccessible(true);
-		            Object dayPicker = new Object();
-		            try {
-		                dayPicker = datePickerDialogField.get(this.mDatePicker);
-		            } catch (Exception e) {
-		                e.printStackTrace();
-		            }
-		            ((View) dayPicker).setVisibility(View.GONE);
-		        }
-		        if ( hideMonth ) {
-			        if ("mMonthPicker".equals(datePickerDialogField.getName()) ||
-			                "mMonthSpinner".equals(datePickerDialogField.getName())) {
-			            datePickerDialogField.setAccessible(true);
-			            Object monthPicker = new Object();
-			            try {
-			            	monthPicker = datePickerDialogField.get(this.mDatePicker);
-			            } catch (Exception e) {
-			                e.printStackTrace();
-			            }
-			            ((View) monthPicker).setVisibility(View.GONE);
-			        }
-		        }
-		    }
+            mDatePicker.findViewById(Resources.getSystem().getIdentifier("day", "id", "android")).setVisibility(View.GONE);
+            if (hideMonth) {
+                mDatePicker.findViewById(Resources.getSystem().getIdentifier("month", "id", "android")).setVisibility(View.GONE);
+            }
+//		    for (Field datePickerDialogField : this.mDatePicker.getClass().getDeclaredFields()) {
+//		        if ("mDayPicker".equals(datePickerDialogField.getName()) ||
+//		                "mDaySpinner".equals(datePickerDialogField.getName())) {
+//		            datePickerDialogField.setAccessible(true);
+//		            Object dayPicker = new Object();
+//		            try {
+//		                dayPicker = datePickerDialogField.get(this.mDatePicker);
+//		            } catch (Exception e) {
+//		                e.printStackTrace();
+//		            }
+//		            ((View) dayPicker).setVisibility(View.GONE);
+//		        }
+//		        if ( hideMonth ) {
+//			        if ("mMonthPicker".equals(datePickerDialogField.getName()) ||
+//			                "mMonthSpinner".equals(datePickerDialogField.getName())) {
+//			            datePickerDialogField.setAccessible(true);
+//			            Object monthPicker = new Object();
+//			            try {
+//			            	monthPicker = datePickerDialogField.get(this.mDatePicker);
+//			            } catch (Exception e) {
+//			                e.printStackTrace();
+//			            }
+//			            ((View) monthPicker).setVisibility(View.GONE);
+//			        }
+//		        }
+//		    }
         }
     }