Mirrors/tachiyomi
2
0
Fork 0
mirror of https://github.com/tachiyomiorg/tachiyomi.git synced 2024-11-18 23:49:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unneeded swipe refresh

Browse Source
This commit is contained in:
len 2016-06-05 11:54:35 +02:00
parent 6687c80b2d
commit 156e43290e
3 changed files with 3 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/src/main/java/eu/kanade/tachiyomi/ui/recent/RecentChaptersFragment.kt
View File

@ -123,9 +123,6 @@ class RecentChaptersFragment : BaseRxFragment<RecentChaptersPresenter>(), Action
adapter = RecentChaptersAdapter(this) adapter = RecentChaptersAdapter(this)
recycler.adapter = adapter recycler.adapter = adapter
// Set swipe refresh listener
swipe_refresh.setOnRefreshListener { fetchChapters() }
// Update toolbar text // Update toolbar text
setToolbarTitle(R.string.label_recent_updates) setToolbarTitle(R.string.label_recent_updates)
} }
@ -316,28 +313,4 @@ class RecentChaptersFragment : BaseRxFragment<RecentChaptersPresenter>(), Action
(childFragmentManager.findFragmentByTag(DeletingChaptersDialog.TAG) as? DialogFragment)?.dismiss() (childFragmentManager.findFragmentByTag(DeletingChaptersDialog.TAG) as? DialogFragment)?.dismiss()
} }
/**
* Called when swipe refresh activated.
*/
fun fetchChapters() {
swipe_refresh.isRefreshing = true
presenter.fetchChaptersFromSource()
}
/**
* Called after refresh is completed
*/
fun onFetchChaptersDone() {
swipe_refresh.isRefreshing = false
}
/**
* Called when something went wrong while refreshing
* @param error information on what went wrong
*/
fun onFetchChaptersError(error: Throwable) {
swipe_refresh.isRefreshing = false
context.toast(error.message)
}
} }

9
app/src/main/java/eu/kanade/tachiyomi/ui/recent/RecentChaptersPresenter.kt
View File

@ -65,11 +65,7 @@ class RecentChaptersPresenter : BasePresenter<RecentChaptersFragment>() {
fragment.onNextMangaChapters(chapters) fragment.onNextMangaChapters(chapters)
// Update download status // Update download status
updateChapterStatus(convertToMangaChaptersList(chapters)) updateChapterStatus(convertToMangaChaptersList(chapters))
// Stop refresh }
fragment.onFetchChaptersDone()
},
{ fragment, error -> fragment.onFetchChaptersError(error) }
) )
// Used to update download status // Used to update download status
@ -346,8 +342,5 @@ class RecentChaptersPresenter : BasePresenter<RecentChaptersFragment>() {
chapter.status = Download.NOT_DOWNLOADED chapter.status = Download.NOT_DOWNLOADED
} }
fun fetchChaptersFromSource() {
start(GET_RECENT_CHAPTERS)
}
} }

13
app/src/main/res/layout/fragment_recent_chapters.xml
View File

@ -5,20 +5,11 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<android.support.v4.widget.SwipeRefreshLayout <android.support.v7.widget.RecyclerView
android:id="@+id/swipe_refresh"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.RecyclerView
android:id="@+id/recycler" android:id="@+id/recycler"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:descendantFocusability="blocksDescendants" android:descendantFocusability="blocksDescendants"
tools:listitem="@layout/item_recent_chapter"> tools:listitem="@layout/item_recent_chapter"/>
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
</RelativeLayout> </RelativeLayout>