diff --git a/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkActivity.kt b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkActivity.kt index dce48e0e8..65593cbb4 100644 --- a/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/bookmark/AllBookmarkActivity.kt @@ -52,7 +52,7 @@ class AllBookmarkActivity : VMBaseActivity("bookmark") bookmark ?: let { dismiss() return } val editPos = arguments.getInt("editPos", -1) - binding.tvFooterLeft.visible(editPos >= 0) + binding.btnDelete.visible(editPos >= 0) // 替换 tvFooterLeft + binding.run { tvChapterName.text = bookmark.chapterName editBookText.setText(bookmark.bookText) editContent.setText(bookmark.content) - tvCancel.setOnClickListener { + + btnCancel.setOnClickListener { dismiss() } - tvOk.setOnClickListener { + + btnOk.setOnClickListener { bookmark.bookText = editBookText.text?.toString() ?: "" bookmark.content = editContent.text?.toString() ?: "" lifecycleScope.launch { @@ -65,7 +69,8 @@ class BookmarkDialog() : BaseDialogFragment(R.layout.dialog_bookmark, true) { dismiss() } } - tvFooterLeft.setOnClickListener { + + btnDelete.setOnClickListener { lifecycleScope.launch { withContext(IO) { appDb.bookmarkDao.delete(bookmark) diff --git a/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt index 710799e98..94dcddbac 100644 --- a/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changecover/ChangeCoverDialog.kt @@ -90,7 +90,7 @@ class ChangeCoverDialog() : BaseDialogFragment(R.layout.dialog_change_cover), } } else { startStopMenuItem?.let { item -> - item.setIcon(R.drawable.ic_refresh_black_24dp) + item.setIcon(R.drawable.ic_refresh) item.setTitle(R.string.refresh) } } diff --git a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt index c57f7072c..5168734cc 100644 --- a/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt +++ b/app/src/main/java/io/legado/app/ui/book/changesource/ChangeBookSourceDialog.kt @@ -34,7 +34,6 @@ import io.legado.app.ui.book.source.edit.BookSourceEditActivity import io.legado.app.ui.book.source.manage.BookSourceActivity import io.legado.app.ui.widget.dialog.WaitDialog import io.legado.app.ui.widget.recycler.VerticalDivider -import io.legado.app.utils.ColorUtils import io.legado.app.utils.StartActivityContract import io.legado.app.utils.applyTint import io.legado.app.utils.dpToPx @@ -223,7 +222,7 @@ class ChangeBookSourceDialog() : BaseDialogFragment(R.layout.dialog_book_change_ } } else { startStopMenuItem?.let { item -> - item.setIcon(R.drawable.ic_refresh_black_24dp) + item.setIcon(R.drawable.ic_refresh) item.setTitle(R.string.refresh) } } 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 50a2aeac1..d5663a4f1 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 @@ -224,7 +224,7 @@ class ChangeChapterSourceDialog() : BaseDialogFragment(R.layout.dialog_chapter_c } } else { startStopMenuItem?.let { item -> - item.setIcon(R.drawable.ic_refresh_black_24dp) + item.setIcon(R.drawable.ic_refresh) item.setTitle(R.string.refresh) } } 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 e602682a1..da76efd1f 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 @@ -14,6 +14,7 @@ import android.widget.CheckBox import android.widget.LinearLayout import androidx.activity.result.contract.ActivityResultContracts import androidx.activity.viewModels +import androidx.core.content.ContextCompat import androidx.lifecycle.lifecycleScope import io.legado.app.R import io.legado.app.base.VMBaseActivity @@ -163,7 +164,7 @@ class BookInfoActivity : // binding.refreshLayout?.setColorSchemeColors(accentColor) // binding.llInfo.setBackgroundColor(backgroundColor) // binding.flAction.setBackgroundColor(bottomBackground) - binding.flAction.applyNavigationBarPadding() + //binding.flAction.applyNavigationBarPadding() binding.btnShelf?.text = getString(R.string.remove_from_bookshelf) binding.tvToc.text = getString(R.string.toc_s, getString(R.string.loading)) @@ -415,10 +416,14 @@ class BookInfoActivity : } private fun upTvBookshelf() { - if (viewModel.inBookshelf) { - binding.btnShelf?.text = getString(R.string.remove_from_bookshelf) - } else { - binding.btnShelf?.text = getString(R.string.add_to_bookshelf) + binding.btnShelf?.apply { + if (viewModel.inBookshelf) { + text = getString(R.string.remove_from_bookshelf) + icon = ContextCompat.getDrawable(context, R.drawable.ic_clear_all) + } else { + text = getString(R.string.add_to_bookshelf) + icon = ContextCompat.getDrawable(context, R.drawable.ic_star) + } } editMenuItem?.isVisible = viewModel.inBookshelf } diff --git a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt index 089c84b9e..295c84c88 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListAdapter.kt @@ -5,6 +5,7 @@ import android.os.Handler import android.os.Looper import android.view.ViewGroup import androidx.recyclerview.widget.DiffUtil +import com.google.android.material.color.MaterialColors import io.legado.app.R import io.legado.app.base.adapter.DiffRecyclerAdapter import io.legado.app.base.adapter.ItemViewHolder @@ -129,14 +130,13 @@ class ChapterListAdapter(context: Context, val callback: Callback) : || cacheFileNames.contains(item.getFileName()) if (payloads.isEmpty()) { if (isDur) { - //tvChapterName.setTextColor(context.accentColor) + tvChapterName.setTextColor(MaterialColors.getColor(tvChapterName, com.google.android.material.R.attr.colorSecondary)) } else { - tvChapterName.setTextColor(context.getCompatColor(R.color.primaryText)) + tvChapterName.setTextColor(MaterialColors.getColor(tvChapterName, com.google.android.material.R.attr.colorOnSurface)) } tvChapterName.text = getDisplayTitle(item) if (item.isVolume) { - //卷名，如第一卷 突出显示 - tvChapterItem.setBackgroundColor(context.getCompatColor(R.color.btn_bg_press)) + tvChapterItem.setBackgroundColor(MaterialColors.getColor(tvChapterItem, com.google.android.material.R.attr.colorSurfaceVariant)) } else { //普通章节 保持不变 tvChapterItem.background = diff --git a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt index eef1d6bbc..4e5809aed 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/ChapterListFragment.kt @@ -64,10 +64,10 @@ class ChapterListFragment : VMBaseFragment(R.layout.fragment_chapt } private fun initView() = binding.run { - ivChapterTop.setOnClickListener { + btnChapterTop.setOnClickListener { mLayoutManager.scrollToPositionWithOffset(0, 0) } - ivChapterBottom.setOnClickListener { + btnChapterBottom.setOnClickListener { if (adapter.itemCount > 0) { mLayoutManager.scrollToPositionWithOffset(adapter.itemCount - 1, 0) } diff --git a/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt b/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt index 7238eb747..e3ca241b5 100644 --- a/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt +++ b/app/src/main/java/io/legado/app/ui/book/toc/TocActivity.kt @@ -57,7 +57,7 @@ class TocActivity : VMBaseActivity(), override fun onActivityCreated(savedInstanceState: Bundle?) { tabLayout = binding.titleBar.findViewById(R.id.tab_layout) - tabLayout.isTabIndicatorFullWidth = false + //tabLayout.isTabIndicatorFullWidth = false //tabLayout.setSelectedTabIndicatorColor(accentColor) binding.viewPager.adapter = TabFragmentPageAdapter() tabLayout.setupWithViewPager(binding.viewPager) diff --git a/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt index ce71b6683..1124763dc 100644 --- a/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/explore/ExploreFragment.kt @@ -5,13 +5,16 @@ import android.view.Menu import android.view.MenuItem import android.view.SubMenu import android.view.View -import androidx.appcompat.widget.SearchView +import android.view.inputmethod.EditorInfo import androidx.core.view.isGone +import androidx.core.widget.doAfterTextChanged import androidx.fragment.app.viewModels import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView +import com.google.android.material.search.SearchBar +import com.google.android.material.search.SearchView import io.legado.app.R import io.legado.app.base.VMBaseFragment import io.legado.app.constant.AppLog @@ -63,7 +66,8 @@ class ExploreFragment() : VMBaseFragment(R.layout.fragment_exp private val binding by viewBinding(FragmentExploreBinding::bind) private val adapter by lazy { ExploreAdapter(requireContext(), this) } private val linearLayoutManager by lazy { LinearLayoutManager(context) } - private val searchView: SearchView by lazy { binding.searchLayout.searchView } + private val searchBar: SearchBar by lazy { binding.searchBar } + private val searchView: SearchView by lazy { binding.searchView } private val diffItemCallBack = ExploreDiffItemCallBack() private val groups = linkedSetOf() private var exploreFlowJob: Job? = null @@ -77,27 +81,47 @@ class ExploreFragment() : VMBaseFragment(R.layout.fragment_exp upExploreData() } - - override fun onPause() { super.onPause() searchView.clearFocus() } private fun initSearchView() { - //searchView.applyTint(primaryTextColor) - searchView.isSubmitButtonEnabled = true - searchView.queryHint = getString(R.string.screen_find) - searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener { - override fun onQueryTextSubmit(query: String?): Boolean { - return false - } + searchView.hint = getString(R.string.screen_find) - override fun onQueryTextChange(newText: String?): Boolean { - upExploreData(newText) - return false + searchBar.setOnClickListener { + searchView.show() + if (searchView.text.isEmpty()) { + searchView.hint = getString(R.string.screen_find) } - }) + } + + searchView.editText.setOnEditorActionListener { _, actionId, _ -> + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + val query = searchView.text.toString() + upExploreData(query) + searchBar.hint = if (query.isEmpty()) { + getString(R.string.screen_find) + } else { + query + } + searchView.hide() + return@setOnEditorActionListener true + } + false + } + + searchView.editText.doAfterTextChanged { editable -> + editable?.let { + upExploreData(it.toString()) + + if (it.isEmpty()) { + searchBar.hint = getString(R.string.search_rss_source) + } + } + } + + searchView.setupWithSearchBar(searchBar) } private fun initRecyclerView() { @@ -157,7 +181,7 @@ class ExploreFragment() : VMBaseFragment(R.layout.fragment_exp ).catch { AppLog.put("发现界面更新数据出错", it) }.conflate().flowOn(IO).collect { - binding.tvEmptyMsg.isGone = it.isNotEmpty() || searchView.query.isNotEmpty() + binding.tvEmptyMsg.isGone = it.isNotEmpty() || searchView.text.isNotEmpty() == true adapter.setItems(it, diffItemCallBack) delay(500) } @@ -174,10 +198,18 @@ class ExploreFragment() : VMBaseFragment(R.layout.fragment_exp override val scope: CoroutineScope get() = viewLifecycleOwner.lifecycleScope + override fun onCompatCreateOptionsMenu(menu: Menu) { + menuInflater.inflate(R.menu.main_explore, menu) + groupsMenu = menu.findItem(R.id.menu_group)?.subMenu + upGroupsMenu() + } + override fun onCompatOptionsItemSelected(item: MenuItem) { super.onCompatOptionsItemSelected(item) if (item.groupId == R.id.menu_group_text) { - searchView.setQuery("group:${item.title}", true) + val query = "group:${item.title}" + searchView.setText(query) + upExploreData(query) } } diff --git a/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt b/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt index 8dbe60c7e..1f3d427e9 100644 --- a/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt +++ b/app/src/main/java/io/legado/app/ui/main/rss/RssFragment.kt @@ -5,10 +5,13 @@ import android.view.Menu import android.view.MenuItem import android.view.SubMenu import android.view.View -import androidx.appcompat.widget.SearchView +import android.view.inputmethod.EditorInfo +import androidx.core.widget.doAfterTextChanged import androidx.fragment.app.viewModels import androidx.lifecycle.Lifecycle import androidx.lifecycle.lifecycleScope +import com.google.android.material.search.SearchBar +import com.google.android.material.search.SearchView import io.legado.app.R import io.legado.app.base.VMBaseFragment import io.legado.app.constant.AppLog @@ -62,7 +65,8 @@ class RssFragment() : VMBaseFragment(R.layout.fragment_rss), private val adapter by lazy { RssAdapter(requireContext(), this, this, viewLifecycleOwner.lifecycle) } - private val searchView: SearchView by lazy { binding.searchLayout.searchView } + private val searchBar: SearchBar by lazy { binding.searchBar } + private val searchView: SearchView by lazy { binding.searchView } private var groupsFlowJob: Job? = null private var rssFlowJob: Job? = null private val groups = linkedSetOf() @@ -88,7 +92,8 @@ class RssFragment() : VMBaseFragment(R.layout.fragment_rss), R.id.menu_rss_config -> startActivity() R.id.menu_rss_star -> startActivity() else -> if (item.groupId == R.id.menu_group_text) { - searchView.setQuery("group:${item.title}", true) + searchView.setText("group:${item.title}") + upRssFlowJob("group:${item.title}") } } } @@ -106,19 +111,41 @@ class RssFragment() : VMBaseFragment(R.layout.fragment_rss), } private fun initSearchView() { - //searchView.applyTint(primaryTextColor) - searchView.isSubmitButtonEnabled = true - searchView.queryHint = getString(R.string.rss) - searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener { - override fun onQueryTextSubmit(query: String?): Boolean { - return false - } + searchView.hint = getString(R.string.search_rss_source) - override fun onQueryTextChange(newText: String?): Boolean { - upRssFlowJob(newText) - return false + searchBar.setOnClickListener { + searchView.show() + if (searchView.text.isEmpty()) { + searchView.hint = getString(R.string.search_rss_source) } - }) + } + + searchView.editText.setOnEditorActionListener { _, actionId, _ -> + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + val query = searchView.text.toString() + upRssFlowJob(query) + searchBar.hint = if (query.isEmpty()) { + getString(R.string.search_rss_source) + } else { + query + } + searchView.hide() + return@setOnEditorActionListener true + } + false + } + + searchView.editText.doAfterTextChanged { editable -> + editable?.let { + upRssFlowJob(it.toString()) + + if (it.isEmpty()) { + searchBar.hint = getString(R.string.search_rss_source) + } + } + } + + searchView.setupWithSearchBar(searchBar) } private fun initRecyclerView() { diff --git a/app/src/main/java/io/legado/app/ui/widget/LabelsBar.kt b/app/src/main/java/io/legado/app/ui/widget/LabelsBar.kt index a5124a88a..dcfe26c7f 100644 --- a/app/src/main/java/io/legado/app/ui/widget/LabelsBar.kt +++ b/app/src/main/java/io/legado/app/ui/widget/LabelsBar.kt @@ -1,6 +1,8 @@ package io.legado.app.ui.widget import android.content.Context +import android.content.res.ColorStateList +import android.graphics.Color import android.os.Build import android.util.AttributeSet import android.widget.LinearLayout @@ -8,6 +10,7 @@ import android.widget.TextView import androidx.annotation.RequiresApi import com.google.android.material.chip.Chip import com.google.android.material.chip.ChipGroup +import com.google.android.material.color.MaterialColors import io.legado.app.ui.widget.text.AccentBgTextView import io.legado.app.utils.dpToPx @@ -19,13 +22,7 @@ class LabelsBar @JvmOverloads constructor( private val unUsedChips = arrayListOf() private val usedChips = arrayListOf() - //var textSizeSp = 12f - init { -// isSingleLine = false -// chipSpacingHorizontal = 8.dpToPx() -// chipSpacingVertical = 4.dpToPx() - } @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) fun setLabels(labels: List) { @@ -46,7 +43,6 @@ class LabelsBar @JvmOverloads constructor( removeAllViews() } - @RequiresApi(Build.VERSION_CODES.VANILLA_ICE_CREAM) fun addLabel(label: String) { val chip = if (unUsedChips.isEmpty()) { Chip(context).apply { @@ -55,10 +51,18 @@ class LabelsBar @JvmOverloads constructor( chipStartPadding = 8f chipEndPadding = 8f chipStrokeWidth = 0f + + chipBackgroundColor = ColorStateList.valueOf( + MaterialColors.getColor(this, com.google.android.material.R.attr.colorPrimaryContainer, Color.LTGRAY) + ) + + usedChips.add(this) } } else { - unUsedChips.removeLast().also { usedChips.add(it) } + unUsedChips.removeAt(unUsedChips.lastIndex).also { + usedChips.add(it) + } } chip.text = label addView(chip) diff --git a/app/src/main/java/io/legado/app/ui/widget/SearchView.kt b/app/src/main/java/io/legado/app/ui/widget/SearchView.kt index 185ea036e..8265e94a7 100644 --- a/app/src/main/java/io/legado/app/ui/widget/SearchView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/SearchView.kt @@ -17,6 +17,7 @@ import android.widget.TextView import androidx.appcompat.widget.SearchView import io.legado.app.R import io.legado.app.utils.printOnDebug +import androidx.core.graphics.withTranslation class SearchView @JvmOverloads constructor( @@ -101,10 +102,9 @@ class SearchView @JvmOverloads constructor( val fm = paint.fontMetricsInt val transY = ((y + fm.descent + y + fm.ascent) / 2 - b.bounds.bottom / 2) - canvas.save() - canvas.translate(x, transY.toFloat()) - b.draw(canvas) - canvas.restore() + canvas.withTranslation(x, transY.toFloat()) { + b.draw(this) + } } } } diff --git a/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt b/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt index 019ecb692..7ec3a0874 100644 --- a/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt @@ -4,49 +4,55 @@ import android.content.Context import android.graphics.Color import android.util.AttributeSet import androidx.appcompat.widget.AppCompatTextView +import com.google.android.material.color.MaterialColors +import com.google.android.material.textview.MaterialTextView import io.legado.app.R import io.legado.app.lib.theme.Selector import io.legado.app.lib.theme.ThemeStore import io.legado.app.utils.ColorUtils import io.legado.app.utils.dpToPx import io.legado.app.utils.getCompatColor +import androidx.core.content.withStyledAttributes class AccentBgTextView @JvmOverloads constructor( context: Context, attrs: AttributeSet? = null -) : AppCompatTextView(context, attrs) { +) : MaterialTextView(context, attrs) { -// private var radius = 0 -// -// init { -// val typedArray = context.obtainStyledAttributes(attrs, R.styleable.AccentBgTextView) -// radius = typedArray.getDimensionPixelOffset(R.styleable.AccentBgTextView_radius, radius) -// typedArray.recycle() -// upBackground() -// } -// -// fun setRadius(radius: Int) { -// this.radius = radius.dpToPx() -// upBackground() -// } -// -// private fun upBackground() { -// val accentColor = if (isInEditMode) { -// context.getCompatColor(R.color.accent) -// } else { -// ThemeStore.accentColor(context) -// } -// background = Selector.shapeBuild() -// .setCornerRadius(radius) -// .setDefaultBgColor(accentColor) -// .setPressedBgColor(ColorUtils.darkenColor(accentColor)) -// .create() -// setTextColor( -// if (ColorUtils.isColorLight(accentColor)) { -// Color.BLACK -// } else { -// Color.WHITE -// } -// ) -// } + private var radiusPx = 0 + + init { + context.withStyledAttributes(attrs, R.styleable.AccentBgTextView) { + val radiusDp = getDimensionPixelOffset(R.styleable.AccentBgTextView_radius, 0) + radiusPx = radiusDp + } + updateBackground() + } + + fun setRadius(dp: Int) { + radiusPx = dp.dpToPx() + updateBackground() + } + + private fun updateBackground() { + val backgroundColor = MaterialColors.getColor( + this, + com.google.android.material.R.attr.colorPrimaryContainer, + //context.getColorCompat(R.color.fallback_bg) + ) + val textColor = MaterialColors.getColor( + this, + com.google.android.material.R.attr.colorOnPrimaryContainer, + //context.getColorCompat(R.color.fallback_text) + ) + + background = Selector.shapeBuild() + .setCornerRadius(radiusPx) + .setDefaultBgColor(backgroundColor) + .setPressedBgColor(ColorUtils.darkenColor(backgroundColor)) + .create() + + setTextColor(textColor) + } } + diff --git a/app/src/main/java/io/legado/app/utils/ToastUtils.kt b/app/src/main/java/io/legado/app/utils/ToastUtils.kt index a4a64c970..395731b80 100644 --- a/app/src/main/java/io/legado/app/utils/ToastUtils.kt +++ b/app/src/main/java/io/legado/app/utils/ToastUtils.kt @@ -2,40 +2,24 @@ package io.legado.app.utils -import android.annotation.SuppressLint import android.content.Context import android.widget.Toast import androidx.fragment.app.Fragment import io.legado.app.BuildConfig -import io.legado.app.databinding.ViewToastBinding import io.legado.app.help.config.AppConfig -//import io.legado.app.lib.theme.bottomBackground -//import io.legado.app.lib.theme.getPrimaryTextColor -import splitties.systemservices.layoutInflater private var toast: Toast? = null - private var toastLegacy: Toast? = null fun Context.toastOnUi(message: Int, duration: Int = Toast.LENGTH_SHORT) { toastOnUi(getString(message), duration) } -@SuppressLint("InflateParams") -@Suppress("DEPRECATION") fun Context.toastOnUi(message: CharSequence?, duration: Int = Toast.LENGTH_SHORT) { runOnUI { kotlin.runCatching { toast?.cancel() - toast = Toast(this) - //val isLight = ColorUtils.isColorLight(bottomBackground) - ViewToastBinding.inflate(layoutInflater).run { - toast?.view = root -// cvToast.setCardBackgroundColor(bottomBackground) -// tvText.setTextColor(getPrimaryTextColor(isLight)) - tvText.text = message - } - toast?.duration = duration + toast = Toast.makeText(this, message, duration) toast?.show() } } @@ -84,3 +68,4 @@ fun Fragment.toastOnUi(message: CharSequence) = requireActivity().toastOnUi(mess fun Fragment.longToast(message: Int) = requireContext().longToastOnUi(message) fun Fragment.longToast(message: CharSequence) = requireContext().longToastOnUi(message) + diff --git a/app/src/main/res/drawable/ic_arrow_up.xml b/app/src/main/res/drawable/ic_arrow_up.xml new file mode 100644 index 000000000..4528bd7a1 --- /dev/null +++ b/app/src/main/res/drawable/ic_arrow_up.xml @@ -0,0 +1,3 @@ + + + diff --git a/app/src/main/res/drawable/ic_backup.xml b/app/src/main/res/drawable/ic_backup.xml index 200bb7081..32878ee51 100644 --- a/app/src/main/res/drawable/ic_backup.xml +++ b/app/src/main/res/drawable/ic_backup.xml @@ -1,9 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_baseline_sort_24.xml b/app/src/main/res/drawable/ic_baseline_sort_24.xml index 3b184191d..be69710e0 100644 --- a/app/src/main/res/drawable/ic_baseline_sort_24.xml +++ b/app/src/main/res/drawable/ic_baseline_sort_24.xml @@ -1,5 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_book_has.xml b/app/src/main/res/drawable/ic_book_has.xml index a920e50ae..5e27a0089 100644 --- a/app/src/main/res/drawable/ic_book_has.xml +++ b/app/src/main/res/drawable/ic_book_has.xml @@ -1,14 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_brightness_auto.xml b/app/src/main/res/drawable/ic_brightness_auto.xml index 6ea7b953e..3870b1258 100644 --- a/app/src/main/res/drawable/ic_brightness_auto.xml +++ b/app/src/main/res/drawable/ic_brightness_auto.xml @@ -1,11 +1,4 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_bug_report.xml b/app/src/main/res/drawable/ic_bug_report.xml index ac83c8c90..115500fc7 100644 --- a/app/src/main/res/drawable/ic_bug_report.xml +++ b/app/src/main/res/drawable/ic_bug_report.xml @@ -1,9 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_chapter_list.xml b/app/src/main/res/drawable/ic_chapter_list.xml index d64d58dbf..89cb0f52b 100644 --- a/app/src/main/res/drawable/ic_chapter_list.xml +++ b/app/src/main/res/drawable/ic_chapter_list.xml @@ -1,20 +1,4 @@ - - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_check_source.xml b/app/src/main/res/drawable/ic_check_source.xml index cbd10fd70..a32bda389 100644 --- a/app/src/main/res/drawable/ic_check_source.xml +++ b/app/src/main/res/drawable/ic_check_source.xml @@ -1,14 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml index cdf136c9c..6d54c798e 100644 --- a/app/src/main/res/drawable/ic_copy.xml +++ b/app/src/main/res/drawable/ic_copy.xml @@ -1,17 +1,4 @@ - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_daytime.xml b/app/src/main/res/drawable/ic_daytime.xml index 60921c1dc..7e29b9cee 100644 --- a/app/src/main/res/drawable/ic_daytime.xml +++ b/app/src/main/res/drawable/ic_daytime.xml @@ -1,35 +1,4 @@ - - - - - - - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_download.xml b/app/src/main/res/drawable/ic_download.xml index bf296eceb..af7c2e664 100644 --- a/app/src/main/res/drawable/ic_download.xml +++ b/app/src/main/res/drawable/ic_download.xml @@ -1,9 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_exchange.xml b/app/src/main/res/drawable/ic_exchange.xml index 00fa9cc95..3d7fbfab3 100644 --- a/app/src/main/res/drawable/ic_exchange.xml +++ b/app/src/main/res/drawable/ic_exchange.xml @@ -1,17 +1,4 @@ - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_exchange_order.xml b/app/src/main/res/drawable/ic_exchange_order.xml index 2beeb7441..d180612d2 100644 --- a/app/src/main/res/drawable/ic_exchange_order.xml +++ b/app/src/main/res/drawable/ic_exchange_order.xml @@ -1,12 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_expand_less.xml b/app/src/main/res/drawable/ic_expand_less.xml deleted file mode 100644 index f70feed92..000000000 --- a/app/src/main/res/drawable/ic_expand_less.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_expand_more.xml b/app/src/main/res/drawable/ic_expand_more.xml deleted file mode 100644 index 5d10f3768..000000000 --- a/app/src/main/res/drawable/ic_expand_more.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_fast_forward.xml b/app/src/main/res/drawable/ic_fast_forward.xml index 13fcad8cf..6708f39e1 100644 --- a/app/src/main/res/drawable/ic_fast_forward.xml +++ b/app/src/main/res/drawable/ic_fast_forward.xml @@ -1,9 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_fast_rewind.xml b/app/src/main/res/drawable/ic_fast_rewind.xml index ea721ad89..02b94f63e 100644 --- a/app/src/main/res/drawable/ic_fast_rewind.xml +++ b/app/src/main/res/drawable/ic_fast_rewind.xml @@ -1,9 +1,3 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_image.xml b/app/src/main/res/drawable/ic_image.xml index bfd8e5c65..be7d90c2d 100644 --- a/app/src/main/res/drawable/ic_image.xml +++ b/app/src/main/res/drawable/ic_image.xml @@ -1,14 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_lock_outline.xml b/app/src/main/res/drawable/ic_lock_outline.xml index f9edaf4d1..ff39fd690 100644 --- a/app/src/main/res/drawable/ic_lock_outline.xml +++ b/app/src/main/res/drawable/ic_lock_outline.xml @@ -1 +1,3 @@ - \ No newline at end of file + + + \ 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 index b0357ce02..4615ea17b 100644 --- a/app/src/main/res/drawable/ic_more.xml +++ b/app/src/main/res/drawable/ic_more.xml @@ -1,15 +1,3 @@ - - - - + + diff --git a/app/src/main/res/drawable/ic_network_check.xml b/app/src/main/res/drawable/ic_network_check.xml index 9d88ef1ae..e44399559 100644 --- a/app/src/main/res/drawable/ic_network_check.xml +++ b/app/src/main/res/drawable/ic_network_check.xml @@ -1,9 +1,3 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_outline_cloud_24.xml b/app/src/main/res/drawable/ic_outline_cloud_24.xml index c8b092ead..8ad3b70c5 100644 --- a/app/src/main/res/drawable/ic_outline_cloud_24.xml +++ b/app/src/main/res/drawable/ic_outline_cloud_24.xml @@ -1,10 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_outline_delete.xml b/app/src/main/res/drawable/ic_outline_delete.xml deleted file mode 100644 index 734188c36..000000000 --- a/app/src/main/res/drawable/ic_outline_delete.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_pause_outline_24dp.xml b/app/src/main/res/drawable/ic_pause_outline_24dp.xml deleted file mode 100644 index 11f30c38d..000000000 --- a/app/src/main/res/drawable/ic_pause_outline_24dp.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_play_outline_24dp.xml b/app/src/main/res/drawable/ic_play_outline_24dp.xml deleted file mode 100644 index deb25e9f2..000000000 --- a/app/src/main/res/drawable/ic_play_outline_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_praise.xml b/app/src/main/res/drawable/ic_praise.xml index a1ccb8566..24d4ef67c 100644 --- a/app/src/main/res/drawable/ic_praise.xml +++ b/app/src/main/res/drawable/ic_praise.xml @@ -1,7 +1,3 @@ - - - - - + + diff --git a/app/src/main/res/drawable/ic_reduce.xml b/app/src/main/res/drawable/ic_reduce.xml index 90eec6f30..f52535fb5 100644 --- a/app/src/main/res/drawable/ic_reduce.xml +++ b/app/src/main/res/drawable/ic_reduce.xml @@ -1,9 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_refresh_black_24dp.xml b/app/src/main/res/drawable/ic_refresh.xml similarity index 100% rename from app/src/main/res/drawable/ic_refresh_black_24dp.xml rename to app/src/main/res/drawable/ic_refresh.xml diff --git a/app/src/main/res/drawable/ic_refresh_white_24dp.xml b/app/src/main/res/drawable/ic_refresh_white_24dp.xml deleted file mode 100644 index 9e4f8dfcc..000000000 --- a/app/src/main/res/drawable/ic_refresh_white_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_restore.xml b/app/src/main/res/drawable/ic_restore.xml index d9f75ea6d..8ae7e8c86 100644 --- a/app/src/main/res/drawable/ic_restore.xml +++ b/app/src/main/res/drawable/ic_restore.xml @@ -1,9 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_scan.xml b/app/src/main/res/drawable/ic_scan.xml index 2ca607005..a0c5162e2 100644 --- a/app/src/main/res/drawable/ic_scan.xml +++ b/app/src/main/res/drawable/ic_scan.xml @@ -1,14 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_scoring.xml b/app/src/main/res/drawable/ic_scoring.xml index 683b68107..39e1ccf29 100644 --- a/app/src/main/res/drawable/ic_scoring.xml +++ b/app/src/main/res/drawable/ic_scoring.xml @@ -1,11 +1,4 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_screen.xml b/app/src/main/res/drawable/ic_screen.xml index 4a641e517..e8a8495f2 100644 --- a/app/src/main/res/drawable/ic_screen.xml +++ b/app/src/main/res/drawable/ic_screen.xml @@ -1,11 +1,4 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_star_border.xml b/app/src/main/res/drawable/ic_star_border.xml deleted file mode 100644 index 4f4d84f17..000000000 --- a/app/src/main/res/drawable/ic_star_border.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_storage_black_24dp.xml b/app/src/main/res/drawable/ic_storage_black_24dp.xml index b11623929..46b55ad88 100644 --- a/app/src/main/res/drawable/ic_storage_black_24dp.xml +++ b/app/src/main/res/drawable/ic_storage_black_24dp.xml @@ -1,9 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_swap_horiz.xml b/app/src/main/res/drawable/ic_swap_horiz.xml index 8d80d0b55..b3f50b5fc 100644 --- a/app/src/main/res/drawable/ic_swap_horiz.xml +++ b/app/src/main/res/drawable/ic_swap_horiz.xml @@ -1,10 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_time_add_24dp.xml b/app/src/main/res/drawable/ic_time_add_24dp.xml index 66afd8f8f..2c6e1a74c 100644 --- a/app/src/main/res/drawable/ic_time_add_24dp.xml +++ b/app/src/main/res/drawable/ic_time_add_24dp.xml @@ -1,12 +1,3 @@ - - - + + diff --git a/app/src/main/res/drawable/ic_timer_black_24dp.xml b/app/src/main/res/drawable/ic_timer_black_24dp.xml index df5ad4e8a..0a49ec13c 100644 --- a/app/src/main/res/drawable/ic_timer_black_24dp.xml +++ b/app/src/main/res/drawable/ic_timer_black_24dp.xml @@ -1,20 +1,4 @@ - - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_update.xml b/app/src/main/res/drawable/ic_update.xml index 2490a577d..2008a16e0 100644 --- a/app/src/main/res/drawable/ic_update.xml +++ b/app/src/main/res/drawable/ic_update.xml @@ -1,14 +1,4 @@ - - - - + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_volume_up.xml b/app/src/main/res/drawable/ic_volume_up.xml index 5d604f823..09449c527 100644 --- a/app/src/main/res/drawable/ic_volume_up.xml +++ b/app/src/main/res/drawable/ic_volume_up.xml @@ -1,9 +1,3 @@ - - + + diff --git a/app/src/main/res/drawable/ic_web_service_noti.xml b/app/src/main/res/drawable/ic_web_service_noti.xml index ab93b7528..7c03ca0a9 100644 --- a/app/src/main/res/drawable/ic_web_service_noti.xml +++ b/app/src/main/res/drawable/ic_web_service_noti.xml @@ -1,10 +1,3 @@ - - - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_book_info.xml b/app/src/main/res/layout/activity_book_info.xml index 83fe94f84..b1583e2c0 100644 --- a/app/src/main/res/layout/activity_book_info.xml +++ b/app/src/main/res/layout/activity_book_info.xml @@ -22,10 +22,11 @@ + android:layout_height="?attr/collapsingToolbarLayoutLargeSize" + style="?attr/collapsingToolbarLayoutLargeSize" + app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge" + app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge" + app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> + android:paddingHorizontal="16dp" + android:paddingTop="8dp"> + app:cardCornerRadius="8dp"> @@ -155,16 +156,6 @@ tools:ignore="NestedWeights,RtlHardcoded,RtlSymmetry" tools:text="@string/origin_format" /> - - @@ -175,31 +166,12 @@ android:layout_height="match_parent" android:background="@color/background_theme" android:orientation="vertical" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingBottom="8dp"> - - - - + android:padding="8dp"> - + + + + + + + + + + + + + + - - - - @@ -359,37 +379,20 @@ - - - - - - - + android:layout_gravity="bottom|end" + android:layout_marginEnd="16dp" + android:layout_marginBottom="24dp" + android:text="@string/reading" + android:textColor="?attr/colorOnPrimary" + android:contentDescription="@string/reading" + app:iconGravity="textStart" + app:icon="@drawable/ic_bottom_books" + app:backgroundTint="?attr/colorSecondary" + app:iconTint="?attr/colorOnPrimary" + app:layout_behavior="com.google.android.material.behavior.HideBottomViewOnScrollBehavior" /> diff --git a/app/src/main/res/layout/activity_rss_artivles.xml b/app/src/main/res/layout/activity_rss_artivles.xml index 27a0dff9d..5c3df4c85 100644 --- a/app/src/main/res/layout/activity_rss_artivles.xml +++ b/app/src/main/res/layout/activity_rss_artivles.xml @@ -15,7 +15,7 @@ android:id="@+id/tab_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - app:tabMode="scrollable" /> + android:layout_marginStart="16dp"/> - - - + android:layout_height="wrap_content" + android:id="@+id/vw_bg" + android:layout_gravity="center" + android:orientation="vertical" + tools:ignore="UselessParent"> + android:padding="16dp" /> + android:orientation="vertical"> - - - + - - - + - + android:padding="16dp"> - + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" /> - + + android:padding="12dp" + android:text="@string/cancel" + app:layout_constraintEnd_toStartOf="@id/btn_ok" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + android:layout_marginEnd="8dp"/> - + + - + - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_dict_rule_edit.xml b/app/src/main/res/layout/dialog_dict_rule_edit.xml index f4d3b79de..31153990f 100644 --- a/app/src/main/res/layout/dialog_dict_rule_edit.xml +++ b/app/src/main/res/layout/dialog_dict_rule_edit.xml @@ -1,23 +1,19 @@ - - - + android:layout_height="wrap_content" + android:layout_gravity="center" + android:orientation="vertical" + tools:ignore="UselessParent"> - - - - - - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_bookshelf1.xml b/app/src/main/res/layout/fragment_bookshelf1.xml index 6aa8bbc45..28c092e67 100644 --- a/app/src/main/res/layout/fragment_bookshelf1.xml +++ b/app/src/main/res/layout/fragment_bookshelf1.xml @@ -10,15 +10,15 @@ android:id="@+id/title_bar" android:layout_width="match_parent" android:layout_height="wrap_content" - app:attachToActivity="false" android:fitsSystemWindows="true"> + android:layout_height="?attr/collapsingToolbarLayoutLargeSize" + style="?attr/collapsingToolbarLayoutLargeSize" + app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge" + app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge" + app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> @@ -30,36 +28,32 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="1" - android:background="?android:attr/selectableItemBackgroundBorderless" + android:background="?attr/selectableItemBackground" android:ellipsize="middle" - android:paddingLeft="10dp" - android:paddingRight="10dp" android:singleLine="true" android:gravity="center_vertical" - android:textColor="@color/primaryText" android:textSize="12sp" /> - + app:iconGravity="textStart" + app:iconPadding="0dp" /> - + app:iconGravity="textStart" + app:iconPadding="0dp" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_explore.xml b/app/src/main/res/layout/fragment_explore.xml index 6b32f8fd4..7eae5ca11 100644 --- a/app/src/main/res/layout/fragment_explore.xml +++ b/app/src/main/res/layout/fragment_explore.xml @@ -14,10 +14,11 @@ + android:layout_height="?attr/collapsingToolbarLayoutLargeSize" + style="?attr/collapsingToolbarLayoutLargeSize" + app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge" + app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge" + app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> - - + android:layout_marginHorizontal="16dp" + android:hint="@string/search_rss_source" + app:layout_constraintTop_toTopOf="parent" /> + + + android:layout_height="?attr/collapsingToolbarLayoutLargeSize" + style="?attr/collapsingToolbarLayoutLargeSize" + app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge" + app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge" + app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> diff --git a/app/src/main/res/layout/fragment_rss.xml b/app/src/main/res/layout/fragment_rss.xml index f81085c86..044bc9969 100644 --- a/app/src/main/res/layout/fragment_rss.xml +++ b/app/src/main/res/layout/fragment_rss.xml @@ -14,11 +14,11 @@ + android:layout_height="?attr/collapsingToolbarLayoutLargeSize" + style="?attr/collapsingToolbarLayoutLargeSize" + app:collapsedTitleTextAppearance="?attr/textAppearanceTitleLarge" + app:expandedTitleTextAppearance="?attr/textAppearanceHeadlineLarge" + app:layout_scrollFlags="scroll|exitUntilCollapsed|snap"> - + android:layout_marginHorizontal="16dp" + android:hint="@string/search_rss_source" + app:layout_constraintTop_toTopOf="parent" /> + + + android:paddingHorizontal="16dp" + android:paddingVertical="8dp" + android:background="?attr/selectableItemBackground"> + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/item_bookshelf_grid.xml b/app/src/main/res/layout/item_bookshelf_grid.xml index 9139da7a1..072dc17a3 100644 --- a/app/src/main/res/layout/item_bookshelf_grid.xml +++ b/app/src/main/res/layout/item_bookshelf_grid.xml @@ -29,7 +29,7 @@ + android:paddingHorizontal="16dp" + android:paddingVertical="8dp"> + tools:ignore="RtlSymmetry" /> + app:layout_constraintTop_toTopOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_rss_article.xml b/app/src/main/res/layout/item_rss_article.xml index 5aa0df545..e0962ae02 100644 --- a/app/src/main/res/layout/item_rss_article.xml +++ b/app/src/main/res/layout/item_rss_article.xml @@ -10,11 +10,9 @@ android:id="@+id/tv_title" android:layout_width="0dp" android:layout_height="0dp" - android:maxLines="2" + style="@style/ChapterNameText" android:ellipsize="end" android:text="@string/app_name" - android:textSize="16sp" - android:textStyle="bold" app:layout_constraintBottom_toTopOf="@+id/tv_pub_date" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/image_view" diff --git a/app/src/main/res/layout/item_search.xml b/app/src/main/res/layout/item_search.xml index 3448390d9..5d5783c52 100644 --- a/app/src/main/res/layout/item_search.xml +++ b/app/src/main/res/layout/item_search.xml @@ -77,11 +77,18 @@ android:textSize="12sp" /> - + android:scrollbars="none"> + + + + + android:singleLine="true" /> + android:src="@drawable/ic_edit" /> diff --git a/app/src/main/res/layout/view_preference.xml b/app/src/main/res/layout/view_preference.xml index 767c884b3..8e563630b 100644 --- a/app/src/main/res/layout/view_preference.xml +++ b/app/src/main/res/layout/view_preference.xml @@ -1,5 +1,6 @@ - - \ No newline at end of file diff --git a/app/src/main/res/layout/view_read_menu.xml b/app/src/main/res/layout/view_read_menu.xml index 65a1ea01d..1ce244bfb 100644 --- a/app/src/main/res/layout/view_read_menu.xml +++ b/app/src/main/res/layout/view_read_menu.xml @@ -113,8 +113,7 @@ android:layout_height="24dp" android:layout_margin="8dp" android:contentDescription="@string/adjust_pos" - android:src="@drawable/ic_swap_horiz" - app:tint="@color/white" /> + android:src="@drawable/ic_swap_horiz" /> diff --git a/app/src/main/res/layout/view_tab_layout.xml b/app/src/main/res/layout/view_tab_layout.xml index ccdd27e60..9bae3ee88 100644 --- a/app/src/main/res/layout/view_tab_layout.xml +++ b/app/src/main/res/layout/view_tab_layout.xml @@ -3,4 +3,5 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/tab_layout" android:layout_width="match_parent" - android:layout_height="match_parent" /> \ No newline at end of file + android:layout_height="match_parent" + android:background="@color/transparent"/> \ No newline at end of file diff --git a/app/src/main/res/menu/book_manga.xml b/app/src/main/res/menu/book_manga.xml index 6a1a8b724..21d290567 100644 --- a/app/src/main/res/menu/book_manga.xml +++ b/app/src/main/res/menu/book_manga.xml @@ -13,7 +13,7 @@ diff --git a/app/src/main/res/menu/book_read.xml b/app/src/main/res/menu/book_read.xml index c5d5735c6..08d58c4d9 100644 --- a/app/src/main/res/menu/book_read.xml +++ b/app/src/main/res/menu/book_read.xml @@ -13,7 +13,7 @@ diff --git a/app/src/main/res/menu/book_remote.xml b/app/src/main/res/menu/book_remote.xml index 37d670244..559e1a9f4 100644 --- a/app/src/main/res/menu/book_remote.xml +++ b/app/src/main/res/menu/book_remote.xml @@ -6,7 +6,7 @@ diff --git a/app/src/main/res/menu/change_source.xml b/app/src/main/res/menu/change_source.xml index 8cce4c062..63f1fbc83 100644 --- a/app/src/main/res/menu/change_source.xml +++ b/app/src/main/res/menu/change_source.xml @@ -14,7 +14,7 @@ diff --git a/app/src/main/res/menu/main_bookshelf.xml b/app/src/main/res/menu/main_bookshelf.xml index 2076ceaa7..8ee57aa54 100644 --- a/app/src/main/res/menu/main_bookshelf.xml +++ b/app/src/main/res/menu/main_bookshelf.xml @@ -12,7 +12,7 @@ diff --git a/app/src/main/res/menu/main_rss.xml b/app/src/main/res/menu/main_rss.xml index 0a650f424..cab8a5bb5 100644 --- a/app/src/main/res/menu/main_rss.xml +++ b/app/src/main/res/menu/main_rss.xml @@ -3,6 +3,12 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto"> + + true true @style/Widget.App.TabLayout + @@ -113,12 +113,18 @@ false - - - - + + + - //**********System Style******************//