Fix #1873: Fix OnboardingFragmentTest test cases on Robolectric #2482
There are no files selected for viewing
This file contains 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 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 |
|---|---|---|
|
|
@@ -2,65 +2,81 @@ package org.oppia.android.app.onboarding | |
|
|
||
| import android.content.Context | ||
| import android.view.LayoutInflater | ||
| import android.view.ViewGroup | ||
| import androidx.recyclerview.widget.RecyclerView | ||
| import org.oppia.android.databinding.OnboardingSlideBinding | ||
| import org.oppia.android.databinding.OnboardingSlideFinalBinding | ||
|
|
||
| private const val VIEW_TYPE_TITLE_TEXT = 1 | ||
| private const val VIEW_TYPE_STORY_ITEM = 2 | ||
|
|
||
| class OnboardingPagerAdapter( | ||
|
There was a problem hiding this comment. Are we going to use the Bindale Adapter and remove this Adapter in this PR only or we are keeping this as a separate issue? @rt4914 There was a problem hiding this comment. That seems like a larger & unrelated change--I suggest splitting it off of this task. There was a problem hiding this comment. Actually, given that so much of the adapter has changed anyway, maybe it is worth trying to migrate to BindableAdapter. There was a problem hiding this comment. @BenHenning So, should I replace it with a bindable Adapter in this PR only? There was a problem hiding this comment. Oh, I guess you are suggesting to track it via a new issue. |
||
| val context: Context, | ||
| val onboardingSlideFinalViewModel: OnboardingSlideFinalViewModel | ||
| ) : | ||
| RecyclerView.Adapter<RecyclerView.ViewHolder>() { | ||
|
|
||
| override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder { | ||
| return when (viewType) { | ||
| VIEW_TYPE_TITLE_TEXT -> { | ||
| val binding = OnboardingSlideBinding.inflate( | ||
| LayoutInflater.from(context), | ||
| parent, | ||
| false | ||
| ) | ||
| OnboardingSlideViewHolder(binding) | ||
| } | ||
| VIEW_TYPE_STORY_ITEM -> { | ||
| val binding = | ||
| OnboardingSlideFinalBinding.inflate( | ||
| LayoutInflater.from(context), | ||
| parent, | ||
| false | ||
| ) | ||
| OnboardingSlideFinalViewHolder(binding) | ||
| } | ||
| else -> throw IllegalArgumentException("Invalid view type: $viewType") | ||
| } | ||
| } | ||
|
|
||
| override fun getItemViewType(position: Int): Int { | ||
| return if (position == TOTAL_NUMBER_OF_SLIDES - 1) { | ||
| VIEW_TYPE_STORY_ITEM | ||
| } else { | ||
| VIEW_TYPE_TITLE_TEXT | ||
| } | ||
| } | ||
|
|
||
| override fun getItemCount(): Int { | ||
| return TOTAL_NUMBER_OF_SLIDES | ||
| } | ||
|
|
||
| override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) { | ||
| when (holder.itemViewType) { | ||
| VIEW_TYPE_TITLE_TEXT -> { | ||
| val onboardingSlideViewModel = | ||
| OnboardingSlideViewModel(context, ViewPagerSlide.getSlideForPosition(position)) | ||
| (holder as OnboardingSlideViewHolder).bind(onboardingSlideViewModel) | ||
| } | ||
| VIEW_TYPE_STORY_ITEM -> { | ||
| (holder as OnboardingSlideFinalViewHolder).bind(onboardingSlideFinalViewModel) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| inner class OnboardingSlideViewHolder( | ||
| private val binding: OnboardingSlideBinding | ||
| ) : RecyclerView.ViewHolder(binding.root) { | ||
| fun bind(onboardingSlideViewModel: OnboardingSlideViewModel) { | ||
| binding.viewModel = onboardingSlideViewModel | ||
| } | ||
| } | ||
|
|
||
| inner class OnboardingSlideFinalViewHolder( | ||
| private val binding: OnboardingSlideFinalBinding | ||
| ) : RecyclerView.ViewHolder(binding.root) { | ||
| fun bind(onboardingSlideFinalViewModel: OnboardingSlideFinalViewModel) { | ||
| binding.viewModel = onboardingSlideFinalViewModel | ||
| } | ||
| } | ||
| } | ||
This file contains 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 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 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 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
Oops, something went wrong.
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.
is it working correctly for RTL?
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 guess there's some problem with the back button -
Screenrecorder-2021-01-18-14-26-15-85.mp4
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.
@FareesHussain mentioning you here to help with RTL stuff.
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.
video looks fine
@prayutsu have a look at the todos in the
OnboardingFragmentPresenterandOnboardingPagerAdapterand revert themand then check if RTL works fine
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 checked it on the
developbranch, and it looks ditto same as in this video.Is it correct?
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.
Yes