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-89 Redesign project upload #4752

Merged
merged 204 commits into from
Jul 13, 2023
Merged

IDE-89 Redesign project upload #4752

merged 204 commits into from
Jul 13, 2023

Conversation

ma-zea
Copy link
Contributor

@ma-zea ma-zea commented Mar 30, 2023 •
edited
Loading

https://jira.catrob.at/browse/IDE-89
Overwrite dialog will be displayed if the user wants to upload a project with an already existing name. User can choose if he wants to overwrite the project or rename current one and upload it with the new name.

  • Implement new API call getUserProjects
  • Add logic in ProjectUploadActivity to check if a project with this name already exists
  • Show overwrite dialog if name already exists and let user decide how to continue

Your checklist for this pull request

Please review the contributing guidelines and wiki pages of this repository.

  • Include the name of the Jira ticket in the PR’s title
  • Include a summary of the changes plus the relevant context
  • Choose the proper base branch (develop)
  • Confirm that the changes follow the project’s coding guidelines
  • Verify that the changes generate no compiler or linter warnings
  • Perform a self-review of the changes
  • Verify to commit no other files than the intentionally changed ones
  • Include reasonable and readable tests verifying the added or changed behavior
  • Confirm that new and existing unit tests pass locally
  • Check that the commits’ message style matches the project’s guideline
  • Stick to the project’s gitflow workflow
  • Verify that your changes do not have any conflicts with the base branch
  • After the PR, verify that all CI checks have passed
  • Post a message in the catroid-stage or catroid-ide Slack channel and ask for a code reviewer

Walcho1125 and others added 30 commits January 24, 2022 12:47
@Walcho1125
CATROID-1214 implement progressive Bricksearch
a5f04e8
@JayTropper
CATROID-1301 Catrobat Language Test for "If-Then-Else" brick
de93395
@mpozvek
CATROID-1344 Fix testPlaceAtXY testrunner test
b1cc5ab
@dorianpercic
CATROID-1169 Refactored AddUserDataToUserDefinedBrickFragment from ja…
68cfaa2 
…va to kotlin.
@dandrawes
CATROID-1359 Fix testActivityRecreateRenameSpriteDialog
9ebdf31
@dandrawes
CATROID-1360 Fix testActivityRecreateRenameSoundDialog
915cb3d
@friendo97
CATROID-1339 "Add to backpack" option missing for "Define" bricks
f0efdd2
CATROID-1102 Refactor ProjectLoadTask to Kotlin
5847d5e 
Refactored the Java-class ProjectLoadTask to Kotlin. Replaced
AsyncTask with Coroutines. Added Unit Test for this class. Cleaned
up all references to old class.
Add changes requested from Code Review, mainly extend JUnit Test
@JohannesMayerhofer
CATROID-1348 Fix testGlideToSpeedRangeAndDuration.catrobat
ddc9899
@ChriMoser @mseiser
CATROID-910 Regex Popup Redesign
6b5683a 
Redesign the Regex Popup according to the Ticket: Moved link to wiki to "Help" button and made dialog smaller.
@crowdin-bot
New Crowdin translations by Github Action
d6a3802
@juliajulie95
Merge pull request Catrobat#4437 from Catrobat/l10n_crowdin_action
126020a 
New Crowdin translations by Github Action
@juliajulie95
Merge pull request Catrobat#4445 from dandrawes/CATROID-1360
7ac895f 
CATROID-1360 Fix testActivityRecreateRenameSoundDialog
@juliajulie95
Merge pull request Catrobat#4444 from dandrawes/CATROID-1359
9eef229 
CATROID-1359 Fix testActivityRecreateRenameSpriteDialog
CATROID-1337 "Looks" shown instead of "Sounds"
13f837d 
Added string and replaced it
@juliajulie95
Merge pull request Catrobat#4450 from mseiser/CATROID-910
ba343d9 
CATROID-910 Regex Popup Redesign
@juliajulie95
Merge pull request Catrobat#4454 from Tamdav/CATROID-1337
a3afcd9 
CATROID-1337 "Looks" shown instead of "Sounds"
@crowdin-bot
New Crowdin translations by Github Action
60f72c8
@juliajulie95
Merge pull request Catrobat#4455 from Catrobat/l10n_crowdin_action
ccb46fd 
New Crowdin translations by Github Action
@Piki2000
CATROID-1150 Redesign of Bluetooth Screen
ea38794
@ratschillerp
[DEVOPS-677] Introduce Jenkinsfile file check and disable git publish…
4823a87 
…ing checks
@DinosaurierRex
DEVOPS-677 Jenkins rework: Removed Flaky test, Changed 0/1 to false/t…
b77fe3a 
…rue in tests
@juliajulie95
Merge pull request Catrobat#4461 from ratschillerp/jenkins-rework
8475c3b 
[DEVOPS-677] Introduce Jenkinsfile file check and disable publish checks
@juliajulie95
Merge pull request Catrobat#4462 from DinosaurierRex/MAINTENANCE-Jenk…
102009a 
…ins-Rework

DEVOPS-677 Jenkins rework: Removed Flaky test, Changed 0/1 to false/t…
@Piki2000
CATROID-773 Upload unmodifed example project
b82c460
@adnaribo
Merge pull request Catrobat#4332 from wolpra98/CATROID-1102
0bdbeb0 
CATROID-1102 Refactor ProjectLoadTask to Kotlin
@dandrawes
Merge pull request Catrobat#4439 from friendo97/CATROID-1339
d4b0d9e 
CATROID-1339 "Add to backpack" option missing for "Define" bricks
@Walcho1125
CATROID-1342 Make 3dots and ripples disappear on select mode
4a2203c
@dandrawes
CATROID-1374 Scene View - image preview is not copied
25ebd67
@Piki2000
CATROID-1376 Default Project Name in Upload error message is wrong
c4bacd8
Walcho1125 and others added 18 commits January 16, 2023 14:50
@Walcho1125
Merge pull request Catrobat#4655 from friendo97/CATROID-1468
15b1d13 
CATROID-1468 DeleteLookBrickTest failing
@DinosaurierRex
[MAINTENANCE] Fix for cannot resolve symbol error IDE version > 2021.1.1
3156381
@Walcho1125
Merge pull request Catrobat#4656 from l-ilma/CATROID-1494
fccbdca 
CATROID-1494 Check checkbox when clicking on a fragment
@dandrawes
Merge pull request Catrobat#4672 from DinosaurierRex/IDE-MAINTENANCE
bbb75ce 
[MAINTENANCE] Fix for cannot resolve symbol error IDE version > 2021.1.1
@mseiser
Merge pull request Catrobat#4171 from reichli/CATROID-1078
9888bb9 
CATROID-1078 Add new CLTs for the set transparency brick
@Walcho1125
Merge pull request Catrobat#4465 from NoQQ/CATROID-1371
88a22e7 
CATROID-1371 REFACTOR SetBrightnessAction to Kotlin
@Aayush2111
CATROID-1069 REFACTOR CloneAction to Kotlin
6ae0c8c
@Aayush2111
CATROID-1519 fixed unresolved imports in org.catrobat.catroid(test) file
7ef2893
@DinosaurierRex
[MAINTENANCE] Fix for cannot resolve symbol in unit tests
7f80be7
@mseiser
Merge pull request Catrobat#4608 from Rawbat/CATROID-1469
4c8adc5 
CATROID-1469 Test: testCloneValues failing
@mseiser
Merge pull request Catrobat#4710 from DinosaurierRex/TEST-MAINTENANCE
8b6c334 
[MAINTENANCE] Fix for cannot resolve symbol in unit tests
@mseiser
Merge pull request Catrobat#4703 from Aayush2111/CATROID-1069
8f001bb 
CATROID-1069 REFACTOR CloneAction to Kotlin
@DinosaurierRex @jANI0x
[MAINTENANCE] Fix for cannot resolve symbol in unit tests
dd9790e
@jANI0x
IDE-108 changed color of NoteBrick to black in v25/styles
6f8f4bd
@mseiser
Merge pull request Catrobat#4697 from Aayush2111/CATROID-1519
81d3ef4 
CATROID-1519 fixed unresolved imports in org.catrobat.catroid(test) file
@ma-zea
CATROID-IDE-89 Implement API call, logic and AlertDialog if name exists
7d50080
@mseiser
Merge pull request Catrobat#4646 from dorianpercic/CATROID-1474
133d395 
CATROID-1474 Update huawei ml libraries
@mseiser
Merge pull request Catrobat#4721 from jANI0x/IDE-108
c17bd87 
IDE-108 Catroid Change Notes Brick Color
ma-zea and others added 7 commits April 14, 2023 11:34
@ma-zea
IDE-89 Check all changes
e21fe36
@rinaschedl
IDE-100 consistent writing german
2978af2
@bengaal
Merge pull request Catrobat#4763 from rinaschedl/IDE-100
9c3dd86 
IDE-100 Consistent writing
@ma-zea
Merge branch 'develop' into CATROID-IDE-89
d10789e 
# Conflicts:
#	catroid/src/androidTest/java/org/catrobat/catroid/test/web/AuthenticationCallsTest.java
#	catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/intents/loginfragment/LoginDialogFragmentTest.java
#	catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.java
#	catroid/src/main/java/org/catrobat/catroid/common/Constants.java
#	catroid/src/main/java/org/catrobat/catroid/transfers/CheckEmailAvailableTask.java
#	catroid/src/main/java/org/catrobat/catroid/transfers/CheckOAuthTokenTask.java
#	catroid/src/main/java/org/catrobat/catroid/transfers/CheckTokenTask.java
#	catroid/src/main/java/org/catrobat/catroid/transfers/CheckUserNameAvailableTask.java
#	catroid/src/main/java/org/catrobat/catroid/transfers/DeleteTestUserTask.java
#	catroid/src/main/java/org/catrobat/catroid/transfers/GetTagsTask.java
#	catroid/src/main/java/org/catrobat/catroid/transfers/GoogleExchangeCodeTask.java
#	catroid/src/main/java/org/catrobat/catroid/transfers/GoogleLogInTask.java
#	catroid/src/main/java/org/catrobat/catroid/transfers/GoogleLoginHandler.java
#	catroid/src/main/java/org/catrobat/catroid/transfers/LoginTask.java
#	catroid/src/main/java/org/catrobat/catroid/transfers/RegistrationTask.java
#	catroid/src/main/java/org/catrobat/catroid/ui/ProjectUploadActivity.kt
#	catroid/src/main/java/org/catrobat/catroid/ui/SignInActivity.java
#	catroid/src/main/java/org/catrobat/catroid/ui/WebViewActivity.java
#	catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/dialog/login/LoginDialogFragment.java
#	catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/dialog/login/OAuthUsernameDialogFragment.java
#	catroid/src/main/java/org/catrobat/catroid/ui/recyclerview/dialog/login/RegistrationDialogFragment.java
#	catroid/src/main/java/org/catrobat/catroid/utils/Utils.java
#	catroid/src/main/java/org/catrobat/catroid/web/ServerAuthenticator.kt
#	catroid/src/main/res/layout/dialog_sign_in_oauth_username.xml
#	catroid/src/test/java/org/catrobat/catroid/test/transfers/WebViewActivityLoginCookieTest.java
#	catroid/src/test/java/org/catrobat/catroid/test/web/ServerAuthenticatorTest.java
@ma-zea
IDE-89 Merge develop and resolve conflicts
d8da4f2
@ma-zea
Merge branch 'new-api' into CATROID-IDE-89
aaaac18 
# Conflicts:
#	catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/activity/ProjectUploadDialogTest.java
#	catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/ReplaceApiKeyDialogTest.java
#	catroid/src/androidTest/java/org/catrobat/catroid/uiespresso/ui/dialog/ReuploadProjectDialogTest.kt
#	catroid/src/main/java/org/catrobat/catroid/retrofit/RetrofitWebServer.kt
#	catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectUpload.kt
#	catroid/src/main/java/org/catrobat/catroid/transfers/project/ProjectUploadData.kt
#	catroid/src/main/java/org/catrobat/catroid/transfers/project/ResultReceiverWrapper.kt
#	catroid/src/main/java/org/catrobat/catroid/ui/ProjectUploadActivity.kt
#	catroid/src/main/java/org/catrobat/catroid/ui/controller/ProjectUploadController.kt
#	catroid/src/main/java/org/catrobat/catroid/web/requests/HttpRequests.kt
#	catroid/src/test/java/org/catrobat/catroid/test/transfers/ProjectUploadTest.kt
@ma-zea
IDE-89 Resolve conflicts and warnings
5775642
@ma-zea ma-zea force-pushed the CATROID-IDE-89 branch from 0da90d5 to 5775642 Compare May 2, 2023 13:09
@sebastiangollob sebastiangollob merged commit c04672e into Catrobat:new-api Jul 13, 2023
ma-zea added a commit to ma-zea/Catroid that referenced this pull request Dec 7, 2023
@ma-zea
IDE-89 Redesign project upload (Catrobat#4752)
2bbce2f
ma-zea added a commit to ma-zea/Catroid that referenced this pull request Apr 29, 2024
@ma-zea
IDE-89 Redesign project upload (Catrobat#4752)
ce9825e
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.