Skip to content
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

Jump to bottom

IDE-52 Refactor SpriteActivity to kotlin #5005

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
Open

IDE-52 Refactor SpriteActivity to kotlin #5005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
27a0f13
IDE-52 refactor SpriteActivity from java to kotlin
Jun 17, 2024
d46048c
Merge branch 'Catrobat:develop' into IDE-52
scrappie1 Jun 17, 2024
9397aaf
IDE-52 fix import in file RenameSceneTest.kt
Jun 17, 2024
49e3c51
Merge remote-tracking branch 'origin/IDE-52' into IDE-52
Jun 17, 2024
8033296
IDE-52 fix cast in function handleAddUserDataButton
Jun 24, 2024
ac4a574
IDE-52 move ProjectManager initialization to companion object
Jun 24, 2024
1a62dde
IDE-52 fix lint and detekt warnings
Jun 24, 2024
c5e8c87
IDE-52 add injection of RecentBrickListManager
Jun 27, 2024
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
2 changes: 1 addition & 1 deletion catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/fragment/RenameSceneTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ import org.catrobat.catroid.testsuites.annotations.Cat.AppUi
import org.catrobat.catroid.testsuites.annotations.Level.Smoke
import org.catrobat.catroid.ui.ProjectActivity
import org.catrobat.catroid.ui.SpriteActivity
import org.catrobat.catroid.ui.SpriteActivity.FRAGMENT_LOOKS
import org.catrobat.catroid.ui.SpriteActivity.Companion.FRAGMENT_LOOKS
import org.catrobat.catroid.uiespresso.ui.fragment.rvutils.RecyclerViewInteractionWrapper.onRecyclerView
import org.catrobat.catroid.uiespresso.util.UiTestUtils.Companion.getResourcesString
import org.catrobat.catroid.uiespresso.util.UiTestUtils.Companion.openActionBarMenu
Expand Down
2 changes: 2 additions & 0 deletions catroid/src/main/java/org/catrobat/catroid/koin/CatroidKoinHelper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ import org.catrobat.catroid.sync.DefaultProjectsCategoriesSync
import org.catrobat.catroid.sync.FeaturedProjectsSync
import org.catrobat.catroid.sync.ProjectsCategoriesSync
import org.catrobat.catroid.ui.controller.BackpackListManager
import org.catrobat.catroid.ui.controller.RecentBrickListManager
import org.catrobat.catroid.ui.recyclerview.adapter.CategoriesAdapter
import org.catrobat.catroid.ui.recyclerview.adapter.FeaturedProjectsAdapter
import org.catrobat.catroid.ui.recyclerview.repository.LocalHashVersionRepository
Expand Down Expand Up @@ -68,6 +69,7 @@ val componentsModules = module(createdAtStart = true, override = false) {
single { CatroidWebServer.getWebService("https://share.catrob.at/api/") }
factory { WorkManager.getInstance(androidContext()) }
single { ProjectManager(androidContext()) }
single { RecentBrickListManager.getInstance() }
single { NetworkConnectionMonitor(androidContext()) }
factory { HuaweiApiAvailability.getInstance() }
factory { GoogleApiAvailability.getInstance() }
Expand Down
Loading