Skip to content

Commit c4f62ff

Browse files
committed
fixed bug when the list of games scrolled to beginning after installing the game
1 parent 96261b4 commit c4f62ff

File tree

4 files changed

+8
-62
lines changed

4 files changed

+8
-62
lines changed

CHANGELOG.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
# Changelog
22

3-
## [Next] - 2021-?-?
3+
## [0.8.4] - 2021-?-?
44
### Changed
55
- update INSTEAD 3.3.3
66
### Fixed
7-
- overlapping buttons
7+
- fixed a bug when the list of games scrolled to the beginning after installing the game
8+
- fixed overlapping buttons in the about game screen
9+
- fixed clipping of text with large font
810

911
## [0.8.3] - 2020-11-05
1012
### Added
Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019 Boris Timofeev <btimofeev@emunix.org>
2+
* Copyright (c) 2019-2021 Boris Timofeev <btimofeev@emunix.org>
33
* Distributed under the MIT License (license terms are at http://opensource.org/licenses/MIT).
44
*/
55

@@ -10,33 +10,11 @@ import androidx.recyclerview.widget.DiffUtil
1010

1111
class GameDiffCallback : DiffUtil.ItemCallback<Game>() {
1212

13-
enum class Diff {
14-
IMAGE, TITLE, BRIEF, VERSION
15-
}
16-
1713
override fun areItemsTheSame(oldItem: Game, newItem: Game): Boolean {
18-
return oldItem.name === newItem.name
14+
return oldItem.name == newItem.name
1915
}
2016

2117
override fun areContentsTheSame(oldItem: Game, newItem: Game): Boolean {
2218
return oldItem == newItem
2319
}
24-
25-
override fun getChangePayload(oldItem: Game, newItem: Game): List<Diff> {
26-
val diff = mutableListOf<Diff>()
27-
28-
if (newItem.image != oldItem.image)
29-
diff.add(Diff.IMAGE)
30-
31-
if (newItem.title != oldItem.title)
32-
diff.add(Diff.TITLE)
33-
34-
if (newItem.brief != oldItem.brief)
35-
diff.add(Diff.BRIEF)
36-
37-
if (newItem.version != oldItem.version || newItem.installedVersion != oldItem.installedVersion)
38-
diff.add(Diff.VERSION)
39-
40-
return diff
41-
}
4220
}

app/src/main/kotlin/org/emunix/insteadlauncher/ui/installedgames/InstalledGamesAdapter.kt

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018-2019 Boris Timofeev <btimofeev@emunix.org>
2+
* Copyright (c) 2018-2021 Boris Timofeev <btimofeev@emunix.org>
33
* Distributed under the MIT License (license terms are at http://opensource.org/licenses/MIT).
44
*/
55

@@ -16,7 +16,6 @@ import org.emunix.insteadlauncher.data.Game
1616
import org.emunix.insteadlauncher.helpers.loadUrl
1717
import androidx.recyclerview.widget.ListAdapter
1818
import org.emunix.insteadlauncher.data.GameDiffCallback
19-
import org.emunix.insteadlauncher.data.GameDiffCallback.Diff
2019

2120
class InstalledGamesAdapter(val onClickListener: (Game) -> Unit) : ListAdapter<Game, InstalledGamesAdapter.ViewHolder>(GameDiffCallback()) {
2221

@@ -43,20 +42,6 @@ class InstalledGamesAdapter(val onClickListener: (Game) -> Unit) : ListAdapter<G
4342
}
4443
}
4544

46-
override fun onBindViewHolder(holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
47-
if (payloads.isEmpty()) {
48-
onBindViewHolder(holder, position)
49-
} else {
50-
val diff = payloads[0] as List<Diff>
51-
for (key in diff) {
52-
when (key) {
53-
Diff.IMAGE -> holder.image.loadUrl(getItem(position).image)
54-
Diff.BRIEF -> getItem(position).title
55-
}
56-
}
57-
}
58-
}
59-
6045
override fun onViewRecycled(holder: ViewHolder) {
6146
holder.itemView.setOnLongClickListener(null)
6247
super.onViewRecycled(holder)

app/src/main/kotlin/org/emunix/insteadlauncher/ui/repository/RepositoryAdapter.kt

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2018 Boris Timofeev <btimofeev@emunix.org>
2+
* Copyright (c) 2018-2021 Boris Timofeev <btimofeev@emunix.org>
33
* Distributed under the MIT License (license terms are at http://opensource.org/licenses/MIT).
44
*/
55

@@ -10,13 +10,11 @@ import android.view.View
1010
import android.view.ViewGroup
1111
import android.widget.ImageView
1212
import android.widget.TextView
13-
import androidx.core.view.ViewCompat
1413
import androidx.recyclerview.widget.ListAdapter
1514
import androidx.recyclerview.widget.RecyclerView
1615
import org.emunix.insteadlauncher.R
1716
import org.emunix.insteadlauncher.data.Game
1817
import org.emunix.insteadlauncher.data.GameDiffCallback
19-
import org.emunix.insteadlauncher.data.GameDiffCallback.Diff
2018
import org.emunix.insteadlauncher.helpers.loadUrl
2119
import org.emunix.insteadlauncher.helpers.visible
2220

@@ -41,23 +39,6 @@ class RepositoryAdapter(val listener: (Game, ImageView) -> Unit): ListAdapter<Ga
4139
updateBadge(holder, position)
4240
}
4341

44-
override fun onBindViewHolder(holder: ViewHolder, position: Int, payloads: MutableList<Any>) {
45-
ViewCompat.setTransitionName(holder.image, getItem(position).name)
46-
if (payloads.isEmpty()) {
47-
onBindViewHolder(holder, position)
48-
} else {
49-
val diff = payloads[0] as List<Diff>
50-
for (key: Diff in diff) {
51-
when (key) {
52-
Diff.IMAGE -> updateImage(holder, position)
53-
Diff.TITLE -> holder.name.text = getItem(position).title
54-
Diff.BRIEF -> holder.description.text = getItem(position).brief
55-
Diff.VERSION -> updateBadge(holder, position)
56-
}
57-
}
58-
}
59-
}
60-
6142
override fun getItemId(position: Int): Long {
6243
return getItem(position).name.hashCode().toLong()
6344
}

0 commit comments

Comments
 (0)