mirror of
https://github.com/Michatec/michas-droid.git
synced 2026-05-30 18:02:43 +02:00
Fix some bugs
This commit is contained in:
@@ -774,7 +774,7 @@ class ProductAdapter(private val callbacks: Callbacks, private val columns: Int)
|
|||||||
val releaseItems = compatibleReleasePairs.asSequence()
|
val releaseItems = compatibleReleasePairs.asSequence()
|
||||||
.map { (release, repository) -> Item.ReleaseItem(repository, release,
|
.map { (release, repository) -> Item.ReleaseItem(repository, release,
|
||||||
repository.id == productRepository?.second?.id,
|
repository.id == productRepository?.second?.id,
|
||||||
signaturesForVersionCode.getValue(release.versionCode).size >= 2) }
|
signaturesForVersionCode[release.versionCode].orEmpty().size >= 2) }
|
||||||
.sortedByDescending { it.release.versionCode }
|
.sortedByDescending { it.release.versionCode }
|
||||||
.toList()
|
.toList()
|
||||||
if (releaseItems.isNotEmpty()) {
|
if (releaseItems.isNotEmpty()) {
|
||||||
|
|||||||
@@ -42,8 +42,8 @@ import nya.kitsunyan.foxydroid.utility.Utils
|
|||||||
import nya.kitsunyan.foxydroid.utility.extension.android.*
|
import nya.kitsunyan.foxydroid.utility.extension.android.*
|
||||||
import nya.kitsunyan.foxydroid.utility.extension.resources.*
|
import nya.kitsunyan.foxydroid.utility.extension.resources.*
|
||||||
import nya.kitsunyan.foxydroid.widget.DividerItemDecoration
|
import nya.kitsunyan.foxydroid.widget.DividerItemDecoration
|
||||||
import nya.kitsunyan.foxydroid.widget.EnumRecyclerAdapter
|
|
||||||
import nya.kitsunyan.foxydroid.widget.FocusSearchView
|
import nya.kitsunyan.foxydroid.widget.FocusSearchView
|
||||||
|
import nya.kitsunyan.foxydroid.widget.StableRecyclerAdapter
|
||||||
import kotlin.math.*
|
import kotlin.math.*
|
||||||
|
|
||||||
class TabsFragment: ScreenFragment() {
|
class TabsFragment: ScreenFragment() {
|
||||||
@@ -323,7 +323,7 @@ class TabsFragment: ScreenFragment() {
|
|||||||
override fun onSaveInstanceState(outState: Bundle) {
|
override fun onSaveInstanceState(outState: Bundle) {
|
||||||
super.onSaveInstanceState(outState)
|
super.onSaveInstanceState(outState)
|
||||||
|
|
||||||
outState.putBoolean(STATE_SEARCH_FOCUSED, searchMenuItem?.actionView!!.hasFocus())
|
outState.putBoolean(STATE_SEARCH_FOCUSED, searchMenuItem?.actionView?.hasFocus() == true)
|
||||||
outState.putString(STATE_SEARCH_QUERY, searchQuery)
|
outState.putString(STATE_SEARCH_QUERY, searchQuery)
|
||||||
outState.putByte(STATE_SHOW_SECTIONS, if (showSections) 1 else 0)
|
outState.putByte(STATE_SHOW_SECTIONS, if (showSections) 1 else 0)
|
||||||
outState.putParcelableArrayList(STATE_SECTIONS, ArrayList(sections))
|
outState.putParcelableArrayList(STATE_SECTIONS, ArrayList(sections))
|
||||||
@@ -544,7 +544,7 @@ class TabsFragment: ScreenFragment() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private class SectionsAdapter(private val sections: () -> List<ProductItem.Section>,
|
private class SectionsAdapter(private val sections: () -> List<ProductItem.Section>,
|
||||||
private val onClick: (ProductItem.Section) -> Unit): EnumRecyclerAdapter<SectionsAdapter.ViewType,
|
private val onClick: (ProductItem.Section) -> Unit): StableRecyclerAdapter<SectionsAdapter.ViewType,
|
||||||
RecyclerView.ViewHolder>() {
|
RecyclerView.ViewHolder>() {
|
||||||
enum class ViewType { SECTION }
|
enum class ViewType { SECTION }
|
||||||
|
|
||||||
@@ -582,6 +582,7 @@ class TabsFragment: ScreenFragment() {
|
|||||||
get() = ViewType::class.java
|
get() = ViewType::class.java
|
||||||
|
|
||||||
override fun getItemCount(): Int = sections().size
|
override fun getItemCount(): Int = sections().size
|
||||||
|
override fun getItemDescriptor(position: Int): String = sections()[position].toString()
|
||||||
override fun getItemEnumViewType(position: Int): ViewType = ViewType.SECTION
|
override fun getItemEnumViewType(position: Int): ViewType = ViewType.SECTION
|
||||||
|
|
||||||
override fun onCreateViewHolder(parent: ViewGroup, viewType: ViewType): RecyclerView.ViewHolder {
|
override fun onCreateViewHolder(parent: ViewGroup, viewType: ViewType): RecyclerView.ViewHolder {
|
||||||
|
|||||||
@@ -37,6 +37,7 @@
|
|||||||
android:layout_marginStart="-16dp"
|
android:layout_marginStart="-16dp"
|
||||||
android:paddingStart="12dp"
|
android:paddingStart="12dp"
|
||||||
android:paddingEnd="12dp"
|
android:paddingEnd="12dp"
|
||||||
|
android:clickable="false"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|||||||
Reference in New Issue
Block a user