Created base waiting loader and implemented in multiple connect screens #3378
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:id="@+id/loadingContainer" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:contentDescription="@string/please_wait" | ||
| android:elevation="8dp" | ||
| android:gravity="center" | ||
| android:importantForAccessibility="noHideDescendants" | ||
| android:visibility="gone"> | ||
|
|
||
| <ProgressBar | ||
| android:id="@+id/progressBar" | ||
| style="?android:attr/progressBarStyleLarge" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center" /> | ||
| </FrameLayout> |
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,78 @@ | ||
| package org.commcare.fragments.base | ||
|
|
||
| import android.os.Bundle | ||
| import android.view.LayoutInflater | ||
| import android.view.View | ||
| import android.view.ViewGroup | ||
| import android.widget.FrameLayout | ||
| import androidx.fragment.app.Fragment | ||
| import androidx.viewbinding.ViewBinding | ||
| import org.commcare.dalvik.databinding.LoadingBinding | ||
| import org.commcare.interfaces.base.BaseConnectView | ||
|
|
||
| abstract class BaseConnectFragment<B : ViewBinding> : | ||
| Fragment(), | ||
| BaseConnectView { | ||
| private var _binding: B? = null | ||
| val binding get() = _binding!! | ||
|
|
||
| private lateinit var loadingBinding: LoadingBinding | ||
| private lateinit var rootView: View | ||
|
|
||
| /** | ||
| * Implement this method in child fragments to inflate their specific binding. | ||
| */ | ||
| protected abstract fun inflateBinding( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| ): B | ||
|
|
||
| override fun onCreateView( | ||
| inflater: LayoutInflater, | ||
| container: ViewGroup?, | ||
| savedInstanceState: Bundle?, | ||
| ): View { | ||
| // Inflate child fragment's main view | ||
| _binding = inflateBinding(inflater, container) | ||
| val mainView = binding.root | ||
|
|
||
| // Inflate loading layout | ||
| loadingBinding = LoadingBinding.inflate(inflater, container, false) | ||
| val loadingView = loadingBinding.root | ||
|
|
||
| // Create a parent container that holds both mainView and loadingView | ||
| val mergedLayout = | ||
| FrameLayout( | ||
| requireContext(), | ||
| ).apply { | ||
| layoutParams = | ||
| ViewGroup.LayoutParams( | ||
| ViewGroup.LayoutParams.MATCH_PARENT, | ||
| ViewGroup.LayoutParams.MATCH_PARENT, | ||
| ) | ||
| addView(mainView) | ||
| addView(loadingView) | ||
| } | ||
|
|
||
| // Hide loading by default | ||
| hideLoading() | ||
|
|
||
| rootView = mergedLayout | ||
| return rootView | ||
| } | ||
|
|
||
| override fun onDestroyView() { | ||
| super.onDestroyView() | ||
| _binding = null | ||
| // No need to nullify loadingBinding since it's lateinit — but safe practice to hide it | ||
| loadingBinding.root.visibility = View.GONE | ||
| } | ||
|
|
||
| override fun showLoading() { | ||
| loadingBinding.root.visibility = View.VISIBLE | ||
| } | ||
|
|
||
| override fun hideLoading() { | ||
| loadingBinding.root.visibility = View.GONE | ||
| } | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Optional: Since we are already touching a lot of Java code, what if we converted these files to Kotlin? This comment goes for all the other Java files in this PR as well.
Contributor
There was a problem hiding this comment. @conroy-ricketts Good suggestions although don't think we have talked about converting the existing Java code to Kotling as part of functional PRs. Few thoughts on this -
Contributor
There was a problem hiding this comment. @shubham1g5 Makes sense! I appreciate you sharing your thoughts on this. I really like the idea of making this a separate tech-debt effort because of the reasons you described. I also think it would be good to convert our existing code to Kotlin at some point in the future if we ever want to convert our UI to Jetpack Compose and reap the full benefit of that - I think that may be the best reason to pitch to the Product Management team. All good stuff to think about!
Contributor
There was a problem hiding this comment. @OrangeAndGreen I'm really curious what your thoughts are here? |
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
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.
@jaypanchal-13 Please remove this