From 0c8a421e5678a9b0f51c8c3ac01744bf6c62e619 Mon Sep 17 00:00:00 2001 From: gedoor Date: Tue, 22 Jun 2021 10:57:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../association/ImportBookSourceActivity.kt | 4 +--- .../association/ImportReplaceRuleActivity.kt | 4 +--- .../ui/association/ImportRssSourceActivity.kt | 4 +--- .../ui/book/arrange/ArrangeBookActivity.kt | 3 +-- .../legado/app/ui/book/cache/CacheActivity.kt | 22 ++++++++++--------- .../ui/book/explore/ExploreShowActivity.kt | 2 +- .../app/ui/book/info/BookInfoActivity.kt | 2 +- .../ui/book/info/edit/BookInfoEditActivity.kt | 3 +-- .../app/ui/book/local/ImportBookActivity.kt | 8 +++---- .../app/ui/book/read/ReadBookBaseActivity.kt | 3 +-- .../app/ui/book/search/SearchActivity.kt | 3 +-- .../searchContent/SearchContentActivity.kt | 3 +-- .../source/debug/BookSourceDebugActivity.kt | 3 +-- .../source/edit/BookSourceEditActivity.kt | 2 +- .../book/source/manage/BookSourceActivity.kt | 2 +- .../app/ui/book/toc/BookmarkFragment.kt | 2 +- .../app/ui/book/toc/ChapterListFragment.kt | 2 +- .../io/legado/app/ui/book/toc/TocActivity.kt | 2 +- .../io/legado/app/ui/config/ConfigActivity.kt | 2 +- .../io/legado/app/ui/main/MainActivity.kt | 2 +- .../main/bookshelf/BaseBookshelfFragment.kt | 4 ++-- .../app/ui/main/explore/ExploreFragment.kt | 2 +- .../io/legado/app/ui/main/rss/RssFragment.kt | 3 +-- .../app/ui/replace/ReplaceRuleActivity.kt | 2 +- .../ui/replace/edit/ReplaceEditActivity.kt | 3 +-- .../app/ui/rss/article/RssArticlesFragment.kt | 6 ++--- .../app/ui/rss/article/RssSortActivity.kt | 3 +-- .../legado/app/ui/rss/read/ReadRssActivity.kt | 2 +- .../source/debug/RssSourceDebugActivity.kt | 2 +- .../rss/source/edit/RssSourceEditActivity.kt | 4 +--- .../ui/rss/source/manage/RssSourceActivity.kt | 3 +-- 31 files changed, 47 insertions(+), 65 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/association/ImportBookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/association/ImportBookSourceActivity.kt index a4ee8af19..9884a768d 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportBookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportBookSourceActivity.kt @@ -19,9 +19,7 @@ class ImportBookSourceActivity : ) { override val binding by viewBinding(ActivityTranslucenceBinding::inflate) - - override val viewModel: ImportBookSourceViewModel - by viewModels() + override val viewModel by viewModels() override fun onActivityCreated(savedInstanceState: Bundle?) { binding.rotateLoading.show() diff --git a/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleActivity.kt b/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleActivity.kt index c2fa0d04d..d77256698 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleActivity.kt @@ -18,9 +18,7 @@ class ImportReplaceRuleActivity : ) { override val binding by viewBinding(ActivityTranslucenceBinding::inflate) - - override val viewModel: ImportReplaceRuleViewModel - by viewModels() + override val viewModel by viewModels() override fun onActivityCreated(savedInstanceState: Bundle?) { binding.rotateLoading.show() diff --git a/app/src/main/java/io/legado/app/ui/association/ImportRssSourceActivity.kt b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceActivity.kt index 724cd70be..651aa82c2 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportRssSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceActivity.kt @@ -18,9 +18,7 @@ class ImportRssSourceActivity : ) { override val binding by viewBinding(ActivityTranslucenceBinding::inflate) - - override val viewModel: ImportRssSourceViewModel - by viewModels() + override val viewModel by viewModels() override fun onActivityCreated(savedInstanceState: Bundle?) { binding.rotateLoading.show() diff --git a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt index 82b1915c4..63268b2d9 100644 --- a/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/arrange/ArrangeBookActivity.kt @@ -39,8 +39,7 @@ class ArrangeBookActivity : VMBaseActivity() override val groupList: ArrayList = arrayListOf() private val groupRequestCode = 22 private val addToGroupRequestCode = 34 diff --git a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt index 89d79e307..5a3822c1d 100644 --- a/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/cache/CacheActivity.kt @@ -39,6 +39,18 @@ import java.util.concurrent.CopyOnWriteArraySet class CacheActivity : VMBaseActivity(), CacheAdapter.CallBack { + override val binding by viewBinding(ActivityCacheBookBinding::inflate) + override val viewModel by viewModels() + + private val exportBookPathKey = "exportBookPath" + lateinit var adapter: CacheAdapter + private var groupLiveData: LiveData>? = null + private var booksLiveData: LiveData>? = null + private var menu: Menu? = null + private var exportPosition = -1 + private val groupList: ArrayList = arrayListOf() + private var groupId: Long = -1 + private val exportDir = registerForActivityResult(FilePicker()) { uri -> uri ?: return@registerForActivityResult if (uri.isContentScheme()) { @@ -51,16 +63,6 @@ class CacheActivity : VMBaseActivity() } } } - private val exportBookPathKey = "exportBookPath" - lateinit var adapter: CacheAdapter - private var groupLiveData: LiveData>? = null - private var booksLiveData: LiveData>? = null - private var menu: Menu? = null - private var exportPosition = -1 - private val groupList: ArrayList = arrayListOf() - private var groupId: Long = -1 - override val binding by viewBinding(ActivityCacheBookBinding::inflate) - override val viewModel: CacheViewModel by viewModels() override fun onActivityCreated(savedInstanceState: Bundle?) { groupId = intent.getLongExtra("groupId", -1) diff --git a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt index 760df2c71..76d2b22f8 100644 --- a/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/explore/ExploreShowActivity.kt @@ -18,7 +18,7 @@ import io.legado.app.utils.viewbindingdelegate.viewBinding class ExploreShowActivity : VMBaseActivity(), ExploreShowAdapter.CallBack { override val binding by viewBinding(ActivityExploreShowBinding::inflate) - override val viewModel: ExploreShowViewModel by viewModels() + override val viewModel by viewModels() private lateinit var adapter: ExploreShowAdapter private lateinit var loadMoreView: LoadMoreView diff --git a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt index 7b1f1c5d6..e8d423fdf 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt @@ -91,7 +91,7 @@ class BookInfoActivity : } override val binding by viewBinding(ActivityBookInfoBinding::inflate) - override val viewModel: BookInfoViewModel by viewModels() + override val viewModel by viewModels() @SuppressLint("PrivateResource") override fun onActivityCreated(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt index df0757e4e..2a36e9874 100644 --- a/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/info/edit/BookInfoEditActivity.kt @@ -31,8 +31,7 @@ class BookInfoEditActivity : } override val binding by viewBinding(ActivityBookInfoEditBinding::inflate) - override val viewModel: BookInfoEditViewModel - by viewModels() + override val viewModel by viewModels() override fun onActivityCreated(savedInstanceState: Bundle?) { viewModel.bookData.observe(this, { upView(it) }) diff --git a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt index 98889e85e..0bb66218d 100644 --- a/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/local/ImportBookActivity.kt @@ -39,6 +39,10 @@ class ImportBookActivity : VMBaseActivity() + private var rootDoc: DocumentFile? = null private val subDocs = arrayListOf() private lateinit var adapter: ImportBookAdapter @@ -58,10 +62,6 @@ class ImportBookActivity : VMBaseActivity(imageBg = false) { override val binding by viewBinding(ActivityBookReadBinding::inflate) - override val viewModel: ReadBookViewModel - by viewModels() + override val viewModel by viewModels() var bottomDialog = 0 override fun onCreate(savedInstanceState: Bundle?) { diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt index ebee774f0..8d6da964f 100644 --- a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt @@ -38,8 +38,7 @@ class SearchActivity : VMBaseActivity() lateinit var adapter: SearchAdapter private lateinit var bookAdapter: BookAdapter diff --git a/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt index a164ab184..77382d7c5 100644 --- a/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/searchContent/SearchContentActivity.kt @@ -34,8 +34,7 @@ class SearchContentActivity : SearchContentAdapter.Callback { override val binding by viewBinding(ActivitySearchContentBinding::inflate) - override val viewModel: SearchContentViewModel - by viewModels() + override val viewModel by viewModels() lateinit var adapter: SearchContentAdapter private lateinit var mLayoutManager: UpLinearLayoutManager private lateinit var searchView: SearchView diff --git a/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt index 20ba8db96..43c2ba1ae 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt @@ -20,8 +20,7 @@ import kotlinx.coroutines.launch class BookSourceDebugActivity : VMBaseActivity() { override val binding by viewBinding(ActivitySourceDebugBinding::inflate) - override val viewModel: BookSourceDebugModel - by viewModels() + override val viewModel by viewModels() private lateinit var adapter: BookSourceDebugAdapter private lateinit var searchView: SearchView diff --git a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt index 2332bae61..0ab548be7 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/edit/BookSourceEditActivity.kt @@ -40,7 +40,7 @@ class BookSourceEditActivity : KeyboardToolPop.CallBack { override val binding by viewBinding(ActivityBookSourceEditBinding::inflate) - override val viewModel: BookSourceEditViewModel by viewModels() + override val viewModel by viewModels() private val adapter = BookSourceEditAdapter() private val sourceEntities: ArrayList = ArrayList() diff --git a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt index f2312ce86..75cfb5124 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/manage/BookSourceActivity.kt @@ -48,7 +48,7 @@ class BookSourceActivity : VMBaseActivity() private val importRecordKey = "bookSourceRecordKey" private lateinit var adapter: BookSourceAdapter private lateinit var searchView: SearchView diff --git a/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt b/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt index 70797a6e0..7610f9f0e 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/BookmarkFragment.kt @@ -25,7 +25,7 @@ import io.legado.app.utils.viewbindingdelegate.viewBinding class BookmarkFragment : VMBaseFragment(R.layout.fragment_bookmark), BookmarkAdapter.Callback, TocViewModel.BookmarkCallBack { - override val viewModel: TocViewModel by activityViewModels() + override val viewModel by activityViewModels() private val binding by viewBinding(FragmentBookmarkBinding::bind) private lateinit var adapter: BookmarkAdapter private var bookmarkLiveData: LiveData>? = null diff --git a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt index 62af4a8d2..b13e64c9e 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt @@ -31,7 +31,7 @@ import kotlin.math.min class ChapterListFragment : VMBaseFragment(R.layout.fragment_chapter_list), ChapterListAdapter.Callback, TocViewModel.ChapterListCallBack { - override val viewModel: TocViewModel by activityViewModels() + override val viewModel by activityViewModels() private val binding by viewBinding(FragmentChapterListBinding::bind) lateinit var adapter: ChapterListAdapter private var durChapterIndex = 0 diff --git a/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt b/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt index d6374a1cf..3bfd9b500 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt @@ -26,7 +26,7 @@ import io.legado.app.utils.visible class TocActivity : VMBaseActivity() { override val binding by viewBinding(ActivityChapterListBinding::inflate) - override val viewModel: TocViewModel by viewModels() + override val viewModel by viewModels() private lateinit var tabLayout: TabLayout private var searchView: SearchView? = null diff --git a/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt index 6552a5553..b022a2fe2 100644 --- a/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt +++ b/app/src/main/java/io/legado/app/ui/config/ConfigActivity.kt @@ -13,7 +13,7 @@ import io.legado.app.utils.viewbindingdelegate.viewBinding class ConfigActivity : VMBaseActivity() { override val binding by viewBinding(ActivityConfigBinding::inflate) - override val viewModel: ConfigViewModel by viewModels() + override val viewModel by viewModels() override fun onActivityCreated(savedInstanceState: Bundle?) { intent.getIntExtra("configType", -1).let { diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt index 349357aa6..7a718bcb9 100644 --- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -44,7 +44,7 @@ class MainActivity : VMBaseActivity(), BottomNavigationView.OnNavigationItemReselectedListener { override val binding by viewBinding(ActivityMainBinding::inflate) - override val viewModel: MainViewModel by viewModels() + override val viewModel by viewModels() private var exitTime: Long = 0 private var bookshelfReselected: Long = 0 private var exploreReselected: Long = 0 diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt index 2ee4a5806..d9a5acbfe 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BaseBookshelfFragment.kt @@ -25,8 +25,8 @@ import io.legado.app.utils.* abstract class BaseBookshelfFragment(layoutId: Int) : VMBaseFragment(layoutId) { - val activityViewModel: MainViewModel by activityViewModels() - override val viewModel: BookshelfViewModel by viewModels() + val activityViewModel by activityViewModels() + override val viewModel by viewModels() private val importBookshelf = registerForActivityResult(FilePicker()) { it?.readText(requireContext())?.let { text -> diff --git a/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt index b9f098ccb..4660e2ea1 100644 --- a/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt @@ -33,7 +33,7 @@ import io.legado.app.utils.viewbindingdelegate.viewBinding */ class ExploreFragment : VMBaseFragment(R.layout.fragment_explore), ExploreAdapter.CallBack { - override val viewModel: ExploreViewModel by viewModels() + override val viewModel by viewModels() private val binding by viewBinding(FragmentExploreBinding::bind) private lateinit var adapter: ExploreAdapter private lateinit var linearLayoutManager: LinearLayoutManager diff --git a/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt b/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt index c8da52722..39c9143d5 100644 --- a/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt @@ -37,10 +37,9 @@ import io.legado.app.utils.viewbindingdelegate.viewBinding class RssFragment : VMBaseFragment(R.layout.fragment_rss), RssAdapter.CallBack { private val binding by viewBinding(FragmentRssBinding::bind) + override val viewModel by viewModels() private lateinit var adapter: RssAdapter private lateinit var searchView: SearchView - override val viewModel: RssSourceViewModel - by viewModels() private var liveRssData: LiveData>? = null private val groups = linkedSetOf() private var liveGroup: LiveData>? = null diff --git a/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt index 983d4480e..2fc737bd9 100644 --- a/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt +++ b/app/src/main/java/io/legado/app/ui/replace/ReplaceRuleActivity.kt @@ -50,7 +50,7 @@ class ReplaceRuleActivity : VMBaseActivity() private val importRecordKey = "replaceRuleRecordKey" private lateinit var adapter: ReplaceRuleAdapter private lateinit var searchView: SearchView diff --git a/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt index d91222bd6..70687727f 100644 --- a/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/replace/edit/ReplaceEditActivity.kt @@ -52,8 +52,7 @@ class ReplaceEditActivity : } override val binding by viewBinding(ActivityReplaceEditBinding::inflate) - override val viewModel: ReplaceEditViewModel - by viewModels() + override val viewModel by viewModels() private var mSoftKeyboardTool: PopupWindow? = null private var mIsSoftKeyBoardShowing = false diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesFragment.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesFragment.kt index 8bdd5faa9..8adcfba95 100644 --- a/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesFragment.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssArticlesFragment.kt @@ -38,10 +38,8 @@ class RssArticlesFragment : VMBaseFragment(R.layout.fragme } private val binding by viewBinding(FragmentRssArticlesBinding::bind) - private val activityViewModel: RssSortViewModel - by activityViewModels() - override val viewModel: RssArticlesViewModel - by viewModels() + private val activityViewModel by activityViewModels() + override val viewModel by viewModels() lateinit var adapter: BaseRssArticlesAdapter<*> private lateinit var loadMoreView: LoadMoreView private var rssArticlesData: LiveData>? = null diff --git a/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt b/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt index 2e88e462c..ec7e366db 100644 --- a/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/article/RssSortActivity.kt @@ -21,8 +21,7 @@ import io.legado.app.utils.visible class RssSortActivity : VMBaseActivity() { override val binding by viewBinding(ActivityRssArtivlesBinding::inflate) - override val viewModel: RssSortViewModel - by viewModels() + override val viewModel by viewModels() private lateinit var adapter: TabFragmentPageAdapter private val fragments = linkedMapOf() private val upSourceResult = registerForActivityResult( diff --git a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt index c4cde5610..d6a12d815 100644 --- a/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt @@ -37,7 +37,7 @@ class ReadRssActivity : VMBaseActivity ReadRssViewModel.CallBack { override val binding by viewBinding(ActivityRssReadBinding::inflate) - override val viewModel: ReadRssViewModel by viewModels() + override val viewModel by viewModels() private val imagePathKey = "" private var starMenuItem: MenuItem? = null private var ttsMenuItem: MenuItem? = null diff --git a/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugActivity.kt index a03483a7d..2d0e5f302 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugActivity.kt @@ -21,7 +21,7 @@ import kotlinx.coroutines.launch class RssSourceDebugActivity : VMBaseActivity() { override val binding by viewBinding(ActivitySourceDebugBinding::inflate) - override val viewModel: RssSourceDebugModel by viewModels() + override val viewModel by viewModels() private lateinit var adapter: RssSourceDebugAdapter diff --git a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt index 97df39a12..cd941c206 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/edit/RssSourceEditActivity.kt @@ -34,6 +34,7 @@ class RssSourceEditActivity : KeyboardToolPop.CallBack { override val binding by viewBinding(ActivityRssSourceEditBinding::inflate) + override val viewModel by viewModels() private var mSoftKeyboardTool: PopupWindow? = null private var mIsSoftKeyBoardShowing = false private val adapter = RssSourceEditAdapter() @@ -46,9 +47,6 @@ class RssSourceEditActivity : } } - override val viewModel: RssSourceEditViewModel - by viewModels() - override fun onActivityCreated(savedInstanceState: Bundle?) { initView() viewModel.initData(intent) { diff --git a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt index abeef35b2..e90a1f287 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/manage/RssSourceActivity.kt @@ -46,8 +46,7 @@ class RssSourceActivity : VMBaseActivity() private val importRecordKey = "rssSourceRecordKey" private lateinit var adapter: RssSourceAdapter private var sourceLiveData: LiveData>? = null