Use Fragment for geopoly UI #6985
Move WidgetAnswerDialogFragment to its own file
- Loading branch information
commit ac334ab62ef8f41b1ac60f356af6d3009955f60d
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| package org.odk.collect.android.widgets.utilities | ||
|
|
||
| import android.content.Context | ||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import androidx.appcompat.widget.Toolbar | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.fragment.app.activityViewModels | ||
| import androidx.fragment.app.commit | ||
| import androidx.lifecycle.ViewModelProvider | ||
| import org.javarosa.core.model.FormIndex | ||
| import org.javarosa.core.model.data.IAnswerData | ||
| import org.javarosa.form.api.FormEntryPrompt | ||
| import org.odk.collect.android.R | ||
| import org.odk.collect.android.databinding.WidgetAnswerDialogLayoutBinding | ||
| import org.odk.collect.android.formentry.FormEntryViewModel | ||
| import org.odk.collect.androidshared.ui.FragmentFactoryBuilder | ||
| import org.odk.collect.material.MaterialFullScreenDialogFragment | ||
| import kotlin.reflect.KClass | ||
|
|
||
| abstract class WidgetAnswerDialogFragment<T : Fragment>( | ||
| private val type: KClass<T>, | ||
| private val viewModelFactory: ViewModelProvider.Factory | ||
| ) : MaterialFullScreenDialogFragment() { | ||
|
|
||
| private val formEntryViewModel: FormEntryViewModel by activityViewModels { viewModelFactory } | ||
| private val prompt: FormEntryPrompt by lazy { | ||
| formEntryViewModel.getQuestionPrompt(requireArguments().getSerializable(ARG_FORM_INDEX) as FormIndex) | ||
| } | ||
|
|
||
| abstract fun onCreateFragment(prompt: FormEntryPrompt): T | ||
|
|
||
| override fun onAttach(context: Context) { | ||
| super.onAttach(context) | ||
|
|
||
| childFragmentManager.fragmentFactory = FragmentFactoryBuilder() | ||
| .forClass(type) { onCreateFragment(prompt) } | ||
| .build() | ||
| } | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle? | ||
| ): View { | ||
| val binding = WidgetAnswerDialogLayoutBinding.inflate(inflater) | ||
| return binding.root | ||
| } | ||
|
|
||
| override fun onViewCreated(view: View, savedInstanceState: Bundle?) { | ||
| childFragmentManager.commit { | ||
| add(R.id.answer_fragment, type.java, null) | ||
| } | ||
| } | ||
|
|
||
| override fun getToolbar(): Toolbar? { | ||
| return null | ||
| } | ||
|
|
||
| override fun onBackPressed() { | ||
| dismiss() | ||
| } | ||
|
|
||
| override fun onCloseClicked() { | ||
| // No toolbar so not relevant | ||
| } | ||
|
|
||
| fun onAnswer(answer: IAnswerData, dismiss: Boolean = true) { | ||
| formEntryViewModel.answerQuestion(prompt.index, answer) | ||
|
|
||
| if (dismiss) { | ||
| dismiss() | ||
| } | ||
| } | ||
|
|
||
| companion object { | ||
| const val ARG_FORM_INDEX = "form_index" | ||
| } | ||
| } | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I imagine pretty soon we'll want this to be more general so that the "child" view doesn't have to be a
Fragment(and allow Composables etc). I thought it'd be better to wait for that to be needed than try and anticipate the ideal structure now though.