Skip to content

IDE-289 Fix import actor from local project #5108

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.

Sign up for GitHub

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

Open
Frajhamster wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

IDE-289 Fix import actor from local project #5108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 8 additions & 3 deletions catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/ProjectListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ import android.view.MenuItem
import android.view.View
import androidx.annotation.PluralsRes
import androidx.annotation.RequiresApi
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -75,7 +76,9 @@ import java.io.IOException
import java.util.concurrent.locks.ReentrantLock

@SuppressLint("NotifyDataSetChanged")
class ProjectListFragment : RecyclerViewFragment<ProjectData?>(), ProjectLoadListener {
class ProjectListFragment(
private val mainDispatcher: CoroutineDispatcher = Dispatchers.Main
) : RecyclerViewFragment<ProjectData?>(), ProjectLoadListener {
private var items: MutableList<ProjectData> = ArrayList()

private var filesForUnzipAndImportTask: ArrayList<File>? = null
Expand All @@ -95,7 +98,9 @@ class ProjectListFragment : RecyclerViewFragment<ProjectData?>(), ProjectLoadLis
importProject(requireArguments().getParcelable("intent"))
}
if (requireActivity().intent?.hasExtra(ProjectListActivity.IMPORT_LOCAL_INTENT) == true) {
adapter.showSettings = false
if (adapter != null) {
adapter.showSettings = false
}
actionModeType = IMPORT_LOCAL
}
}
Expand Down Expand Up @@ -559,7 +564,7 @@ class ProjectListFragment : RecyclerViewFragment<ProjectData?>(), ProjectLoadLis
items = newItems
lock.unlock()

withContext(Dispatchers.Main) {
withContext(mainDispatcher) {
callback.onProjectsLoaded()
}
}
Expand Down
1 change: 0 additions & 1 deletion catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/fragment/SpriteListFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,7 +375,6 @@ class SpriteListFragment : RecyclerViewFragment<Sprite?>() {
}
if (item !is GroupSprite) {
popupMenu.menu.findItem(R.id.backpack).setTitle(R.string.pack)
popupMenu.menu.removeItem(R.id.from_local)
}
popupMenu.show()
}
Expand Down