pull/35/head^2
kunfei 5 years ago
parent 8a05d8dde9
commit 9dddc17d5e
  1. 4
      app/src/main/java/io/legado/app/ui/book/info/BookInfoActivity.kt
  2. 8
      app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt
  3. 4
      app/src/main/java/io/legado/app/ui/explore/ExploreShowAdapter.kt
  4. 4
      app/src/main/java/io/legado/app/ui/main/bookshelf/BooksAdapter.kt
  5. 2
      app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt
  6. 8
      app/src/main/java/io/legado/app/ui/widget/anima/RefreshProgressBar.kt
  7. 0
      app/src/main/res/drawable/image_cover_default.jpg
  8. 0
      app/src/main/res/drawable/image_cover_gs.jpg
  9. BIN
      app/src/main/res/drawable/image_rss.jpg
  10. 2
      app/src/main/res/layout-land/activity_book_info.xml
  11. 2
      app/src/main/res/layout/activity_audio_play.xml
  12. 2
      app/src/main/res/layout/activity_book_info.xml
  13. 2
      app/src/main/res/layout/activity_book_info_edit.xml
  14. 2
      app/src/main/res/layout/item_bookshelf_list.xml
  15. 2
      app/src/main/res/layout/item_rss.xml
  16. 2
      app/src/main/res/layout/item_search.xml

@ -88,8 +88,8 @@ class BookInfoActivity : VMBaseActivity<BookInfoViewModel>(R.layout.activity_boo
book.getDisplayIntro() // getString(R.string.intro_show, book.getDisplayIntro()) book.getDisplayIntro() // getString(R.string.intro_show, book.getDisplayIntro())
book.getDisplayCover()?.let { book.getDisplayCover()?.let {
ImageLoader.load(this, it) ImageLoader.load(this, it)
.placeholder(R.drawable.img_cover_default) .placeholder(R.drawable.image_cover_default)
.error(R.drawable.img_cover_default) .error(R.drawable.image_cover_default)
.centerCrop() .centerCrop()
.setAsDrawable(iv_cover) .setAsDrawable(iv_cover)
} }

@ -84,8 +84,8 @@ class SearchAdapter(val callBack: CallBack) :
} }
searchBook.coverUrl.let { searchBook.coverUrl.let {
ImageLoader.load(context, it)//Glide自动识别http://和file:// ImageLoader.load(context, it)//Glide自动识别http://和file://
.placeholder(R.drawable.img_cover_default) .placeholder(R.drawable.image_cover_default)
.error(R.drawable.img_cover_default) .error(R.drawable.image_cover_default)
.centerCrop() .centerCrop()
.setAsDrawable(iv_cover) .setAsDrawable(iv_cover)
} }
@ -100,8 +100,8 @@ class SearchAdapter(val callBack: CallBack) :
1 -> bv_originCount.setBadgeCount(searchBook.originCount) 1 -> bv_originCount.setBadgeCount(searchBook.originCount)
2 -> searchBook.coverUrl.let { 2 -> searchBook.coverUrl.let {
ImageLoader.load(context, it)//Glide自动识别http://和file:// ImageLoader.load(context, it)//Glide自动识别http://和file://
.placeholder(R.drawable.img_cover_default) .placeholder(R.drawable.image_cover_default)
.error(R.drawable.img_cover_default) .error(R.drawable.image_cover_default)
.centerCrop() .centerCrop()
.setAsDrawable(iv_cover) .setAsDrawable(iv_cover)
} }

@ -59,8 +59,8 @@ class ExploreShowAdapter(context: Context, val callBack: CallBack) :
} }
item.coverUrl.let { item.coverUrl.let {
ImageLoader.load(context, it)//Glide自动识别http://和file:// ImageLoader.load(context, it)//Glide自动识别http://和file://
.placeholder(R.drawable.img_cover_default) .placeholder(R.drawable.image_cover_default)
.error(R.drawable.img_cover_default) .error(R.drawable.image_cover_default)
.centerCrop() .centerCrop()
.setAsDrawable(iv_cover) .setAsDrawable(iv_cover)
} }

@ -72,8 +72,8 @@ class BooksAdapter(private val callBack: CallBack) :
tv_last.text = book.latestChapterTitle tv_last.text = book.latestChapterTitle
book.getDisplayCover()?.let { book.getDisplayCover()?.let {
ImageLoader.load(context, it)//Glide自动识别http://和file:// ImageLoader.load(context, it)//Glide自动识别http://和file://
.placeholder(R.drawable.img_cover_default) .placeholder(R.drawable.image_cover_default)
.error(R.drawable.img_cover_default) .error(R.drawable.image_cover_default)
.centerCrop() .centerCrop()
.setAsDrawable(iv_cover) .setAsDrawable(iv_cover)
} }

@ -17,6 +17,8 @@ class RssAdapter(context: Context, val callBack: CallBack) :
tv_name.text = item.sourceName tv_name.text = item.sourceName
ImageLoader.load(context, item.sourceIcon) ImageLoader.load(context, item.sourceIcon)
.centerCrop() .centerCrop()
.placeholder(R.drawable.image_rss)
.error(R.drawable.image_rss)
.setAsBitmap(iv_icon) .setAsBitmap(iv_icon)
onClick { callBack.openRss(item) } onClick { callBack.openRss(item) }
} }

@ -16,15 +16,15 @@ class RefreshProgressBar @JvmOverloads constructor(
attrs: AttributeSet? = null, attrs: AttributeSet? = null,
defStyleAttr: Int = 0 defStyleAttr: Int = 0
) : View(context, attrs, defStyleAttr) { ) : View(context, attrs, defStyleAttr) {
internal var a = 1 private var a = 1
var maxProgress = 100
private var durProgress = 0 private var durProgress = 0
var secondMaxProgress = 100
private var secondDurProgress = 0 private var secondDurProgress = 0
var maxProgress = 100
var secondMaxProgress = 100
var bgColor = 0x00000000 var bgColor = 0x00000000
var secondColor = -0x3e3e3f var secondColor = -0x3e3e3f
var fontColor = -0xc9c9ca var fontColor = -0xc9c9ca
var speed = 1 var speed = 2
var secondFinalProgress = 0 var secondFinalProgress = 0
private set private set
private var paint: Paint = Paint() private var paint: Paint = Paint()

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Before

Width:  |  Height:  |  Size: 3.7 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.9 KiB

@ -28,7 +28,7 @@
android:layout_width="86dp" android:layout_width="86dp"
android:layout_height="120dp" android:layout_height="120dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:src="@drawable/img_cover_default" android:src="@drawable/image_cover_default"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title_bar" /> app:layout_constraintTop_toBottomOf="@+id/title_bar" />

@ -25,7 +25,7 @@
android:layout_height="260dp" android:layout_height="260dp"
android:layout_gravity="center" android:layout_gravity="center"
android:contentDescription="@string/img_cover" android:contentDescription="@string/img_cover"
android:src="@drawable/img_cover_default" android:src="@drawable/image_cover_default"
app:layout_constraintTop_toBottomOf="@+id/title_bar" app:layout_constraintTop_toBottomOf="@+id/title_bar"
app:layout_constraintBottom_toTopOf="@+id/ll_player_progress" app:layout_constraintBottom_toTopOf="@+id/ll_player_progress"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"

@ -19,7 +19,7 @@
android:layout_height="120dp" android:layout_height="120dp"
android:layout_margin="10dp" android:layout_margin="10dp"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/img_cover_default" android:src="@drawable/image_cover_default"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title_bar" /> app:layout_constraintTop_toBottomOf="@+id/title_bar" />

@ -34,7 +34,7 @@
android:layout_height="126dp" android:layout_height="126dp"
android:contentDescription="@string/img_cover" android:contentDescription="@string/img_cover"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/img_cover_default" /> android:src="@drawable/image_cover_default" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"

@ -16,7 +16,7 @@
android:layout_margin="8dp" android:layout_margin="8dp"
android:contentDescription="@string/img_cover" android:contentDescription="@string/img_cover"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/img_cover_default" android:src="@drawable/image_cover_default"
android:transitionName="img_cover" android:transitionName="img_cover"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"

@ -9,8 +9,6 @@
android:id="@+id/iv_icon" android:id="@+id/iv_icon"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:background="@color/colorPrimary"
android:src="@drawable/ic_image"
android:scaleType="centerCrop" android:scaleType="centerCrop"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"

@ -12,7 +12,7 @@
android:layout_margin="8dp" android:layout_margin="8dp"
android:contentDescription="@string/img_cover" android:contentDescription="@string/img_cover"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:src="@drawable/img_cover_default" android:src="@drawable/image_cover_default"
android:transitionName="img_cover" android:transitionName="img_cover"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"

Loading…
Cancel
Save