Merge pull request #513 from Abhimanyu14/abhimanyu/jetsurvey-issue-512

[Jetsurvey] fixed app crash on changing date selection

Author: florina-muntenescu

Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyFragment.kt

@@ -48,7 +48,7 @@ class SurveyFragment : Fragment() {
  inflater: LayoutInflater,
  container: ViewGroup?,
  savedInstanceState: Bundle?
- ): View? {
+ ): View {
  return ComposeView(requireContext()).apply {
  // In order for savedState to work, the same ID needs to be used for all instances.
  id = R.id.sign_in_fragment
@@ -108,7 +108,7 @@ class SurveyFragment : Fragment() {
  activity?.let {
  picker.show(it.supportFragmentManager, picker.toString())
  picker.addOnPositiveButtonClickListener {
- viewModel.onDatePicked(questionId, picker.headerText)
+ viewModel.onDatePicked(questionId, picker.selection)
  }
  }
  }

Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyQuestions.kt

@@ -704,7 +704,7 @@ private fun DateQuestion(
  val date = if (answer != null && answer.result is SurveyActionResult.Date) {
  answer.result.date
  } else {
- SimpleDateFormat("EEE, MMM d", Locale.getDefault()).format(Date())
+ SimpleDateFormat(simpleDateFormatPattern, Locale.getDefault()).format(Date())
  }
  Button(
  onClick = { onAction(questionId, SurveyActionType.PICK_DATE) },

Jetsurvey/app/src/main/java/com/example/compose/jetsurvey/survey/SurveyViewModel.kt

@@ -30,6 +30,8 @@ import java.util.Date
 import java.util.Locale
 import kotlinx.coroutines.launch
 
+const val simpleDateFormatPattern = "EEE, MMM d"
+
 class SurveyViewModel(
  private val surveyRepository: SurveyRepository,
  private val photoUriManager: PhotoUriManager
@@ -74,8 +76,13 @@ class SurveyViewModel(
  _uiState.value = SurveyState.Result(surveyQuestions.surveyTitle, result)
  }
 
- fun onDatePicked(questionId: Int, date: String) {
- updateStateWithActionResult(questionId, SurveyActionResult.Date(date))
+ fun onDatePicked(questionId: Int, pickerSelection: Long?) {
+ val selectedDate = Date().apply {
+ time = pickerSelection ?: getCurrentDate(questionId)
+ }
+ val formattedDate =
+ SimpleDateFormat(simpleDateFormatPattern, Locale.getDefault()).format(selectedDate)
+ updateStateWithActionResult(questionId, SurveyActionResult.Date(formattedDate))
  }
 
  fun getCurrentDate(questionId: Int): Long {
@@ -130,7 +137,7 @@ class SurveyViewModel(
  }
  val answer: Answer.Action? = question.answer as Answer.Action?
  if (answer != null && answer.result is SurveyActionResult.Date) {
- val formatter = SimpleDateFormat("MMM dd, yyyy", Locale.ENGLISH)
+ val formatter = SimpleDateFormat(simpleDateFormatPattern, Locale.ENGLISH)
  val formatted = formatter.parse(answer.result.date)
  if (formatted is Date)
  ret = formatted.time