优化 #5701
This commit is contained in:
@@ -46,14 +46,14 @@ class RssFavoritesActivity : BaseActivity<ActivityRssFavoritesBinding>() {
|
|||||||
override fun onResume() {
|
override fun onResume() {
|
||||||
super.onResume()
|
super.onResume()
|
||||||
//从ReadRssActivity退出时,判断是否需要重新定位tabLayout选中项
|
//从ReadRssActivity退出时,判断是否需要重新定位tabLayout选中项
|
||||||
if (currentGroup.isNotEmpty() && groupList.isNotEmpty()){
|
if (currentGroup.isNotEmpty() && groupList.isNotEmpty()) {
|
||||||
var item = groupList.indexOf(currentGroup)
|
var item = groupList.indexOf(currentGroup)
|
||||||
val currentItem = binding.viewPager.currentItem
|
val currentItem = binding.viewPager.currentItem
|
||||||
//如果坐标没有变化,则结束
|
//如果坐标没有变化,则结束
|
||||||
if(item == currentItem){
|
if (item == currentItem) {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (item == -1){
|
if (item == -1) {
|
||||||
item = currentItem
|
item = currentItem
|
||||||
}
|
}
|
||||||
lifecycleScope.launch {
|
lifecycleScope.launch {
|
||||||
@@ -131,10 +131,15 @@ class RssFavoritesActivity : BaseActivity<ActivityRssFavoritesBinding>() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun deleteGroup() {
|
private fun deleteGroup() {
|
||||||
|
if (groupList.isEmpty()) {
|
||||||
|
return
|
||||||
|
}
|
||||||
alert(R.string.draw) {
|
alert(R.string.draw) {
|
||||||
val item = binding.viewPager.currentItem
|
val item = binding.viewPager.currentItem
|
||||||
val group = groupList[item]
|
val group = groupList[item]
|
||||||
setMessage(getString(R.string.sure_del) + "\n<" + group + ">" + getString(R.string.group))
|
setMessage(
|
||||||
|
getString(R.string.sure_del) + "\n<" + group + ">" + getString(R.string.group)
|
||||||
|
)
|
||||||
noButton()
|
noButton()
|
||||||
yesButton {
|
yesButton {
|
||||||
appDb.rssStarDao.deleteByGroup(group)
|
appDb.rssStarDao.deleteByGroup(group)
|
||||||
@@ -144,7 +149,10 @@ class RssFavoritesActivity : BaseActivity<ActivityRssFavoritesBinding>() {
|
|||||||
|
|
||||||
private fun deleteAll() {
|
private fun deleteAll() {
|
||||||
alert(R.string.draw) {
|
alert(R.string.draw) {
|
||||||
setMessage(getString(R.string.sure_del) + "\n<" + getString(R.string.all) + ">" + getString(R.string.favorite))
|
setMessage(
|
||||||
|
getString(R.string.sure_del) + "\n<" + getString(R.string.all) + ">"
|
||||||
|
+ getString(R.string.favorite)
|
||||||
|
)
|
||||||
noButton()
|
noButton()
|
||||||
yesButton {
|
yesButton {
|
||||||
appDb.rssStarDao.deleteAll()
|
appDb.rssStarDao.deleteAll()
|
||||||
|
|||||||
Reference in New Issue
Block a user