From fa01c3781c2e9c47974ba069b819c47b647397ec Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Wed, 2 Oct 2019 17:30:52 +0800
Subject: [PATCH] up

---
 .../app/ui/rss/article/RssArticlesActivity.kt   |  5 ++++-
 .../app/ui/rss/article/RssArticlesViewModel.kt  |  4 +++-
 .../main/res/layout/activity_rss_artivles.xml   | 17 +++++++++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesActivity.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesActivity.kt
index a7c09b1a8..0a0168bf5 100644
--- a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesActivity.kt
@@ -24,7 +24,9 @@ class RssArticlesActivity : VMBaseActivity<RssArticlesViewModel>(R.layout.activi
         initView()
         intent.getStringExtra("url")?.let {
             initData(it)
-            viewModel.loadContent(it)
+            viewModel.loadContent(it) {
+                refresh_progress_bar.isAutoLoading = false
+            }
         }
     }
 
@@ -33,6 +35,7 @@ class RssArticlesActivity : VMBaseActivity<RssArticlesViewModel>(R.layout.activi
         recycler_view.layoutManager = LinearLayoutManager(this)
         adapter = RssArticlesAdapter(this)
         recycler_view.adapter = adapter
+        refresh_progress_bar.isAutoLoading = true
     }
 
     private fun initData(origin: String) {
diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt
index b1f8d70cb..f96478bf6 100644
--- a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt
+++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesViewModel.kt
@@ -9,7 +9,7 @@ import java.net.URL
 
 class RssArticlesViewModel(application: Application) : BaseViewModel(application) {
 
-    fun loadContent(url: String) {
+    fun loadContent(url: String, onFinally: () -> Unit) {
         execute {
             val xml = URL(url).readText()
             RssParser.parseXML(xml).let {
@@ -18,6 +18,8 @@ class RssArticlesViewModel(application: Application) : BaseViewModel(application
                 }
                 App.db.rssArtivleDao().insert(*it.toTypedArray())
             }
+        }.onFinally {
+            onFinally()
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_rss_artivles.xml b/app/src/main/res/layout/activity_rss_artivles.xml
index 5665c8a24..43c2e25f8 100644
--- a/app/src/main/res/layout/activity_rss_artivles.xml
+++ b/app/src/main/res/layout/activity_rss_artivles.xml
@@ -12,15 +12,24 @@
         app:contentInsetStartWithNavigation="0dp"
         app:displayHomeAsUp="true" />
 
-    <FrameLayout
+    <io.legado.app.ui.widget.anima.RefreshProgressBar
+        android:id="@+id/refresh_progress_bar"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="2dp"
+        app:layout_constraintTop_toBottomOf="@id/title_bar" />
 
-        <io.legado.app.ui.widget.recycler.scroller.FastScrollRecyclerView
+    <io.legado.app.ui.widget.dynamiclayout.DynamicFrameLayout
+        android:id="@+id/content_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/refresh_progress_bar">
+
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/recycler_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-    </FrameLayout>
+    </io.legado.app.ui.widget.dynamiclayout.DynamicFrameLayout>
 
 </LinearLayout>
\ No newline at end of file