Merge pull request #6 from gedoor/master

up
pull/61/head^2
口口吕 5 years ago committed by GitHub
commit 6e036596e1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      app/src/main/java/io/legado/app/ui/rss/article/RssArticlesActivity.kt
  2. 2
      app/src/main/java/io/legado/app/ui/rss/read/ReadRssActivity.kt
  3. 1
      app/src/main/res/layout/activity_rss_read.xml

@ -126,6 +126,7 @@ class RssArticlesActivity : VMBaseActivity<RssArticlesViewModel>(R.layout.activi
override fun readRss(rssArticle: RssArticle) { override fun readRss(rssArticle: RssArticle) {
viewModel.read(rssArticle) viewModel.read(rssArticle)
startActivity<ReadRssActivity>( startActivity<ReadRssActivity>(
Pair("title", rssArticle.title),
Pair("origin", rssArticle.origin), Pair("origin", rssArticle.origin),
Pair("link", rssArticle.link) Pair("link", rssArticle.link)
) )

@ -25,7 +25,7 @@ class ReadRssActivity : VMBaseActivity<ReadRssViewModel>(R.layout.activity_rss_r
override fun onActivityCreated(savedInstanceState: Bundle?) { override fun onActivityCreated(savedInstanceState: Bundle?) {
viewModel.callBack = this viewModel.callBack = this
title = intent.getStringExtra("title") title_bar.title = intent.getStringExtra("title")
initWebView() initWebView()
initLiveData() initLiveData()
viewModel.initData(intent) viewModel.initData(intent)

@ -5,6 +5,7 @@
android:orientation="vertical"> android:orientation="vertical">
<io.legado.app.ui.widget.TitleBar <io.legado.app.ui.widget.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />

Loading…
Cancel
Save