feat: 优化代码

pull/98/head
kunfei 5 years ago
parent 5eb7c01712
commit 4c9d62304f
  1. 10
      app/src/main/java/io/legado/app/base/BaseFragment.kt
  2. 3
      app/src/main/java/io/legado/app/ui/chapterlist/BookmarkFragment.kt
  3. 7
      app/src/main/java/io/legado/app/ui/chapterlist/ChapterListFragment.kt
  4. 2
      app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt
  5. 2
      app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt
  6. 2
      app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt
  7. 2
      app/src/main/java/io/legado/app/ui/main/my/MyFragment.kt
  8. 2
      app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt

@ -32,6 +32,14 @@ abstract class BaseFragment(layoutID: Int) : Fragment(layoutID),
return super.onCreateView(inflater, container, savedInstanceState) return super.onCreateView(inflater, container, savedInstanceState)
} }
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
onFragmentCreated(view, savedInstanceState)
observeLiveBus()
}
abstract fun onFragmentCreated(view: View, savedInstanceState: Bundle?)
override fun onDestroy() { override fun onDestroy() {
super.onDestroy() super.onDestroy()
job.cancel() job.cancel()
@ -52,6 +60,8 @@ abstract class BaseFragment(layoutID: Int) : Fragment(layoutID),
} }
} }
open fun observeLiveBus() {
}
open fun onCompatCreateOptionsMenu(menu: Menu) { open fun onCompatCreateOptionsMenu(menu: Menu) {
} }

@ -28,8 +28,7 @@ class BookmarkFragment : VMBaseFragment<ChapterListViewModel>(R.layout.fragment_
private lateinit var adapter: BookmarkAdapter private lateinit var adapter: BookmarkAdapter
private var bookmarkLiveData: LiveData<PagedList<Bookmark>>? = null private var bookmarkLiveData: LiveData<PagedList<Bookmark>>? = null
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
viewModel.bookMarkCallBack = this viewModel.bookMarkCallBack = this
initRecyclerView() initRecyclerView()
initData() initData()

@ -35,8 +35,7 @@ class ChapterListFragment : VMBaseFragment<ChapterListViewModel>(R.layout.fragme
private lateinit var mLayoutManager: UpLinearLayoutManager private lateinit var mLayoutManager: UpLinearLayoutManager
private var tocLiveData: LiveData<List<BookChapter>>? = null private var tocLiveData: LiveData<List<BookChapter>>? = null
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
viewModel.chapterCallBack = this viewModel.chapterCallBack = this
initRecyclerView() initRecyclerView()
initView() initView()
@ -79,6 +78,10 @@ class ChapterListFragment : VMBaseFragment<ChapterListViewModel>(R.layout.fragme
} }
} }
override fun observeLiveBus() {
super.observeLiveBus()
}
private fun initDoc() { private fun initDoc() {
tocLiveData?.removeObservers(this@ChapterListFragment) tocLiveData?.removeObservers(this@ChapterListFragment)
tocLiveData = App.db.bookChapterDao().observeByBook(viewModel.bookUrl) tocLiveData = App.db.bookChapterDao().observeByBook(viewModel.bookUrl)

@ -47,7 +47,7 @@ class BookshelfFragment : VMBaseFragment<BookshelfViewModel>(R.layout.fragment_b
private var bookGroupLiveData: LiveData<List<BookGroup>>? = null private var bookGroupLiveData: LiveData<List<BookGroup>>? = null
private val bookGroups = mutableListOf<BookGroup>() private val bookGroups = mutableListOf<BookGroup>()
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
setSupportToolbar(toolbar) setSupportToolbar(toolbar)
initView() initView()
initBookGroupData() initBookGroupData()

@ -49,7 +49,7 @@ class BooksFragment : BaseFragment(R.layout.fragment_books),
private var position = 0 private var position = 0
private var groupId = -1 private var groupId = -1
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
activityViewModel = getViewModelOfActivity(MainViewModel::class.java) activityViewModel = getViewModelOfActivity(MainViewModel::class.java)
arguments?.let { arguments?.let {
position = it.getInt("position", 0) position = it.getInt("position", 0)

@ -39,7 +39,7 @@ class ExploreFragment : VMBaseFragment<ExploreViewModel>(R.layout.fragment_find_
private var liveExplore: LiveData<List<BookSource>>? = null private var liveExplore: LiveData<List<BookSource>>? = null
private var groupsMenu: SubMenu? = null private var groupsMenu: SubMenu? = null
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
setSupportToolbar(toolbar) setSupportToolbar(toolbar)
initSearchView() initSearchView()
initRecyclerView() initRecyclerView()

@ -30,7 +30,7 @@ import org.jetbrains.anko.startActivity
class MyFragment : BaseFragment(R.layout.fragment_my_config), FileChooserDialog.CallBack { class MyFragment : BaseFragment(R.layout.fragment_my_config), FileChooserDialog.CallBack {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
setSupportToolbar(toolbar) setSupportToolbar(toolbar)
val fragmentTag = "prefFragment" val fragmentTag = "prefFragment"
var preferenceFragment = childFragmentManager.findFragmentByTag(fragmentTag) var preferenceFragment = childFragmentManager.findFragmentByTag(fragmentTag)

@ -25,7 +25,7 @@ class RssFragment : BaseFragment(R.layout.fragment_rss),
private lateinit var adapter: RssAdapter private lateinit var adapter: RssAdapter
override fun onViewCreated(view: View, savedInstanceState: Bundle?) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) {
setSupportToolbar(toolbar) setSupportToolbar(toolbar)
initRecyclerView() initRecyclerView()
initData() initData()

Loading…
Cancel
Save