diff --git a/app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt b/app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt index 830dc3ff3..b926889ab 100644 --- a/app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/AddToBookshelfDialog.kt @@ -57,10 +57,10 @@ class AddToBookshelfDialog() : BaseDialogFragment(R.layout.dialog_add_to_bookshe } viewModel.loadStateLiveData.observe(this) { if (it) { - binding.rotateLoading.show() + binding.rotateLoading.visible() binding.bookInfo.invisible() } else { - binding.rotateLoading.hide() + binding.rotateLoading.gone() } } viewModel.loadErrorLiveData.observe(this) { diff --git a/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt index 02492473a..1e3fcd71e 100644 --- a/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt +++ b/app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt @@ -47,7 +47,7 @@ class FileAssociationActivity : override val viewModel by viewModels() override fun onActivityCreated(savedInstanceState: Bundle?) { - binding.rotateLoading.show() + binding.rotateLoading.visible() viewModel.importBookLiveData.observe(this) { uri -> importBook(uri) } @@ -80,19 +80,19 @@ class FileAssociationActivity : } } viewModel.errorLive.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() toastOnUi(it) finish() } viewModel.openBookLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() startActivity { putExtra("bookUrl", it) } finish() } viewModel.notSupportedLiveData.observe(this) { data -> - binding.rotateLoading.hide() + binding.rotateLoading.gone() alert( title = appCtx.getString(R.string.draw), message = appCtx.getString(R.string.file_not_supported, data.second) diff --git a/app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt index 1b0d00893..1b634fd84 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportBookSourceDialog.kt @@ -64,7 +64,7 @@ class ImportBookSourceDialog() : BaseDialogFragment(R.layout.dialog_recycler_vie override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { binding.toolBar.setBackgroundColor(primaryColor) binding.toolBar.setTitle(R.string.import_book_source) - binding.rotateLoading.show() + binding.rotateLoading.visible() initMenu() binding.recyclerView.layoutManager = LinearLayoutManager(requireContext()) binding.recyclerView.adapter = adapter @@ -93,14 +93,14 @@ class ImportBookSourceDialog() : BaseDialogFragment(R.layout.dialog_recycler_vie upSelectText() } viewModel.errorLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() binding.tvMsg.apply { text = it visible() } } viewModel.successLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() if (it > 0) { adapter.setItems(viewModel.allSources) upSelectText() diff --git a/app/src/main/java/io/legado/app/ui/association/ImportHttpTtsDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportHttpTtsDialog.kt index 46ded7973..29493c60e 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportHttpTtsDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportHttpTtsDialog.kt @@ -55,7 +55,7 @@ class ImportHttpTtsDialog() : BaseDialogFragment(R.layout.dialog_recycler_view), override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { binding.toolBar.setBackgroundColor(primaryColor) binding.toolBar.setTitle(R.string.import_tts) - binding.rotateLoading.show() + binding.rotateLoading.visible() binding.recyclerView.layoutManager = LinearLayoutManager(requireContext()) binding.recyclerView.adapter = adapter binding.tvCancel.visible() @@ -83,14 +83,14 @@ class ImportHttpTtsDialog() : BaseDialogFragment(R.layout.dialog_recycler_view), upSelectText() } viewModel.errorLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() binding.tvMsg.apply { text = it visible() } } viewModel.successLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() if (it > 0) { adapter.setItems(viewModel.allSources) upSelectText() diff --git a/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileDialog.kt index 5e1d954f3..3b3562f64 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportOnLineBookFileDialog.kt @@ -41,18 +41,18 @@ class ImportOnLineBookFileDialog : BaseDialogFragment(R.layout.dialog_recycler_v viewModel.initData(bookUrl) binding.toolBar.setBackgroundColor(primaryColor) binding.toolBar.setTitle(R.string.download_and_import_file) - binding.rotateLoading.show() + binding.rotateLoading.visible() binding.recyclerView.layoutManager = LinearLayoutManager(requireContext()) binding.recyclerView.adapter = adapter viewModel.errorLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() binding.tvMsg.apply { text = it visible() } } viewModel.successLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() if (it > 0) { adapter.setItems(viewModel.allBookFiles) } diff --git a/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleDialog.kt index abc34de86..3c7313cfa 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportReplaceRuleDialog.kt @@ -59,7 +59,7 @@ class ImportReplaceRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_vi override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { binding.toolBar.setBackgroundColor(primaryColor) binding.toolBar.setTitle(R.string.import_replace_rule) - binding.rotateLoading.show() + binding.rotateLoading.visible() initMenu() binding.recyclerView.layoutManager = LinearLayoutManager(requireContext()) binding.recyclerView.adapter = adapter @@ -88,14 +88,14 @@ class ImportReplaceRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_vi upSelectText() } viewModel.errorLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() binding.tvMsg.apply { text = it visible() } } viewModel.successLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() if (it > 0) { adapter.setItems(viewModel.allRules) upSelectText() diff --git a/app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt index 2ff1ead19..9dcfdd1bd 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportRssSourceDialog.kt @@ -63,7 +63,7 @@ class ImportRssSourceDialog() : BaseDialogFragment(R.layout.dialog_recycler_view override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { binding.toolBar.setBackgroundColor(primaryColor) binding.toolBar.setTitle(R.string.import_rss_source) - binding.rotateLoading.show() + binding.rotateLoading.visible() initMenu() binding.recyclerView.layoutManager = LinearLayoutManager(requireContext()) binding.recyclerView.adapter = adapter @@ -92,14 +92,14 @@ class ImportRssSourceDialog() : BaseDialogFragment(R.layout.dialog_recycler_view upSelectText() } viewModel.errorLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() binding.tvMsg.apply { text = it visible() } } viewModel.successLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() if (it > 0) { adapter.setItems(viewModel.allSources) upSelectText() diff --git a/app/src/main/java/io/legado/app/ui/association/ImportThemeDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportThemeDialog.kt index 63185346f..f9998e22b 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportThemeDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportThemeDialog.kt @@ -54,7 +54,7 @@ class ImportThemeDialog() : BaseDialogFragment(R.layout.dialog_recycler_view) { override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { binding.toolBar.setBackgroundColor(primaryColor) binding.toolBar.setTitle(R.string.import_theme) - binding.rotateLoading.show() + binding.rotateLoading.visible() binding.recyclerView.layoutManager = LinearLayoutManager(requireContext()) binding.recyclerView.adapter = adapter binding.tvCancel.visible() @@ -82,14 +82,14 @@ class ImportThemeDialog() : BaseDialogFragment(R.layout.dialog_recycler_view) { upSelectText() } viewModel.errorLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() binding.tvMsg.apply { text = it visible() } } viewModel.successLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() if (it > 0) { adapter.setItems(viewModel.allSources) upSelectText() diff --git a/app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleDialog.kt b/app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleDialog.kt index 4c48e1ba2..1d21921e0 100644 --- a/app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleDialog.kt +++ b/app/src/main/java/io/legado/app/ui/association/ImportTxtTocRuleDialog.kt @@ -54,7 +54,7 @@ class ImportTxtTocRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_vie override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { binding.toolBar.setBackgroundColor(primaryColor) binding.toolBar.setTitle(R.string.import_txt_toc_rule) - binding.rotateLoading.show() + binding.rotateLoading.visible() binding.recyclerView.layoutManager = LinearLayoutManager(requireContext()) binding.recyclerView.adapter = adapter binding.tvCancel.visible() @@ -82,14 +82,14 @@ class ImportTxtTocRuleDialog() : BaseDialogFragment(R.layout.dialog_recycler_vie upSelectText() } viewModel.errorLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() binding.tvMsg.apply { text = it visible() } } viewModel.successLiveData.observe(this) { - binding.rotateLoading.hide() + binding.rotateLoading.gone() if (it > 0) { adapter.setItems(viewModel.allSources) upSelectText() diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt index a7eb3d830..bec53fc24 100644 --- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeChapterSourceDialog.kt @@ -66,7 +66,7 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c ChangeChapterTocAdapter(requireContext(), this) } private val contentSuccess: (content: String) -> Unit = { - binding.loadingToc.hide() + binding.loadingToc.gone() callBack?.replaceContent(it) dismissAllowingStateLoss() } @@ -267,7 +267,7 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c this.searchBook = searchBook tocAdapter.setItems(null) binding.clToc.visible() - binding.loadingToc.show() + binding.loadingToc.visible() val book = searchBook.toBook() viewModel.getToc(book, { binding.clToc.gone() @@ -275,7 +275,7 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c }) { toc: List, _: BookSource -> tocAdapter.durChapterIndex = BookHelp.getDurChapter(viewModel.chapterIndex, viewModel.chapterTitle, toc) - binding.loadingToc.hide() + binding.loadingToc.gone() tocAdapter.setItems(toc) binding.recyclerViewToc.scrollToPosition(tocAdapter.durChapterIndex - 5) } @@ -321,9 +321,9 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c override fun clickChapter(bookChapter: BookChapter, nextChapterUrl: String?) { searchBook?.let { - binding.loadingToc.show() + binding.loadingToc.visible() viewModel.getContent(it.toBook(), bookChapter, nextChapterUrl, contentSuccess) { msg -> - binding.loadingToc.hide() + binding.loadingToc.gone() binding.clToc.gone() toastOnUi(msg) } diff --git a/app/src/main/java/io/legado/app/ui/book/read/ContentEditDialog.kt b/app/src/main/java/io/legado/app/ui/book/read/ContentEditDialog.kt index fb9e780b1..c229c906c 100644 --- a/app/src/main/java/io/legado/app/ui/book/read/ContentEditDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/read/ContentEditDialog.kt @@ -58,9 +58,9 @@ class ContentEditDialog : BaseDialogFragment(R.layout.dialog_content_edit) { } viewModel.loadStateLiveData.observe(viewLifecycleOwner) { if (it) { - binding.rlLoading.show() + binding.rlLoading.visible() } else { - binding.rlLoading.hide() + binding.rlLoading.gone() } } viewModel.initContent { diff --git a/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt index 0cf843db7..64b48f60b 100644 --- a/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/source/debug/BookSourceDebugActivity.kt @@ -50,7 +50,7 @@ class BookSourceDebugActivity : VMBaseActivity? = null @@ -31,16 +30,5 @@ class DictViewModel(application: Application) : BaseViewModel(application) { } } - /** - * 判断是否包含汉字 - * @param str - * @return - */ - - private fun isChinese(str: String): Boolean { - val p = Pattern.compile("[\u4e00-\u9fa5]") - val m = p.matcher(str) - return m.find() - } } \ No newline at end of file diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksAdapterGrid.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksAdapterGrid.kt index 7c35f72d4..d6b117f4a 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksAdapterGrid.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksAdapterGrid.kt @@ -43,9 +43,9 @@ class BooksAdapterGrid(context: Context, private val callBack: CallBack) : private fun upRefresh(binding: ItemBookshelfGridBinding, item: Book) { if (!item.isLocal && callBack.isUpdate(item.bookUrl)) { binding.bvUnread.invisible() - binding.rlLoading.show() + binding.rlLoading.visible() } else { - binding.rlLoading.hide() + binding.rlLoading.inVisible() if (AppConfig.showUnread) { binding.bvUnread.setBadgeCount(item.getUnreadChapterNum()) binding.bvUnread.setHighlight(item.lastCheckCount > 0) diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksAdapterList.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksAdapterList.kt index e3162a4aa..70354aff6 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksAdapterList.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style1/books/BooksAdapterList.kt @@ -52,9 +52,9 @@ class BooksAdapterList(context: Context, private val callBack: CallBack) : private fun upRefresh(binding: ItemBookshelfListBinding, item: Book) { if (!item.isLocal && callBack.isUpdate(item.bookUrl)) { binding.bvUnread.invisible() - binding.rlLoading.show() + binding.rlLoading.visible() } else { - binding.rlLoading.hide() + binding.rlLoading.gone() if (AppConfig.showUnread) { binding.bvUnread.setHighlight(item.lastCheckCount > 0) binding.bvUnread.setBadgeCount(item.getUnreadChapterNum()) diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BooksAdapterGrid.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BooksAdapterGrid.kt index 610f1cf3d..d80540ed0 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BooksAdapterGrid.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BooksAdapterGrid.kt @@ -113,9 +113,9 @@ class BooksAdapterGrid(context: Context, callBack: CallBack) : private fun upRefresh(binding: ItemBookshelfGridBinding, item: Book) { if (!item.isLocal && callBack.isUpdate(item.bookUrl)) { binding.bvUnread.invisible() - binding.rlLoading.show() + binding.rlLoading.visible() } else { - binding.rlLoading.hide() + binding.rlLoading.inVisible() if (AppConfig.showUnread) { binding.bvUnread.setBadgeCount(item.getUnreadChapterNum()) binding.bvUnread.setHighlight(item.lastCheckCount > 0) diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BooksAdapterList.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BooksAdapterList.kt index 3e439f15c..6ccfecca2 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BooksAdapterList.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/style2/BooksAdapterList.kt @@ -128,9 +128,9 @@ class BooksAdapterList(context: Context, callBack: CallBack) : private fun upRefresh(binding: ItemBookshelfListBinding, item: Book) { if (!item.isLocal && callBack.isUpdate(item.bookUrl)) { binding.bvUnread.invisible() - binding.rlLoading.show() + binding.rlLoading.visible() } else { - binding.rlLoading.hide() + binding.rlLoading.gone() if (AppConfig.showUnread) { binding.bvUnread.setHighlight(item.lastCheckCount > 0) binding.bvUnread.setBadgeCount(item.getUnreadChapterNum()) 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 38c5f1ac9..8a5e110fa 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 @@ -53,7 +53,7 @@ class ExploreAdapter(context: Context, val callBack: CallBack) : if (exIndex == holder.layoutPosition) { ivStatus.setImageResource(R.drawable.ic_arrow_down) rotateLoading.loadingColor = context.accentColor - rotateLoading.show() + rotateLoading.visible() if (scrollTo >= 0) { callBack.scrollTo(scrollTo) } @@ -62,7 +62,7 @@ class ExploreAdapter(context: Context, val callBack: CallBack) : }.onSuccess { kindList -> upKindList(flexbox, item.bookSourceUrl, kindList) }.onFinally { - rotateLoading.hide() + rotateLoading.gone() if (scrollTo >= 0) { callBack.scrollTo(scrollTo) scrollTo = -1 @@ -70,7 +70,7 @@ class ExploreAdapter(context: Context, val callBack: CallBack) : } } else kotlin.runCatching { ivStatus.setImageResource(R.drawable.ic_arrow_right) - rotateLoading.hide() + rotateLoading.gone() recyclerFlexbox(flexbox) flexbox.gone() } diff --git a/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugActivity.kt b/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugActivity.kt index b9b36833d..9b7578be7 100644 --- a/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugActivity.kt +++ b/app/src/main/java/io/legado/app/ui/rss/source/debug/RssSourceDebugActivity.kt @@ -33,7 +33,7 @@ class RssSourceDebugActivity : VMBaseActivity INVISIBLE - else -> GONE - } typedArray.recycle() } speedOfArc = (speedOfDegree / 4).toFloat() @@ -174,13 +170,21 @@ class RotateLoading @JvmOverloads constructor( removeCallbacks(hidden) } - fun show() { + fun visible() { removeCallbacks(shown) removeCallbacks(hidden) post(shown) } - fun hide() { + fun inVisible() { + hideMode = INVISIBLE + removeCallbacks(shown) + removeCallbacks(hidden) + stopInternal() + } + + fun gone() { + hideMode = GONE removeCallbacks(shown) removeCallbacks(hidden) stopInternal() diff --git a/app/src/main/java/io/legado/app/ui/widget/recycler/LoadMoreView.kt b/app/src/main/java/io/legado/app/ui/widget/recycler/LoadMoreView.kt index 0a047d2ba..53f20f0c2 100644 --- a/app/src/main/java/io/legado/app/ui/widget/recycler/LoadMoreView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/recycler/LoadMoreView.kt @@ -44,12 +44,12 @@ class LoadMoreView(context: Context, attrs: AttributeSet? = null) : FrameLayout( fun startLoad() { isLoading = true binding.tvText.invisible() - binding.rotateLoading.show() + binding.rotateLoading.visible() } fun stopLoad() { isLoading = false - binding.rotateLoading.hide() + binding.rotateLoading.inVisible() } fun hasMore() { diff --git a/app/src/main/java/io/legado/app/utils/StringExtensions.kt b/app/src/main/java/io/legado/app/utils/StringExtensions.kt index dc58912d9..898e6d3fe 100644 --- a/app/src/main/java/io/legado/app/utils/StringExtensions.kt +++ b/app/src/main/java/io/legado/app/utils/StringExtensions.kt @@ -11,6 +11,7 @@ import java.io.File import java.lang.Character.codePointCount import java.lang.Character.offsetByCodePoints import java.util.* +import java.util.regex.Pattern fun String?.safeTrim() = if (this.isNullOrBlank()) null else this.trim() @@ -99,6 +100,15 @@ fun String?.memorySize(): Int { return 40 + 2 * length } +/** + * 是否中文 + */ +fun String.isChinese(): Boolean { + val p = Pattern.compile("[\u4e00-\u9fa5]") + val m = p.matcher(this) + return m.find() +} + /** * 将字符串拆分为单个字符,包含emoji */ diff --git a/app/src/main/res/layout/item_bookshelf_grid.xml b/app/src/main/res/layout/item_bookshelf_grid.xml index 25907e7c3..6b6b317a0 100644 --- a/app/src/main/res/layout/item_bookshelf_grid.xml +++ b/app/src/main/res/layout/item_bookshelf_grid.xml @@ -52,7 +52,6 @@ android:layout_height="22dp" android:layout_gravity="right" android:visibility="invisible" - app:hide_mode="invisible" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:loading_width="2dp" diff --git a/app/src/main/res/layout/item_bookshelf_grid_group.xml b/app/src/main/res/layout/item_bookshelf_grid_group.xml index b2e059414..49a083305 100644 --- a/app/src/main/res/layout/item_bookshelf_grid_group.xml +++ b/app/src/main/res/layout/item_bookshelf_grid_group.xml @@ -51,7 +51,6 @@ android:layout_height="22dp" android:layout_gravity="right" android:visibility="invisible" - app:hide_mode="invisible" app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" app:loading_width="2dp" diff --git a/app/src/main/res/layout/item_find_book.xml b/app/src/main/res/layout/item_find_book.xml index ee74dfaa9..a9c834e97 100644 --- a/app/src/main/res/layout/item_find_book.xml +++ b/app/src/main/res/layout/item_find_book.xml @@ -36,7 +36,6 @@ android:visibility="gone" android:layout_gravity="center" android:layout_marginRight="4dp" - app:hide_mode="gone" app:loading_width="1dp" tools:ignore="RtlHardcoded" /> diff --git a/app/src/main/res/layout/view_load_more.xml b/app/src/main/res/layout/view_load_more.xml index 418073dfc..3ddcdabdd 100644 --- a/app/src/main/res/layout/view_load_more.xml +++ b/app/src/main/res/layout/view_load_more.xml @@ -12,7 +12,6 @@ android:layout_margin="6dp" android:layout_gravity="center" android:visibility="invisible" - app:hide_mode="invisible" app:loading_width="2dp" /> - - - - - -