Skip to content

Commit 9c7e9dc

Browse files
committed
Fix bind parent order
1 parent eea4b34 commit 9c7e9dc

File tree

3 files changed

+11
-10
lines changed

3 files changed

+11
-10
lines changed

core/src/main/java/com/omega_r/base/adapters/OmegaListAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import com.omega_r.libs.omegatypes.image.preload
1414
abstract class OmegaListAdapter<M, VH> : OmegaAdapter<VH>(), ListableAdapter<M>
1515
where VH : RecyclerView.ViewHolder, VH : OmegaListAdapter.ViewHolderBindable<M> {
1616

17-
override var list: List<M> = listOf()
17+
override var list: List<M> = emptyList()
1818
set(value) {
1919
field = value
2020
notifyDataSetChanged()

core/src/main/java/com/omega_r/base/adapters/OmegaSpinnerAdapter.kt

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.widget.Spinner
99
import android.widget.SpinnerAdapter
1010
import androidx.annotation.LayoutRes
1111
import com.omega_r.base.enitity.Identifiable
12+
import com.omega_r.libs.omegatypes.Text
1213
import java.util.*
1314

1415
/**
@@ -18,8 +19,8 @@ import java.util.*
1819
abstract class OmegaSpinnerAdapter<M>(
1920
context: Context,
2021
@LayoutRes res: Int = android.R.layout.simple_spinner_item,
21-
list: List<M> = Collections.emptyList()
22-
) : ArrayAdapter<CharSequence>(context, res, Collections.emptyList()), ListableAdapter<M>,
22+
list: List<M> = emptyList()
23+
) : ArrayAdapter<CharSequence>(context, res, emptyList()), ListableAdapter<M>,
2324
SpinnerAdapter {
2425

2526
override var list: List<M> = list
@@ -123,12 +124,12 @@ abstract class OmegaSpinnerAdapter<M>(
123124
class TextAdapter(
124125
context: Context,
125126
res: Int = android.R.layout.simple_spinner_item,
126-
list: List<com.omega_r.libs.omegatypes.Text> = emptyList()
127+
list: List<Text> = emptyList()
127128
) :
128-
OmegaSpinnerAdapter<com.omega_r.libs.omegatypes.Text>(context, res, list) {
129+
OmegaSpinnerAdapter<Text>(context, res, list) {
129130

130131
override fun getItemName(
131-
item: com.omega_r.libs.omegatypes.Text,
132+
item: Text,
132133
isDropDown: Boolean
133134
): CharSequence =
134135
item.getCharSequence(context) ?: ""
@@ -138,11 +139,11 @@ abstract class OmegaSpinnerAdapter<M>(
138139
class StringAdapter(
139140
context: Context,
140141
res: Int = android.R.layout.simple_spinner_item,
141-
list: List<kotlin.String> = emptyList()
142+
list: List<String> = emptyList()
142143
) :
143-
OmegaSpinnerAdapter<kotlin.String>(context, res, list) {
144+
OmegaSpinnerAdapter<String>(context, res, list) {
144145

145-
override fun getItemName(item: kotlin.String, isDropDown: Boolean): CharSequence = item
146+
override fun getItemName(item: String, isDropDown: Boolean): CharSequence = item
146147
}
147148

148149
class CustomAdapter<M>(

core/src/main/java/com/omega_r/base/adapters/model/AutoBindModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ class AutoBindModel<M>(private val list: List<Binder<*, M>>) {
4747
}
4848

4949
constructor(parentModel: AutoBindModel<M>? = null, list: List<Binder<*, M>>) : this(
50-
list + (parentModel?.list ?: emptyList<Binder<*, M>>())
50+
(parentModel?.list ?: emptyList<Binder<*, M>>()) + list
5151
)
5252

5353
constructor(vararg binder: Binder<*, M>) : this(binder.toList())

0 commit comments

Comments
 (0)