Merge pull request #285 from razeware/EMA-276-library_pull_to_refresh

Ema 276 library pull to refresh
razeware · Sep 27, 2020 · 276e323 · 276e323
2 parents 3914d28 + 77cbdb1
commit 276e323
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 11 deletions.
diff --git a/app/src/main/java/com/razeware/emitron/di/modules/NetModule.kt b/app/src/main/java/com/razeware/emitron/di/modules/NetModule.kt
@@ -55,7 +55,10 @@ class NetModule {
       authInterceptor: AuthInterceptorImpl
     ): OkHttpClient =
       OkHttpClient.Builder()
-        .connectTimeout(10, TimeUnit.SECONDS)
+        .connectTimeout(30, TimeUnit.SECONDS)
+        .callTimeout(30, TimeUnit.SECONDS)
+        .readTimeout(30, TimeUnit.SECONDS)
+        .writeTimeout(30, TimeUnit.SECONDS)
         .addNetworkInterceptor(authInterceptor)
         .addInterceptor(loggingInterceptor)
         .build()

diff --git a/app/src/main/java/com/razeware/emitron/ui/library/LibraryFragment.kt b/app/src/main/java/com/razeware/emitron/ui/library/LibraryFragment.kt
@@ -2,12 +2,10 @@ package com.razeware.emitron.ui.library
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.view.inputmethod.EditorInfo.*
-import androidx.appcompat.widget.PopupMenu
 import androidx.core.view.isVisible
 import androidx.core.view.setPadding
 import androidx.fragment.app.activityViewModels
@@ -151,6 +149,10 @@ class LibraryFragment : DaggerFragment() {
     binding.textInputLayoutSearch.setEndIconOnClickListener {
       handleQueryCleared()
     }
+
+    binding.libraryPullToRefresh.setOnRefreshListener {
+      loadCollections()
+    }
   }
 
   private fun showRecentSearchControls() {
@@ -224,6 +226,10 @@ class LibraryFragment : DaggerFragment() {
         toggleControls(true, uiState == UiStateManager.UiState.INIT_EMPTY)
         hideRecentSearchControls()
         progressDelegate.hideProgressView()
+        binding.libraryPullToRefresh.isRefreshing = false
+      }
+      UiStateManager.UiState.INIT_FAILED -> {
+        loadCollections() // retry
       }
       else -> {
         // Handled by the adapter

diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
@@ -163,24 +163,31 @@
       app:icon="@drawable/ic_material_icon_sort"
       app:iconPadding="@dimen/button_padding_internal_dense"
       app:iconTint="@color/colorIcon2"
-      app:layout_constraintBottom_toTopOf="@+id/recycler_view_library"
+      app:layout_constraintBottom_toTopOf="@+id/library_pull_to_refresh"
       app:layout_constraintEnd_toEndOf="@id/guideline_right"
       app:layout_constraintStart_toEndOf="@+id/text_library_count"
       app:layout_constraintTop_toBottomOf="@+id/scroll_view_library_filter" />
 
-    <androidx.recyclerview.widget.RecyclerView
-      android:id="@+id/recycler_view_library"
+    <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
+      android:id="@+id/library_pull_to_refresh"
       android:layout_width="0dp"
       android:layout_height="0dp"
       android:layout_marginTop="@dimen/activity_vertical_margin"
-      app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-      app:layout_behavior="@string/appbar_scrolling_view_behavior"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="@id/guideline_right"
       app:layout_constraintStart_toStartOf="@id/guideline_left"
-      app:layout_constraintTop_toBottomOf="@+id/text_library_count"
-      tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-      tools:listitem="@layout/item_content" />
+      app:layout_constraintTop_toBottomOf="@+id/text_library_count">
+
+      <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view_library"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="@dimen/activity_vertical_margin"
+        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
+        tools:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+        tools:listitem="@layout/item_content" />
+    </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
     <FrameLayout
       android:id="@+id/layout_progress_container"