From e810eb9ab5e403ff80533ecd83e381ca9134c0b0 Mon Sep 17 00:00:00 2001 From: yangyxd Date: Fri, 15 May 2020 09:36:13 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E6=9B=BF=E6=8D=A2=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E5=9B=BE=E6=A0=87"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 1ece88762e4dffcb5224a72a77021257484d93b0. # Conflicts: # app/src/main/java/io/legado/app/utils/UIUtils.kt # app/src/main/res/drawable/ic_add.xml # app/src/main/res/drawable/ic_add_online.xml # app/src/main/res/drawable/ic_arrange.xml # app/src/main/res/drawable/ic_download_line.xml # app/src/main/res/drawable/ic_groups.xml # app/src/main/res/drawable/ic_search.xml # app/src/main/res/drawable/ic_view_quilt.xml --- .../io/legado/app/ui/main/MainActivity.kt | 10 +- .../ui/main/bookshelf/BookshelfFragment.kt | 98 +++++-------------- .../main/java/io/legado/app/utils/UIUtils.kt | 45 --------- app/src/main/res/drawable/ic_add.xml | 20 ++-- app/src/main/res/drawable/ic_add_online.xml | 20 ++-- app/src/main/res/drawable/ic_arrange.xml | 32 +++--- .../main/res/drawable/ic_download_line.xml | 26 ++--- app/src/main/res/drawable/ic_groups.xml | 38 +++---- app/src/main/res/drawable/ic_more.xml | 15 --- app/src/main/res/drawable/ic_search.xml | 27 +++-- app/src/main/res/drawable/ic_view_quilt.xml | 50 +++++----- .../main/res/layout/item_bookshelf_list.xml | 9 +- 12 files changed, 138 insertions(+), 252 deletions(-) delete mode 100644 app/src/main/java/io/legado/app/utils/UIUtils.kt delete mode 100644 app/src/main/res/drawable/ic_more.xml diff --git a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt index 181ec0330..0aa49ede7 100644 --- a/app/src/main/java/io/legado/app/ui/main/MainActivity.kt +++ b/app/src/main/java/io/legado/app/ui/main/MainActivity.kt @@ -15,7 +15,6 @@ import io.legado.app.base.VMBaseActivity import io.legado.app.constant.EventBus import io.legado.app.constant.PreferKey import io.legado.app.help.AppConfig -import io.legado.app.help.storage.Backup import io.legado.app.lib.theme.ATH import io.legado.app.service.BaseReadAloudService import io.legado.app.service.help.ReadAloud @@ -78,7 +77,7 @@ class MainActivity : VMBaseActivity(R.layout.activity_main), putPrefInt(PreferKey.versionCode, App.INSTANCE.versionCode) if (!BuildConfig.DEBUG) { val log = String(assets.open("updateLog.md").readBytes()) - TextDialog.show(supportFragmentManager, log, TextDialog.MD, 5000, true) + TextDialog.show(supportFragmentManager, log, TextDialog.MD, 5000) } } } @@ -114,13 +113,6 @@ class MainActivity : VMBaseActivity(R.layout.activity_main), return super.onKeyUp(keyCode, event) } - override fun onPause() { - super.onPause() - if (!BuildConfig.DEBUG) { - Backup.autoBack(this) - } - } - override fun onDestroy() { super.onDestroy() ReadAloud.stop(this) diff --git a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt index f51bdc0a6..55dca8d77 100644 --- a/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/bookshelf/BookshelfFragment.kt @@ -39,9 +39,6 @@ import kotlinx.android.synthetic.main.dialog_edit_text.view.* import kotlinx.android.synthetic.main.fragment_bookshelf.* import kotlinx.android.synthetic.main.view_tab_layout.* import kotlinx.android.synthetic.main.view_title_bar.* -import kotlinx.coroutines.Dispatchers.IO -import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import org.jetbrains.anko.startActivity @@ -54,10 +51,8 @@ class BookshelfFragment : VMBaseFragment(R.layout.fragment_b get() = getViewModel(BookshelfViewModel::class.java) private var bookGroupLiveData: LiveData>? = null - private var noGroupLiveData: LiveData? = null private val bookGroups = mutableListOf() private val fragmentMap = hashMapOf() - private var showGroupNone = false override fun onFragmentCreated(view: View, savedInstanceState: Bundle?) { setSupportToolbar(toolbar) @@ -104,49 +99,22 @@ class BookshelfFragment : VMBaseFragment(R.layout.fragment_b bookGroupLiveData = App.db.bookGroupDao().liveDataAll() bookGroupLiveData?.observe(viewLifecycleOwner, Observer { viewModel.checkGroup(it) - launch { - synchronized(this) { - tab_layout.removeOnTabSelectedListener(this@BookshelfFragment) + synchronized(this) { + tab_layout.removeOnTabSelectedListener(this) + bookGroups.clear() + if (AppConfig.bookGroupAllShow) { + bookGroups.add(AppConst.bookGroupAll) } - var noGroupSize = 0 - withContext(IO) { - if (AppConfig.bookGroupNoneShow) { - noGroupSize = App.db.bookDao().noGroupSize - } + if (AppConfig.bookGroupLocalShow) { + bookGroups.add(AppConst.bookGroupLocal) } - synchronized(this@BookshelfFragment) { - bookGroups.clear() - if (AppConfig.bookGroupAllShow) { - bookGroups.add(AppConst.bookGroupAll) - } - if (AppConfig.bookGroupLocalShow) { - bookGroups.add(AppConst.bookGroupLocal) - } - if (AppConfig.bookGroupAudioShow) { - bookGroups.add(AppConst.bookGroupAudio) - } - showGroupNone = if (noGroupSize > 0 && it.isNotEmpty()) { - bookGroups.add(AppConst.bookGroupNone) - true - } else { - false - } - bookGroups.addAll(it) - view_pager_bookshelf.adapter?.notifyDataSetChanged() - tab_layout.getTabAt(getPrefInt(PreferKey.saveTabPosition, 0))?.select() - tab_layout.addOnTabSelectedListener(this@BookshelfFragment) + if (AppConfig.bookGroupAudioShow) { + bookGroups.add(AppConst.bookGroupAudio) } - } - }) - noGroupLiveData?.removeObservers(viewLifecycleOwner) - noGroupLiveData = App.db.bookDao().observeNoGroupSize() - noGroupLiveData?.observe(viewLifecycleOwner, Observer { - if (it > 0 && !showGroupNone && AppConfig.bookGroupNoneShow) { - showGroupNone = true - upGroup() - } else if (it == 0 && showGroupNone) { - showGroupNone = false - upGroup() + bookGroups.addAll(it) + view_pager_bookshelf.adapter?.notifyDataSetChanged() + tab_layout.getTabAt(getPrefInt(PreferKey.saveTabPosition, 0))?.select() + tab_layout.addOnTabSelectedListener(this) } }) } @@ -161,36 +129,20 @@ class BookshelfFragment : VMBaseFragment(R.layout.fragment_b } override fun upGroup() { - launch { - var noGroupSize = 0 - withContext(IO) { - if (AppConfig.bookGroupNoneShow) { - noGroupSize = App.db.bookDao().noGroupSize - } + synchronized(this) { + bookGroups.remove(AppConst.bookGroupAll) + bookGroups.remove(AppConst.bookGroupLocal) + bookGroups.remove(AppConst.bookGroupAudio) + if (AppConfig.bookGroupAudioShow) { + bookGroups.add(0, AppConst.bookGroupAudio) } - synchronized(this@BookshelfFragment) { - bookGroups.remove(AppConst.bookGroupAll) - bookGroups.remove(AppConst.bookGroupLocal) - bookGroups.remove(AppConst.bookGroupAudio) - bookGroups.remove(AppConst.bookGroupNone) - showGroupNone = - if (noGroupSize > 0 && bookGroups.isNotEmpty()) { - bookGroups.add(0, AppConst.bookGroupNone) - true - } else { - false - } - if (AppConfig.bookGroupAudioShow) { - bookGroups.add(0, AppConst.bookGroupAudio) - } - if (AppConfig.bookGroupLocalShow) { - bookGroups.add(0, AppConst.bookGroupLocal) - } - if (AppConfig.bookGroupAllShow) { - bookGroups.add(0, AppConst.bookGroupAll) - } - view_pager_bookshelf.adapter?.notifyDataSetChanged() + if (AppConfig.bookGroupLocalShow) { + bookGroups.add(0, AppConst.bookGroupLocal) + } + if (AppConfig.bookGroupAllShow) { + bookGroups.add(0, AppConst.bookGroupAll) } + view_pager_bookshelf.adapter?.notifyDataSetChanged() } } diff --git a/app/src/main/java/io/legado/app/utils/UIUtils.kt b/app/src/main/java/io/legado/app/utils/UIUtils.kt deleted file mode 100644 index 31b02199b..000000000 --- a/app/src/main/java/io/legado/app/utils/UIUtils.kt +++ /dev/null @@ -1,45 +0,0 @@ -package io.legado.app.utils - -import android.content.Context -import android.graphics.PorterDuff -import android.graphics.PorterDuffColorFilter -import android.os.Build -import androidx.appcompat.widget.Toolbar -import androidx.core.content.ContextCompat -import io.legado.app.R -import io.legado.app.constant.Theme -import io.legado.app.lib.theme.primaryTextColor - -@Suppress("unused") -object UIUtils { - - /** 设置更多工具条图标和颜色 */ - fun setToolbarMoreIconCustomColor(toolbar: Toolbar?, color: Int? = null) { - toolbar ?: return - val moreIcon = ContextCompat.getDrawable(toolbar.context, R.drawable.ic_more) - if (moreIcon != null && Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { - if (color != null) { - moreIcon.colorFilter = PorterDuffColorFilter(color, PorterDuff.Mode.SRC_ATOP) - } - toolbar.overflowIcon = moreIcon - } - } - - - fun getMenuColor( - context: Context, - theme: Theme = Theme.Auto, - requiresOverflow: Boolean = false - ): Int { - val defaultTextColor = context.getCompatColor(R.color.tv_text_default) - if (requiresOverflow) - return defaultTextColor - val primaryTextColor = context.primaryTextColor - return when (theme) { - Theme.Dark -> context.getCompatColor(R.color.md_white_1000) - Theme.Light -> context.getCompatColor(R.color.md_black_1000) - else -> primaryTextColor - } - } - -} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml index b4f63fa80..c7542ba87 100644 --- a/app/src/main/res/drawable/ic_add.xml +++ b/app/src/main/res/drawable/ic_add.xml @@ -1,11 +1,11 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add_online.xml b/app/src/main/res/drawable/ic_add_online.xml index d11efea01..8a3cc9b8b 100644 --- a/app/src/main/res/drawable/ic_add_online.xml +++ b/app/src/main/res/drawable/ic_add_online.xml @@ -1,11 +1,11 @@ - - - - + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_arrange.xml b/app/src/main/res/drawable/ic_arrange.xml index 416dbf843..ce2d50152 100644 --- a/app/src/main/res/drawable/ic_arrange.xml +++ b/app/src/main/res/drawable/ic_arrange.xml @@ -1,17 +1,17 @@ - - - - - - + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_download_line.xml b/app/src/main/res/drawable/ic_download_line.xml index c882860c7..3b0ae72ea 100644 --- a/app/src/main/res/drawable/ic_download_line.xml +++ b/app/src/main/res/drawable/ic_download_line.xml @@ -1,14 +1,14 @@ - - - - - + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_groups.xml b/app/src/main/res/drawable/ic_groups.xml index e15e9af8e..0ebcd4526 100644 --- a/app/src/main/res/drawable/ic_groups.xml +++ b/app/src/main/res/drawable/ic_groups.xml @@ -1,20 +1,20 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml deleted file mode 100644 index b0357ce02..000000000 --- a/app/src/main/res/drawable/ic_more.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml index b915218e5..b6805e004 100644 --- a/app/src/main/res/drawable/ic_search.xml +++ b/app/src/main/res/drawable/ic_search.xml @@ -1,17 +1,12 @@ - - - + + + diff --git a/app/src/main/res/drawable/ic_view_quilt.xml b/app/src/main/res/drawable/ic_view_quilt.xml index 88b5317e7..a0fb3d300 100644 --- a/app/src/main/res/drawable/ic_view_quilt.xml +++ b/app/src/main/res/drawable/ic_view_quilt.xml @@ -1,26 +1,26 @@ - - - - - - - + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_bookshelf_list.xml b/app/src/main/res/layout/item_bookshelf_list.xml index 3d6f71213..d715009d6 100644 --- a/app/src/main/res/layout/item_bookshelf_list.xml +++ b/app/src/main/res/layout/item_bookshelf_list.xml @@ -56,7 +56,7 @@ android:id="@+id/tv_name" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginLeft="10dp" + android:layout_marginLeft="16dp" android:layout_marginTop="12dp" android:includeFontPadding="false" android:paddingBottom="4dp" @@ -175,5 +175,12 @@ app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toBottomOf="parent" /> + \ No newline at end of file