pull/293/head
gedoor 5 years ago
parent a947fd60be
commit e62a8eb015
  1. 4
      app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
  2. 6
      app/src/main/java/io/legado/app/ui/widget/ArcView.kt
  3. 12
      app/src/main/res/layout-land/activity_book_info.xml
  4. 27
      app/src/main/res/layout/activity_book_info.xml

@ -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)

@ -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()
}
}

@ -43,9 +43,10 @@
android:layout_marginTop="68dp">
<io.legado.app.ui.widget.ArcView
android:id="@+id/arc_view"
android:layout_width="match_parent"
android:layout_height="78dp"
android:layout_marginTop="120dp"
android:layout_marginTop="128dp"
app:arcDirectionTop="true"
app:arcHeight="36dp"
app:bgColor="@color/background" />
@ -71,6 +72,7 @@
</RelativeLayout>
<LinearLayout
android:id="@+id/ll_info"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background"
@ -150,6 +152,7 @@
android:layout_height="match_parent">
<ScrollView
android:id="@+id/scroll_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
@ -174,7 +177,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
@ -368,12 +370,6 @@
</ScrollView>
<View
android:layout_marginBottom="1px"
android:layout_width="match_parent"
android:layout_height="8dp"
android:background="@color/background" />
<LinearLayout
android:id="@+id/fl_action"
android:layout_width="match_parent"

@ -34,20 +34,21 @@
android:layout_marginTop="8dp">
<io.legado.app.ui.widget.ArcView
app:arcHeight="36dp"
app:bgColor="@color/background"
app:arcDirectionTop="true"
android:id="@+id/arc_view"
android:layout_marginTop="90dp"
android:layout_width="match_parent"
android:layout_height="78dp" />
android:layout_height="78dp"
app:arcDirectionTop="true"
app:arcHeight="36dp"
app:bgColor="@color/background" />
<androidx.cardview.widget.CardView
app:cardCornerRadius="5dp"
app:cardElevation="8dp"
android:layout_margin="3dp"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
app:cardCornerRadius="5dp"
app:cardElevation="8dp">
<io.legado.app.ui.widget.image.CoverImageView
android:id="@+id/iv_cover"
@ -62,6 +63,7 @@
</RelativeLayout>
<ScrollView
android:id="@+id/scroll_view"
android:background="@color/background"
android:layout_weight="1.0"
android:padding="0dp"
@ -71,9 +73,10 @@
android:scrollbars="vertical"
android:fillViewport="true"
android:fitsSystemWindows="false"
android:focusable="true" >
android:focusable="true">
<LinearLayout
android:id="@+id/ll_info"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
@ -85,7 +88,6 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/background"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingTop="8dp"
@ -121,11 +123,9 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingBottom="8dp"
android:background="@color/background"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -347,11 +347,6 @@
</ScrollView>
<View
android:layout_width="match_parent"
android:layout_height="8dp"
android:background="@color/background" />
<View
android:layout_width="match_parent"
android:layout_height="1px"

Loading…
Cancel
Save