add linear indicator to show progress in ui fragments.

Targholi · Targholi · commit 419c809eaa7f · 2022-06-25T13:17:09.000+04:30
diff --git a/app/src/main/java/com/milad/githoob/ui/profile/ProfileViewModel.kt b/app/src/main/java/com/milad/githoob/ui/profile/ProfileViewModel.kt
@@ -27,11 +27,10 @@ class ProfileViewModel @Inject constructor(
     private lateinit var token: String
 
     private val _forceUpdate = MutableLiveData(false)
-    private val _dataLoading = MutableLiveData<Boolean>()
+    private val _dataLoading = MutableLiveData(true)
     private val _user = Transformations.switchMap(_forceUpdate) { bool ->
         val user = MutableLiveData<User>()
         if (bool) {
-            _dataLoading.postValue(true)
             viewModelScope.launch(ioDispatcher) {
 
                 getUserInfo(token, userId).collect {
@@ -84,22 +83,18 @@ class ProfileViewModel @Inject constructor(
     val userContributes: LiveData<List<ContributionsDay>> = Transformations.switchMap(_user) {
         val list = MutableLiveData<List<ContributionsDay>>()
 
-        _dataLoading.postValue(true)
         val url = String.format(AppConstants.CONTRIBUTE_URL, it.login)
 
         viewModelScope.launch(ioDispatcher) {
             mainRepository.getUserContribute(url).collect {
                 when (it.status) {
                     Status.SUCCESS -> {
-                        _dataLoading.postValue(false)
                         val listCont = ContributionsProvider().getContributions(it.data?.string())
                         list.postValue(listCont)
                     }
                     Status.LOADING -> {
-                        _dataLoading.postValue(true)
                     }
                     Status.ERROR -> {
-                        _dataLoading.postValue(false)
                     }
                 }
             }
diff --git a/app/src/main/java/com/milad/githoob/ui/profile/connection/ConnectionViewModel.kt b/app/src/main/java/com/milad/githoob/ui/profile/connection/ConnectionViewModel.kt
@@ -25,6 +25,8 @@ class ConnectionViewModel @Inject constructor(
     private var _connectionList = MutableLiveData<ArrayList<User>>()
 
     val connectionList: LiveData<ArrayList<User>> = _connectionList
+    private val _dataLoading = MutableLiveData(true)
+    val dataLoading: LiveData<Boolean> = _dataLoading
 
     fun setUser(token: String = "", userId: String = "", type: String) {
         getStarredRepo(token, userId, type)
@@ -40,12 +42,14 @@ class ConnectionViewModel @Inject constructor(
                 when (it.status) {
                     Status.SUCCESS -> {
                         _connectionList.postValue((it.data!!))
+                        _dataLoading.postValue(false)
                     }
                     Status.LOADING -> {
-                        // TODO: 2/1/2022 set loading
+                        _dataLoading.postValue(true)
                     }
                     Status.ERROR -> {
                         Timber.d(it.message.toString())
+                        _dataLoading.postValue(false)
                     }
                 }
             }
diff --git a/app/src/main/java/com/milad/githoob/ui/profile/organization/ProfileOrgsViewModel.kt b/app/src/main/java/com/milad/githoob/ui/profile/organization/ProfileOrgsViewModel.kt
@@ -26,6 +26,9 @@ class ProfileOrgsViewModel @Inject constructor(
     private val _orgsList: MutableLiveData<ArrayList<Org>> = MutableLiveData()
     val orgsList: LiveData<ArrayList<Org>> = _orgsList
 
+    private val _dataLoading = MutableLiveData(true)
+    val dataLoading: LiveData<Boolean> = _dataLoading
+
     fun setUser(token: String, userId: String) {
         getOrgs(token, userId)
     }
@@ -37,12 +40,14 @@ class ProfileOrgsViewModel @Inject constructor(
                     Status.SUCCESS -> {
                         Log.d("@@", "getOrgs: ${it.data?.size}")
                         _orgsList.postValue((it.data!!))
+                        _dataLoading.postValue(false)
                     }
                     Status.LOADING -> {
-                        // TODO: 2/1/2022 set loading
+                        _dataLoading.postValue(true)
                     }
                     Status.ERROR -> {
                         Timber.d(it.message.toString())
+                        _dataLoading.postValue(false)
                     }
                 }
             }
diff --git a/app/src/main/java/com/milad/githoob/ui/profile/repositories/ProfileRepositoriesViewModel.kt b/app/src/main/java/com/milad/githoob/ui/profile/repositories/ProfileRepositoriesViewModel.kt
@@ -30,6 +30,9 @@ class ProfileRepositoriesViewModel @Inject constructor(
         switchMatData(it)
     }
 
+    private val _dataLoading = MutableLiveData(true)
+    val dataLoading: LiveData<Boolean> = _dataLoading
+
     private fun switchMatData(list: ArrayList<Repo>): LiveData<ArrayList<Repo>> {
         val d = MutableLiveData<ArrayList<Repo>>()
         val jsonUser = JsonUtils(context)
@@ -52,12 +55,14 @@ class ProfileRepositoriesViewModel @Inject constructor(
                 when (it.status) {
                     Status.SUCCESS -> {
                         _repoList.postValue(it.data!!)
+                        _dataLoading.postValue(false)
                     }
                     Status.LOADING -> {
-                        // TODO: 2/1/2022 set loading
+                        _dataLoading.postValue(true)
                     }
                     Status.ERROR -> {
                         Timber.d(it.message.toString())
+                        _dataLoading.postValue(false)
                     }
                 }
             }
diff --git a/app/src/main/java/com/milad/githoob/ui/profile/repositories/project/ProfileProjectViewModel.kt b/app/src/main/java/com/milad/githoob/ui/profile/repositories/project/ProfileProjectViewModel.kt
@@ -29,6 +29,9 @@ class ProfileProjectViewModel @Inject constructor(
     private val _markdown = MutableLiveData<String>("")
     val markdown: LiveData<String> = _markdown
 
+    private val _dataLoading = MutableLiveData(true)
+    val dataLoading: LiveData<Boolean> = _dataLoading
+
     fun setUser(token: String?, userId: String, projectName: String) =
         loadProjectData(token, userId, projectName)
 
@@ -62,12 +65,14 @@ class ProfileProjectViewModel @Inject constructor(
             when (it.status) {
                 Status.SUCCESS -> {
                     _repo.postValue(it.data!!)
+                    _dataLoading.postValue(false)
                 }
                 Status.LOADING -> {
-                    // TODO: 2/1/2022 set loading
+                    _dataLoading.postValue(true)
                 }
                 Status.ERROR -> {
                     Timber.d(it.message.toString())
+                    _dataLoading.postValue(false)
                 }
             }
         }
diff --git a/app/src/main/java/com/milad/githoob/ui/profile/stared/ProfileStaredViewModel.kt b/app/src/main/java/com/milad/githoob/ui/profile/stared/ProfileStaredViewModel.kt
@@ -29,6 +29,9 @@ class ProfileStaredViewModel @Inject constructor(
         getRepoLangColor(it)
     }
 
+    private val _dataLoading = MutableLiveData(true)
+    val  dataLoading: LiveData<Boolean> = _dataLoading
+
     private fun getRepoLangColor(list: ArrayList<Repo>): LiveData<ArrayList<Repo>> {
         val d = MutableLiveData<ArrayList<Repo>>()
         val jsonUser = JsonUtils(context)
@@ -51,12 +54,14 @@ class ProfileStaredViewModel @Inject constructor(
                 when (it.status) {
                     Status.SUCCESS -> {
                         _starredList.postValue((it.data!!))
+                        _dataLoading.postValue(false)
                     }
                     Status.LOADING -> {
-                        // TODO: 2/1/2022 set loading
+                        _dataLoading.postValue(true)
                     }
                     Status.ERROR -> {
                         Timber.d(it.message.toString())
+                        _dataLoading.postValue(false)
                     }
                 }
             }
diff --git a/app/src/main/res/layout/fragment_connection.xml b/app/src/main/res/layout/fragment_connection.xml
@@ -92,6 +92,14 @@
                 android:layout_height="wrap_content"
                 app:tabMode="fixed" />
 
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/progressBar"
+                android:layout_width="match_parent"
+                android:indeterminate="true"
+                android:layout_height="wrap_content"
+                android:visibility="@{viewmodel.dataLoading == true ? View.VISIBLE: View.GONE}"
+                tools:visibility="visible" />
+
         </com.milad.githoob.utils.collapsingToolbar.CollapsibleAppbar>
 
         <androidx.viewpager2.widget.ViewPager2
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
@@ -484,6 +484,14 @@
 
             </com.milad.githoob.utils.collapsingToolbar.CollapsibleToolbar>
 
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/progressBar"
+                android:layout_width="match_parent"
+                android:indeterminate="true"
+                android:layout_height="wrap_content"
+                android:visibility="@{viewmodel.dataLoading == true ? View.VISIBLE: View.GONE}"
+                tools:visibility="visible" />
+
         </com.milad.githoob.utils.collapsingToolbar.CollapsibleAppbar>
 
         <androidx.core.widget.NestedScrollView
diff --git a/app/src/main/res/layout/profile_orgs_fragment.xml b/app/src/main/res/layout/profile_orgs_fragment.xml
@@ -70,6 +70,14 @@
 
             </com.milad.githoob.utils.collapsingToolbar.CollapsibleToolbar>
 
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/progressBar"
+                android:layout_width="match_parent"
+                android:indeterminate="true"
+                android:layout_height="wrap_content"
+                android:visibility="@{viewmodel.dataLoading == true ? View.VISIBLE: View.GONE}"
+                tools:visibility="visible" />
+
         </com.milad.githoob.utils.collapsingToolbar.CollapsibleAppbar>
 
         <androidx.core.widget.NestedScrollView
diff --git a/app/src/main/res/layout/profile_project_fragment.xml b/app/src/main/res/layout/profile_project_fragment.xml
@@ -346,6 +346,15 @@
                 </LinearLayout>
 
             </com.milad.githoob.utils.collapsingToolbar.CollapsibleToolbar>
+
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/progressBar"
+                android:layout_width="match_parent"
+                android:indeterminate="true"
+                android:layout_height="wrap_content"
+                android:visibility="@{viewmodel.dataLoading == true ? View.VISIBLE: View.GONE}"
+                tools:visibility="visible" />
+
         </com.milad.githoob.utils.collapsingToolbar.CollapsibleAppbar>
 
         <androidx.core.widget.NestedScrollView
diff --git a/app/src/main/res/layout/profile_repositories_fragment.xml b/app/src/main/res/layout/profile_repositories_fragment.xml
@@ -71,6 +71,14 @@
 
             </com.milad.githoob.utils.collapsingToolbar.CollapsibleToolbar>
 
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/progressBar"
+                android:layout_width="match_parent"
+                android:indeterminate="true"
+                android:layout_height="wrap_content"
+                android:visibility="@{viewmodel.dataLoading == true ? View.VISIBLE: View.GONE}"
+                tools:visibility="visible" />
+
         </com.milad.githoob.utils.collapsingToolbar.CollapsibleAppbar>
 
         <androidx.core.widget.NestedScrollView
@@ -113,6 +121,7 @@
 
     <data>
 
+        <import type="android.view.View" />
         <variable
             name="viewmodel"
             type="com.milad.githoob.ui.profile.repositories.ProfileRepositoriesViewModel" />
diff --git a/app/src/main/res/layout/profile_stared_fragment.xml b/app/src/main/res/layout/profile_stared_fragment.xml
@@ -72,6 +72,14 @@
 
             </com.milad.githoob.utils.collapsingToolbar.CollapsibleToolbar>
 
+            <com.google.android.material.progressindicator.LinearProgressIndicator
+                android:id="@+id/progressBar"
+                android:layout_width="match_parent"
+                android:indeterminate="true"
+                android:layout_height="wrap_content"
+                android:visibility="@{viewmodel.dataLoading == true ? View.VISIBLE: View.GONE}"
+                tools:visibility="visible" />
+
         </com.milad.githoob.utils.collapsingToolbar.CollapsibleAppbar>
 
         <androidx.core.widget.NestedScrollView

Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ class ConnectionViewModel @Inject constructor(`
`25`	`25`	`private var _connectionList = MutableLiveData<ArrayList<User>>()`
`26`	`26`
`27`	`27`	`val connectionList: LiveData<ArrayList<User>> = _connectionList`
	`28`	`+ private val _dataLoading = MutableLiveData(true)`
	`29`	`+ val dataLoading: LiveData<Boolean> = _dataLoading`
`28`	`30`
`29`	`31`	`fun setUser(token: String = "", userId: String = "", type: String) {`
`30`	`32`	`getStarredRepo(token, userId, type)`
`@@ -40,12 +42,14 @@ class ConnectionViewModel @Inject constructor(`
`40`	`42`	`when (it.status) {`
`41`	`43`	`Status.SUCCESS -> {`
`42`	`44`	`_connectionList.postValue((it.data!!))`
	`45`	`+ _dataLoading.postValue(false)`
`43`	`46`	`}`
`44`	`47`	`Status.LOADING -> {`
`45`		`- // TODO: 2/1/2022 set loading`
	`48`	`+ _dataLoading.postValue(true)`
`46`	`49`	`}`
`47`	`50`	`Status.ERROR -> {`
`48`	`51`	`Timber.d(it.message.toString())`
	`52`	`+ _dataLoading.postValue(false)`
`49`	`53`	`}`
`50`	`54`	`}`
`51`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ class ProfileOrgsViewModel @Inject constructor(`
`26`	`26`	`private val _orgsList: MutableLiveData<ArrayList<Org>> = MutableLiveData()`
`27`	`27`	`val orgsList: LiveData<ArrayList<Org>> = _orgsList`
`28`	`28`
	`29`	`+ private val _dataLoading = MutableLiveData(true)`
	`30`	`+ val dataLoading: LiveData<Boolean> = _dataLoading`
	`31`	`+`
`29`	`32`	`fun setUser(token: String, userId: String) {`
`30`	`33`	`getOrgs(token, userId)`
`31`	`34`	`}`
`@@ -37,12 +40,14 @@ class ProfileOrgsViewModel @Inject constructor(`
`37`	`40`	`Status.SUCCESS -> {`
`38`	`41`	`Log.d("@@", "getOrgs: ${it.data?.size}")`
`39`	`42`	`_orgsList.postValue((it.data!!))`
	`43`	`+ _dataLoading.postValue(false)`
`40`	`44`	`}`
`41`	`45`	`Status.LOADING -> {`
`42`		`- // TODO: 2/1/2022 set loading`
	`46`	`+ _dataLoading.postValue(true)`
`43`	`47`	`}`
`44`	`48`	`Status.ERROR -> {`
`45`	`49`	`Timber.d(it.message.toString())`
	`50`	`+ _dataLoading.postValue(false)`
`46`	`51`	`}`
`47`	`52`	`}`
`48`	`53`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,9 @@ class ProfileRepositoriesViewModel @Inject constructor(`
`30`	`30`	`switchMatData(it)`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ private val _dataLoading = MutableLiveData(true)`
	`34`	`+ val dataLoading: LiveData<Boolean> = _dataLoading`
	`35`	`+`
`33`	`36`	`private fun switchMatData(list: ArrayList<Repo>): LiveData<ArrayList<Repo>> {`
`34`	`37`	`val d = MutableLiveData<ArrayList<Repo>>()`
`35`	`38`	`val jsonUser = JsonUtils(context)`
`@@ -52,12 +55,14 @@ class ProfileRepositoriesViewModel @Inject constructor(`
`52`	`55`	`when (it.status) {`
`53`	`56`	`Status.SUCCESS -> {`
`54`	`57`	`_repoList.postValue(it.data!!)`
	`58`	`+ _dataLoading.postValue(false)`
`55`	`59`	`}`
`56`	`60`	`Status.LOADING -> {`
`57`		`- // TODO: 2/1/2022 set loading`
	`61`	`+ _dataLoading.postValue(true)`
`58`	`62`	`}`
`59`	`63`	`Status.ERROR -> {`
`60`	`64`	`Timber.d(it.message.toString())`
	`65`	`+ _dataLoading.postValue(false)`
`61`	`66`	`}`
`62`	`67`	`}`
`63`	`68`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@ class ProfileProjectViewModel @Inject constructor(`
`29`	`29`	`private val _markdown = MutableLiveData<String>("")`
`30`	`30`	`val markdown: LiveData<String> = _markdown`
`31`	`31`
	`32`	`+ private val _dataLoading = MutableLiveData(true)`
	`33`	`+ val dataLoading: LiveData<Boolean> = _dataLoading`
	`34`	`+`
`32`	`35`	`fun setUser(token: String?, userId: String, projectName: String) =`
`33`	`36`	`loadProjectData(token, userId, projectName)`
`34`	`37`
`@@ -62,12 +65,14 @@ class ProfileProjectViewModel @Inject constructor(`
`62`	`65`	`when (it.status) {`
`63`	`66`	`Status.SUCCESS -> {`
`64`	`67`	`_repo.postValue(it.data!!)`
	`68`	`+ _dataLoading.postValue(false)`
`65`	`69`	`}`
`66`	`70`	`Status.LOADING -> {`
`67`		`- // TODO: 2/1/2022 set loading`
	`71`	`+ _dataLoading.postValue(true)`
`68`	`72`	`}`
`69`	`73`	`Status.ERROR -> {`
`70`	`74`	`Timber.d(it.message.toString())`
	`75`	`+ _dataLoading.postValue(false)`
`71`	`76`	`}`
`72`	`77`	`}`
`73`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,9 @@ class ProfileStaredViewModel @Inject constructor(`
`29`	`29`	`getRepoLangColor(it)`
`30`	`30`	`}`
`31`	`31`
	`32`	`+ private val _dataLoading = MutableLiveData(true)`
	`33`	`+ val dataLoading: LiveData<Boolean> = _dataLoading`
	`34`	`+`
`32`	`35`	`private fun getRepoLangColor(list: ArrayList<Repo>): LiveData<ArrayList<Repo>> {`
`33`	`36`	`val d = MutableLiveData<ArrayList<Repo>>()`
`34`	`37`	`val jsonUser = JsonUtils(context)`
`@@ -51,12 +54,14 @@ class ProfileStaredViewModel @Inject constructor(`
`51`	`54`	`when (it.status) {`
`52`	`55`	`Status.SUCCESS -> {`
`53`	`56`	`_starredList.postValue((it.data!!))`
	`57`	`+ _dataLoading.postValue(false)`
`54`	`58`	`}`
`55`	`59`	`Status.LOADING -> {`
`56`		`- // TODO: 2/1/2022 set loading`
	`60`	`+ _dataLoading.postValue(true)`
`57`	`61`	`}`
`58`	`62`	`Status.ERROR -> {`
`59`	`63`	`Timber.d(it.message.toString())`
	`64`	`+ _dataLoading.postValue(false)`
`60`	`65`	`}`
`61`	`66`	`}`
`62`	`67`	`}`