Michatec/michas-droid
1
1
Fork 0
mirror of https://github.com/Michatec/michas-droid.git synced 2026-05-30 18:02:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix some bugs

Browse Source
This commit is contained in:
kitsunyan
2020-08-01 05:53:41 +03:00
parent edd82e2797
commit bee6af56ca
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/kotlin/nya/kitsunyan/foxydroid/screen/ProductAdapter.kt
+1 -1
View File
@@ -774,7 +774,7 @@ class ProductAdapter(private val callbacks: Callbacks, private val columns: Int)
val releaseItems = compatibleReleasePairs.asSequence()
.map { (release, repository) -> Item.ReleaseItem(repository, release,
repository.id == productRepository?.second?.id,
signaturesForVersionCode.getValue(release.versionCode).size >= 2) }
signaturesForVersionCode[release.versionCode].orEmpty().size >= 2) }
.sortedByDescending { it.release.versionCode }
.toList()
if (releaseItems.isNotEmpty()) {
src/main/kotlin/nya/kitsunyan/foxydroid/screen/TabsFragment.kt
+4 -3
View File
@@ -42,8 +42,8 @@ import nya.kitsunyan.foxydroid.utility.Utils
import nya.kitsunyan.foxydroid.utility.extension.android.*
import nya.kitsunyan.foxydroid.utility.extension.resources.*
import nya.kitsunyan.foxydroid.widget.DividerItemDecoration
import nya.kitsunyan.foxydroid.widget.EnumRecyclerAdapter
import nya.kitsunyan.foxydroid.widget.FocusSearchView
import nya.kitsunyan.foxydroid.widget.StableRecyclerAdapter
import kotlin.math.*
class TabsFragment: ScreenFragment() {
@@ -323,7 +323,7 @@ class TabsFragment: ScreenFragment() {
override fun onSaveInstanceState(outState: Bundle) {
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.putByte(STATE_SHOW_SECTIONS, if (showSections) 1 else 0)
outState.putParcelableArrayList(STATE_SECTIONS, ArrayList(sections))
@@ -544,7 +544,7 @@ class TabsFragment: ScreenFragment() {
}
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>() {
enum class ViewType { SECTION }
@@ -582,6 +582,7 @@ class TabsFragment: ScreenFragment() {
get() = ViewType::class.java
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 onCreateViewHolder(parent: ViewGroup, viewType: ViewType): RecyclerView.ViewHolder {
src/main/res/layout/preference_item.xml
+1
View File
@@ -37,6 +37,7 @@
android:layout_marginStart="-16dp"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:clickable="false"
android:visibility="gone" />
</LinearLayout>