-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
teams: smoother resource remove (fixes #4916) #4917
Open
deeppp15
wants to merge
9
commits into
master
Choose a base branch
from
4916-teams-resource-removal
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
defdfcd
added resource removal functinoality
deeppp15 4aaa76a
Merge branch 'master' of https://github.com/open-learning-exchange/my…
deeppp15 0053420
renamed variables
deeppp15 697ae4b
improved matching
deeppp15 c2a9fe8
changed query
deeppp15 127e1ae
Merge branch '4916-teams-resource-removal' of https://github.com/open…
deeppp15 5e48055
Merge branch 'master' into 4916-teams-resource-removal
deeppp15 ef167fe
checks for record not present
deeppp15 57b0b27
Merge branch 'master' into 4916-teams-resource-removal
Okuro3499 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,10 +11,15 @@ import org.ole.planet.myplanet.callback.OnHomeItemClickListener | |
import org.ole.planet.myplanet.databinding.RowTeamResourceBinding | ||
import org.ole.planet.myplanet.model.RealmMyLibrary | ||
import org.ole.planet.myplanet.model.RealmMyTeam.Companion.getTeamCreator | ||
import org.ole.planet.myplanet.ui.team.teamResource.AdapterTeamResource.ViewHolderTeamResource | ||
|
||
class AdapterTeamResource(private val context: Context, private val list: List<RealmMyLibrary>, mRealm: Realm, teamId: String?, private val settings: SharedPreferences) : RecyclerView.Adapter<ViewHolderTeamResource>() { | ||
private lateinit var rowTeamResourceBinding: RowTeamResourceBinding | ||
class AdapterTeamResource( | ||
private val context: Context, | ||
private val list: MutableList<RealmMyLibrary>, | ||
private val mRealm: Realm, | ||
teamId: String?, | ||
private val settings: SharedPreferences | ||
) : RecyclerView.Adapter<AdapterTeamResource.ViewHolderTeamResource>() { | ||
|
||
private var listener: OnHomeItemClickListener? = null | ||
private val teamCreator: String = getTeamCreator(teamId, mRealm) | ||
|
||
|
@@ -25,25 +30,48 @@ class AdapterTeamResource(private val context: Context, private val list: List<R | |
} | ||
|
||
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolderTeamResource { | ||
rowTeamResourceBinding = RowTeamResourceBinding.inflate(LayoutInflater.from(context), parent, false) | ||
return ViewHolderTeamResource(rowTeamResourceBinding) | ||
val binding = RowTeamResourceBinding.inflate(LayoutInflater.from(context), parent, false) | ||
return ViewHolderTeamResource(binding) | ||
} | ||
|
||
override fun onBindViewHolder(holder: ViewHolderTeamResource, position: Int) { | ||
rowTeamResourceBinding.tvTitle.text = list[position].title | ||
rowTeamResourceBinding.tvDescription.text = list[position].description | ||
val resource = list[position] | ||
|
||
holder.binding.tvTitle.text = resource.title | ||
holder.binding.tvDescription.text = resource.description | ||
|
||
holder.itemView.setOnClickListener { | ||
listener?.openLibraryDetailFragment(list[position]) | ||
listener?.openLibraryDetailFragment(resource) | ||
} | ||
rowTeamResourceBinding.ivRemove.setOnClickListener { } | ||
if (!settings.getString("userId", "--").equals(teamCreator, ignoreCase = true)) { | ||
rowTeamResourceBinding.ivRemove.visibility = View.GONE | ||
|
||
holder.binding.ivRemove.setOnClickListener { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. these ones too from There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Hi @Okuro3499 , reverted variable names |
||
removeResource(resource, position) | ||
} | ||
|
||
holder.binding.ivRemove.visibility = if (settings.getString("userId", "--") == teamCreator) { | ||
View.VISIBLE | ||
} else { | ||
View.GONE | ||
} | ||
} | ||
|
||
override fun getItemCount(): Int { | ||
return list.size | ||
} | ||
|
||
class ViewHolderTeamResource(rowTeamResourceBinding: RowTeamResourceBinding) : RecyclerView.ViewHolder(rowTeamResourceBinding.root) | ||
fun removeResource(resource: RealmMyLibrary, position: Int) { | ||
if (position < 0 || position >= list.size) return | ||
|
||
mRealm.executeTransaction { realm -> | ||
val itemToDelete = realm.where(RealmMyLibrary::class.java) | ||
.equalTo("id", resource.id) | ||
.findFirst() | ||
itemToDelete?.deleteFromRealm() | ||
} | ||
|
||
list.removeAt(position) | ||
notifyItemRemoved(position) | ||
} | ||
|
||
class ViewHolderTeamResource(val binding: RowTeamResourceBinding) : RecyclerView.ViewHolder(binding.root) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
why is these being renamed?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi @Okuro3499 , reverted variable names