fix topic expand

ekibun · Mar 4, 2019 · b850d76 · b850d76
1 parent 3293309
commit b850d76
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicPresenter.kt b/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicPresenter.kt
@@ -27,6 +27,7 @@ class TopicPresenter(private val context: TopicActivity) {
 
     private val ua by lazy { WebView(context).settings.userAgentString }
     fun getTopic(scrollPost: String = ""){
+        context.item_swipe.isRefreshing = true
         Bangumi.getTopic(context.openUrl, ua).enqueue(ApiHelper.buildCallback(context, {topic->
             processTopic(topic, scrollPost)
         }){context.item_swipe.isRefreshing = false})
@@ -151,6 +152,7 @@ class TopicPresenter(private val context: TopicActivity) {
                     main.forEach {
                         it.value.floor = (replies.last()?.floor?:0)+1
                         it.value.relate = it.key
+                        it.value.isExpanded = replies.firstOrNull { o-> o.pst_id == it.value.pst_id }?.isExpanded?: true
                         replies.removeAll { o-> o.pst_id == it.value.pst_id }
                         replies.add(it.value)
                         //adapter.addData(it.value)

diff --git a/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicView.kt b/app/src/main/java/soko/ekibun/bangumi/ui/topic/TopicView.kt
@@ -87,6 +87,7 @@ class TopicView(private val context: TopicActivity){
                     .apply(RequestOptions.bitmapTransform(BlurTransformation(25, 8)))
                     .into(context.item_cover_blur)
         adapter.isUseEmpty(true)
+        topic.replies.forEach { it.isExpanded = true }
         setNewData(topic.replies)
         (context.item_list?.layoutManager as? LinearLayoutManager)?.let{ layoutManager ->
             layoutManager.scrollToPositionWithOffset(adapter.data.indexOfFirst { it.pst_id == scrollPost }, 0) }
@@ -122,7 +123,6 @@ class TopicView(private val context: TopicActivity){
             if(subFloor == 0) {
                 referPost = it
                 referPost?.subItems?.clear()
-                it.isExpanded = false
                 true
             }
             else {
@@ -131,6 +131,15 @@ class TopicView(private val context: TopicActivity){
                 false
             }
         })
-        adapter.expandAll()
+        var i = 0
+        while(i< adapter.data.size){
+            val topicPost = adapter.data[i]
+            if(topicPost.isExpanded){
+                topicPost.isExpanded = false
+                adapter.expand(i, false, false)
+            }
+            i++
+        }
+        //adapter.expandAll()
     }
 }