From e62a8eb015f0d717ebda6f15db1a21fa04c04c42 Mon Sep 17 00:00:00 2001 From: gedoor Date: Mon, 3 Aug 2020 21:29:50 +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 --- .../app/ui/book/info/BookInfoActivity.kt | 4 +++ .../java/io/legado/app/ui/widget/ArcView.kt | 6 ++++- .../res/layout-land/activity_book_info.xml | 12 +++------ .../main/res/layout/activity_book_info.xml | 27 ++++++++----------- 4 files changed, 24 insertions(+), 25 deletions(-) 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 14f190329..407542ea8 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 @@ -23,6 +23,7 @@ import io.legado.app.help.BlurTransformation import io.legado.app.help.ImageLoader import io.legado.app.help.IntentDataHelp import io.legado.app.lib.dialogs.alert +import io.legado.app.lib.theme.backgroundColor import io.legado.app.ui.audio.AudioPlayActivity import io.legado.app.ui.book.changecover.ChangeCoverDialog import io.legado.app.ui.book.changesource.ChangeSourceDialog @@ -59,6 +60,9 @@ class BookInfoActivity : override fun onActivityCreated(savedInstanceState: Bundle?) { title_bar.transparent() + arc_view.setBgColor(backgroundColor) + ll_info.setBackgroundColor(backgroundColor) + scroll_view.setBackgroundColor(backgroundColor) viewModel.bookData.observe(this, Observer { showBook(it) }) viewModel.chapterListData.observe(this, Observer { upLoading(false, it) }) viewModel.initData(intent) diff --git a/app/src/main/java/io/legado/app/ui/widget/ArcView.kt b/app/src/main/java/io/legado/app/ui/widget/ArcView.kt index b9834132c..6338c6638 100644 --- a/app/src/main/java/io/legado/app/ui/widget/ArcView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/ArcView.kt @@ -18,7 +18,7 @@ class ArcView @JvmOverloads constructor( private val mArcHeight: Int //背景颜色 - private val mBgColor: Int + private var mBgColor: Int private val mPaint: Paint = Paint() private val mDirectionTop: Boolean val rect = Rect() @@ -76,4 +76,8 @@ class ArcView @JvmOverloads constructor( setMeasuredDimension(mWidth, mHeight) } + fun setBgColor(color: Int) { + mBgColor = color + invalidate() + } } \ No newline at end of file diff --git a/app/src/main/res/layout-land/activity_book_info.xml b/app/src/main/res/layout-land/activity_book_info.xml index 518501721..dbc83517e 100644 --- a/app/src/main/res/layout-land/activity_book_info.xml +++ b/app/src/main/res/layout-land/activity_book_info.xml @@ -43,9 +43,10 @@ android:layout_marginTop="68dp"> @@ -71,6 +72,7 @@ - - + android:layout_height="78dp" + app:arcDirectionTop="true" + app:arcHeight="36dp" + app:bgColor="@color/background" /> + android:layout_height="wrap_content" + app:cardCornerRadius="5dp" + app:cardElevation="8dp"> + android:focusable="true"> - - -