From 9dddc17d5e0cf8b7446f4c2a1428625742d78690 Mon Sep 17 00:00:00 2001 From: kunfei Date: Wed, 2 Oct 2019 18:37:59 +0800 Subject: [PATCH] up --- .../legado/app/ui/book/info/BookInfoActivity.kt | 4 ++-- .../legado/app/ui/book/search/SearchAdapter.kt | 8 ++++---- .../legado/app/ui/explore/ExploreShowAdapter.kt | 4 ++-- .../legado/app/ui/main/bookshelf/BooksAdapter.kt | 4 ++-- .../java/io/legado/app/ui/main/rss/RssAdapter.kt | 2 ++ .../app/ui/widget/anima/RefreshProgressBar.kt | 8 ++++---- ...cover_default.jpg => image_cover_default.jpg} | Bin .../{img_cover_gs.jpg => image_cover_gs.jpg} | Bin app/src/main/res/drawable/image_rss.jpg | Bin 0 -> 9125 bytes .../main/res/layout-land/activity_book_info.xml | 2 +- app/src/main/res/layout/activity_audio_play.xml | 2 +- app/src/main/res/layout/activity_book_info.xml | 2 +- .../main/res/layout/activity_book_info_edit.xml | 2 +- app/src/main/res/layout/item_bookshelf_list.xml | 2 +- app/src/main/res/layout/item_rss.xml | 2 -- app/src/main/res/layout/item_search.xml | 2 +- 16 files changed, 22 insertions(+), 22 deletions(-) rename app/src/main/res/drawable/{img_cover_default.jpg => image_cover_default.jpg} (100%) rename app/src/main/res/drawable/{img_cover_gs.jpg => image_cover_gs.jpg} (100%) create mode 100644 app/src/main/res/drawable/image_rss.jpg 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 74d3b4495..3f78488de 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 @@ -88,8 +88,8 @@ class BookInfoActivity : VMBaseActivity(R.layout.activity_boo book.getDisplayIntro() // getString(R.string.intro_show, book.getDisplayIntro()) book.getDisplayCover()?.let { ImageLoader.load(this, it) - .placeholder(R.drawable.img_cover_default) - .error(R.drawable.img_cover_default) + .placeholder(R.drawable.image_cover_default) + .error(R.drawable.image_cover_default) .centerCrop() .setAsDrawable(iv_cover) } diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt index a2cb9ad08..38974157d 100644 --- a/app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/search/SearchAdapter.kt @@ -84,8 +84,8 @@ class SearchAdapter(val callBack: CallBack) : } searchBook.coverUrl.let { ImageLoader.load(context, it)//Glide自动识别http://和file:// - .placeholder(R.drawable.img_cover_default) - .error(R.drawable.img_cover_default) + .placeholder(R.drawable.image_cover_default) + .error(R.drawable.image_cover_default) .centerCrop() .setAsDrawable(iv_cover) } @@ -100,8 +100,8 @@ class SearchAdapter(val callBack: CallBack) : 1 -> bv_originCount.setBadgeCount(searchBook.originCount) 2 -> searchBook.coverUrl.let { ImageLoader.load(context, it)//Glide自动识别http://和file:// - .placeholder(R.drawable.img_cover_default) - .error(R.drawable.img_cover_default) + .placeholder(R.drawable.image_cover_default) + .error(R.drawable.image_cover_default) .centerCrop() .setAsDrawable(iv_cover) } diff --git a/app/src/main/java/io/legado/app/ui/explore/ExploreShowAdapter.kt b/app/src/main/java/io/legado/app/ui/explore/ExploreShowAdapter.kt index 6510735f5..1a248e736 100644 --- a/app/src/main/java/io/legado/app/ui/explore/ExploreShowAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/explore/ExploreShowAdapter.kt @@ -59,8 +59,8 @@ class ExploreShowAdapter(context: Context, val callBack: CallBack) : } item.coverUrl.let { ImageLoader.load(context, it)//Glide自动识别http://和file:// - .placeholder(R.drawable.img_cover_default) - .error(R.drawable.img_cover_default) + .placeholder(R.drawable.image_cover_default) + .error(R.drawable.image_cover_default) .centerCrop() .setAsDrawable(iv_cover) } diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BooksAdapter.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BooksAdapter.kt index d6df919e0..5152278ca 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BooksAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BooksAdapter.kt @@ -72,8 +72,8 @@ class BooksAdapter(private val callBack: CallBack) : tv_last.text = book.latestChapterTitle book.getDisplayCover()?.let { ImageLoader.load(context, it)//Glide自动识别http://和file:// - .placeholder(R.drawable.img_cover_default) - .error(R.drawable.img_cover_default) + .placeholder(R.drawable.image_cover_default) + .error(R.drawable.image_cover_default) .centerCrop() .setAsDrawable(iv_cover) } diff --git a/app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt b/app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt index a5efbf379..b490c8ec8 100644 --- a/app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/main/rss/RssAdapter.kt @@ -17,6 +17,8 @@ class RssAdapter(context: Context, val callBack: CallBack) : tv_name.text = item.sourceName ImageLoader.load(context, item.sourceIcon) .centerCrop() + .placeholder(R.drawable.image_rss) + .error(R.drawable.image_rss) .setAsBitmap(iv_icon) onClick { callBack.openRss(item) } } diff --git a/app/src/main/java/io/legado/app/ui/widget/anima/RefreshProgressBar.kt b/app/src/main/java/io/legado/app/ui/widget/anima/RefreshProgressBar.kt index 3eee366be..1095d5889 100644 --- a/app/src/main/java/io/legado/app/ui/widget/anima/RefreshProgressBar.kt +++ b/app/src/main/java/io/legado/app/ui/widget/anima/RefreshProgressBar.kt @@ -16,15 +16,15 @@ class RefreshProgressBar @JvmOverloads constructor( attrs: AttributeSet? = null, defStyleAttr: Int = 0 ) : View(context, attrs, defStyleAttr) { - internal var a = 1 - var maxProgress = 100 + private var a = 1 private var durProgress = 0 - var secondMaxProgress = 100 private var secondDurProgress = 0 + var maxProgress = 100 + var secondMaxProgress = 100 var bgColor = 0x00000000 var secondColor = -0x3e3e3f var fontColor = -0xc9c9ca - var speed = 1 + var speed = 2 var secondFinalProgress = 0 private set private var paint: Paint = Paint() diff --git a/app/src/main/res/drawable/img_cover_default.jpg b/app/src/main/res/drawable/image_cover_default.jpg similarity index 100% rename from app/src/main/res/drawable/img_cover_default.jpg rename to app/src/main/res/drawable/image_cover_default.jpg diff --git a/app/src/main/res/drawable/img_cover_gs.jpg b/app/src/main/res/drawable/image_cover_gs.jpg similarity index 100% rename from app/src/main/res/drawable/img_cover_gs.jpg rename to app/src/main/res/drawable/image_cover_gs.jpg diff --git a/app/src/main/res/drawable/image_rss.jpg b/app/src/main/res/drawable/image_rss.jpg new file mode 100644 index 0000000000000000000000000000000000000000..a152df50636b1ba8398bdc90679fc56480a6b1ec GIT binary patch literal 9125 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 literal 0 HcmV?d00001 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 d043d23f7..a284835eb 100644 --- a/app/src/main/res/layout-land/activity_book_info.xml +++ b/app/src/main/res/layout-land/activity_book_info.xml @@ -28,7 +28,7 @@ android:layout_width="86dp" android:layout_height="120dp" android:layout_margin="10dp" - android:src="@drawable/img_cover_default" + android:src="@drawable/image_cover_default" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/title_bar" /> diff --git a/app/src/main/res/layout/activity_audio_play.xml b/app/src/main/res/layout/activity_audio_play.xml index 2a392be02..ec6bbd556 100644 --- a/app/src/main/res/layout/activity_audio_play.xml +++ b/app/src/main/res/layout/activity_audio_play.xml @@ -25,7 +25,7 @@ android:layout_height="260dp" android:layout_gravity="center" 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_constraintBottom_toTopOf="@+id/ll_player_progress" app:layout_constraintLeft_toLeftOf="parent" diff --git a/app/src/main/res/layout/activity_book_info.xml b/app/src/main/res/layout/activity_book_info.xml index 0f4028383..9c2887c68 100644 --- a/app/src/main/res/layout/activity_book_info.xml +++ b/app/src/main/res/layout/activity_book_info.xml @@ -19,7 +19,7 @@ android:layout_height="120dp" android:layout_margin="10dp" android:scaleType="centerCrop" - android:src="@drawable/img_cover_default" + android:src="@drawable/image_cover_default" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toBottomOf="@+id/title_bar" /> diff --git a/app/src/main/res/layout/activity_book_info_edit.xml b/app/src/main/res/layout/activity_book_info_edit.xml index 4244c2b89..12328a069 100644 --- a/app/src/main/res/layout/activity_book_info_edit.xml +++ b/app/src/main/res/layout/activity_book_info_edit.xml @@ -34,7 +34,7 @@ android:layout_height="126dp" android:contentDescription="@string/img_cover" android:scaleType="centerCrop" - android:src="@drawable/img_cover_default" /> + android:src="@drawable/image_cover_default" />