Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
applicationId "org.ole.planet.myplanet"
minSdk = 26
targetSdk = 36
versionCode = 3719
versionName = "0.37.19"
versionCode = 3720
versionName = "0.37.20"
ndkVersion = '26.3.11579264'
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,16 @@ import org.ole.planet.myplanet.R
import org.ole.planet.myplanet.databinding.RowTaskBinding
import org.ole.planet.myplanet.model.RealmTeamTask
import org.ole.planet.myplanet.model.RealmUserModel
import org.ole.planet.myplanet.repository.UserRepository
import org.ole.planet.myplanet.ui.team.teamTask.AdapterTask.ViewHolderTask
import org.ole.planet.myplanet.utilities.TimeUtils.formatDate

class AdapterTask(
private val context: Context,
private val list: List<RealmTeamTask>?,
private val nonTeamMember: Boolean,
private val coroutineScope: CoroutineScope
private val coroutineScope: CoroutineScope,
private val userRepository: UserRepository
) : RecyclerView.Adapter<ViewHolderTask>() {
private val assigneeCache: MutableMap<String, String> = mutableMapOf()
private var listener: OnCompletedListener? = null
Expand Down Expand Up @@ -101,12 +103,7 @@ class AdapterTask(
}

return coroutineScope.launch(Dispatchers.IO) {
var user: RealmUserModel? = null
Realm.getDefaultInstance().use { realm ->
user = realm.where(RealmUserModel::class.java).equalTo("id", assigneeId).findFirst()?.let {
realm.copyFromRealm(it)
}
}
val user = userRepository.getUserById(assigneeId)
withContext(Dispatchers.Main) {
val name = user?.name
if (name != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import io.realm.Sort
import java.util.Calendar
import java.util.Date
import java.util.UUID
import javax.inject.Inject
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch
import org.ole.planet.myplanet.R
Expand All @@ -36,6 +37,7 @@ import org.ole.planet.myplanet.model.RealmMyTeam.Companion.getJoinedMember
import org.ole.planet.myplanet.model.RealmNews
import org.ole.planet.myplanet.model.RealmTeamTask
import org.ole.planet.myplanet.model.RealmUserModel
import org.ole.planet.myplanet.repository.UserRepository
import org.ole.planet.myplanet.ui.myhealth.UserListArrayAdapter
import org.ole.planet.myplanet.ui.team.BaseTeamFragment
import org.ole.planet.myplanet.ui.team.teamTask.AdapterTask.OnCompletedListener
Expand Down Expand Up @@ -252,7 +254,7 @@ class TeamTaskFragment : BaseTeamFragment(), OnCompletedListener {
else {
showNoData(binding.tvNodata, list?.size, "")
}
adapterTask = AdapterTask(requireContext(), list, !isMemberFlow.value, viewLifecycleOwner.lifecycleScope)
adapterTask = AdapterTask(requireContext(), list, !isMemberFlow.value, viewLifecycleOwner.lifecycleScope, userRepository)
adapterTask.setListener(this)
binding.rvTask.adapter = adapterTask
}
Expand Down Expand Up @@ -326,7 +328,7 @@ class TeamTaskFragment : BaseTeamFragment(), OnCompletedListener {

private fun updatedTeamTaskList(updatedList: RealmResults<RealmTeamTask>) {
viewLifecycleOwner.lifecycleScope.launch {
adapterTask = AdapterTask(requireContext(), updatedList, !isMemberFlow.value, viewLifecycleOwner.lifecycleScope)
adapterTask = AdapterTask(requireContext(), updatedList, !isMemberFlow.value, viewLifecycleOwner.lifecycleScope, userRepository)
adapterTask.setListener(this@TeamTaskFragment)
binding.rvTask.adapter = adapterTask
Comment on lines 328 to 333

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

P0 Badge Inject UserRepository into TeamTaskFragment

The new adapter constructor requires a UserRepository, and TeamTaskFragment now passes userRepository when creating AdapterTask. However, this fragment does not declare or inject a UserRepository field anywhere, so the references at the adapter instantiations fail to compile with Unresolved reference: userRepository. Add an @Inject lateinit var userRepository: UserRepository (or equivalent constructor injection) before using it; otherwise the module cannot build.

Useful? React with 👍 / 👎.

adapterTask.notifyDataSetChanged()
Expand Down