diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8b943cc65..b30b4bf58 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -93,6 +93,34 @@
android:resource="@xml/shortcuts"
android:launchMode="singleTask" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
【备份与恢复】，选择【导入旧版本数据】。
* 请关注[开源阅读]()支持我,同时关注合作公众号[小说拾遗](),阅读公众号小编。
+* 弄了个企业公众号[开源阅读](),后面弄好后会把原来的开源阅读软件迁移过来
+
+**2020/03/18**
+* 尝试修复搜索时崩溃
+* 解决看过书籍的移到顶部需要向上滚动才能看到的bug
+* 只有再书源被删除找不到书源时才会自动换源
**2020/03/16**
-* 弄了个企业公众号[开源阅读](),后面弄好后会把原来的开源阅读软件迁移过来
* 修复滚动模式切换章节位置不归0的bug
* 修复文字选择更多菜单在部分手机上报错的bug
* 修复文字选择菜单问题
diff --git a/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt b/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt
index 70f72f55a..90c63e4b7 100644
--- a/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt
+++ b/app/src/main/java/io/legado/app/help/LauncherIconHelp.kt
@@ -18,7 +18,8 @@ object LauncherIconHelp {
ComponentName(App.INSTANCE, Launcher1::class.java.name),
ComponentName(App.INSTANCE, Launcher2::class.java.name),
ComponentName(App.INSTANCE, Launcher3::class.java.name),
- ComponentName(App.INSTANCE, Launcher4::class.java.name)
+ ComponentName(App.INSTANCE, Launcher4::class.java.name),
+ ComponentName(App.INSTANCE, Launcher5::class.java.name)
)
fun changeIcon(icon: String?) {
diff --git a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
index 2d1054859..8de6a489c 100644
--- a/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/book/search/SearchActivity.kt
@@ -283,10 +283,12 @@ class SearchActivity : VMBaseActivity(R.layout.activity_book_se
*/
@Synchronized
private fun upSearchItems(items: List, isMandatoryUpdate: Boolean) {
+ val searchItems = ArrayList(items)
if (isMandatoryUpdate || System.currentTimeMillis() - refreshTime > 500) {
refreshTime = System.currentTimeMillis()
- val diffResult = DiffUtil.calculateDiff(DiffCallBack(adapter.getItems(), items))
- adapter.setItems(items, diffResult)
+ val diffResult =
+ DiffUtil.calculateDiff(DiffCallBack(adapter.getItems(), searchItems))
+ adapter.setItems(searchItems, diffResult)
}
}
diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt
index 4a91379ae..d82480ca2 100644
--- a/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt
+++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/books/BooksFragment.kt
@@ -27,6 +27,7 @@ import io.legado.app.utils.getViewModelOfActivity
import io.legado.app.utils.observeEvent
import kotlinx.android.synthetic.main.fragment_books.*
import org.jetbrains.anko.startActivity
+import kotlin.math.max
class BooksFragment : BaseFragment(R.layout.fragment_books),
@@ -72,19 +73,23 @@ class BooksFragment : BaseFragment(R.layout.fragment_books),
booksAdapter = BooksAdapterList(requireContext(), this)
} else {
rv_bookshelf.layoutManager = GridLayoutManager(context, bookshelfLayout + 2)
- booksAdapter = BooksAdapterGrid(requireContext(),this)
+ booksAdapter = BooksAdapterGrid(requireContext(), this)
}
rv_bookshelf.adapter = booksAdapter
booksAdapter.registerAdapterDataObserver(object : RecyclerView.AdapterDataObserver() {
override fun onItemRangeInserted(positionStart: Int, itemCount: Int) {
- if (positionStart == 0) {
-
+ val layoutManager = rv_bookshelf.layoutManager
+ if (positionStart == 0 && layoutManager is LinearLayoutManager) {
+ val scrollTo = layoutManager.findFirstVisibleItemPosition() - itemCount
+ rv_bookshelf.scrollToPosition(max(0, scrollTo))
}
}
override fun onItemRangeMoved(fromPosition: Int, toPosition: Int, itemCount: Int) {
- if (toPosition == 0) {
-
+ val layoutManager = rv_bookshelf.layoutManager
+ if (toPosition == 0 && layoutManager is LinearLayoutManager) {
+ val scrollTo = layoutManager.findFirstVisibleItemPosition() - itemCount
+ rv_bookshelf.scrollToPosition(max(0, scrollTo))
}
}
})
diff --git a/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
index 0f9f3d729..faf9cef8a 100644
--- a/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
+++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreAdapter.kt
@@ -12,6 +12,7 @@ import io.legado.app.data.entities.BookSource
import io.legado.app.help.coroutine.Coroutine
import io.legado.app.lib.theme.accentColor
import io.legado.app.utils.ACache
+import io.legado.app.utils.dp
import io.legado.app.utils.gone
import io.legado.app.utils.visible
import kotlinx.android.synthetic.main.item_fillet_text.view.*
@@ -28,6 +29,11 @@ class ExploreAdapter(context: Context, private val scope: CoroutineScope, val ca
override fun convert(holder: ItemViewHolder, item: BookSource, payloads: MutableList) {
with(holder.itemView) {
+ if (holder.layoutPosition == getActualItemCount() - 1) {
+ setPadding(16.dp, 12.dp, 16.dp, 12.dp)
+ } else {
+ setPadding(16.dp, 12.dp, 16.dp, 0)
+ }
if (payloads.isEmpty()) {
tv_name.text = item.bookSourceName
}
diff --git a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
index 08eb06a70..fdf77bc85 100644
--- a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
@@ -59,4 +59,6 @@ open class WelcomeActivity : BaseActivity(R.layout.activity_welcome) {
class Launcher1 : WelcomeActivity()
class Launcher2 : WelcomeActivity()
class Launcher3 : WelcomeActivity()
-class Launcher4 : WelcomeActivity()
\ No newline at end of file
+class Launcher4 : WelcomeActivity()
+class Launcher5 : WelcomeActivity()
+class Launcher6 : WelcomeActivity()
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v24/ic_launcher_2.xml b/app/src/main/res/drawable-v24/ic_launcher_2.xml
deleted file mode 100644
index b4343492c..000000000
--- a/app/src/main/res/drawable-v24/ic_launcher_2.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/app/src/main/res/drawable-v24/ic_launcher_2b.xml b/app/src/main/res/drawable-v24/ic_launcher_2b.xml
deleted file mode 100644
index be66fb2a7..000000000
--- a/app/src/main/res/drawable-v24/ic_launcher_2b.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
-
-
-
- - launcher2
- launcher3
- launcher4
+ - launcher5
+ - launcher6
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index cb61d6daa..39c85cae3 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -80,6 +80,8 @@
- icon2
- icon3
- icon4
+ - icon5
+ - icon6