prifak/Kotatsu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Configure shelf sections (2)

Browse Source
This commit is contained in:
Koitharu
2022-10-24 19:40:08 +03:00
parent c663d10515
commit b458bde8a1
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/org/koitharu/kotatsu/shelf/ui/ShelfMenuProvider.kt
View File

@@ -6,16 +6,16 @@ import android.view.MenuInflater
import android.view.MenuItem
import androidx.core.view.MenuProvider
import androidx.fragment.app.FragmentManager
import com.google.android.material.R as materialR
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import java.util.*
import java.util.concurrent.TimeUnit
import org.koitharu.kotatsu.R
import org.koitharu.kotatsu.base.ui.dialog.RememberSelectionDialogListener
import org.koitharu.kotatsu.shelf.ui.config.categories.ShelfConfigSheet
import org.koitharu.kotatsu.shelf.ui.config.size.ShelfSizeBottomSheet
import org.koitharu.kotatsu.local.ui.ImportDialogFragment
import org.koitharu.kotatsu.shelf.ui.config.ShelfConfigSheet
import org.koitharu.kotatsu.shelf.ui.config.size.ShelfSizeBottomSheet
import org.koitharu.kotatsu.utils.ext.startOfDay
import java.util.Date
import java.util.concurrent.TimeUnit
import com.google.android.material.R as materialR
class ShelfMenuProvider(
private val context: Context,

2
app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigAD.kt → app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigAD.kt
View File

@@ -1,4 +1,4 @@
package org.koitharu.kotatsu.shelf.ui.config.categories
package org.koitharu.kotatsu.shelf.ui.config
import androidx.core.view.updatePaddingRelative
import com.hannesdorfmann.adapterdelegates4.dsl.adapterDelegateViewBinding

2
app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigAdapter.kt → app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigAdapter.kt
View File

@@ -1,4 +1,4 @@
package org.koitharu.kotatsu.shelf.ui.config.categories
package org.koitharu.kotatsu.shelf.ui.config
import androidx.recyclerview.widget.DiffUtil
import com.hannesdorfmann.adapterdelegates4.AsyncListDifferDelegationAdapter

2
app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigModel.kt → app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigModel.kt
View File

@@ -1,4 +1,4 @@
package org.koitharu.kotatsu.shelf.ui.config.categories
package org.koitharu.kotatsu.shelf.ui.config
import org.koitharu.kotatsu.list.ui.model.ListModel
import org.koitharu.kotatsu.shelf.domain.ShelfSection

2
app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigSheet.kt → app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigSheet.kt
View File

@@ -1,4 +1,4 @@
package org.koitharu.kotatsu.shelf.ui.config.categories
package org.koitharu.kotatsu.shelf.ui.config
import android.os.Bundle
import android.view.LayoutInflater

13
app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/categories/ShelfConfigViewModel.kt → app/src/main/java/org/koitharu/kotatsu/shelf/ui/config/ShelfConfigViewModel.kt
View File

@@ -1,4 +1,4 @@
package org.koitharu.kotatsu.shelf.ui.config.categories
package org.koitharu.kotatsu.shelf.ui.config
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
@@ -39,10 +39,15 @@ class ShelfConfigViewModel @Inject constructor(
}
is ShelfConfigModel.Section -> {
if (item.isChecked) {
settings.shelfSections -= item.section
val sections = settings.shelfSections
settings.shelfSections = if (item.isChecked) {
if (sections.size > 1) {
sections - item.section
} else {
return@launchJob
}
} else {
settings.shelfSections += item.section
sections + item.section
}
}
}