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

Modeling Exercise: Add dependency and integrate the "apollon-ios-module" #228

Merged
merged 12 commits into from
Jan 23, 2024
Merged

Modeling Exercise: Add dependency and integrate the "apollon-ios-module" #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3caf87d
add dependency to "apollon-ios-module"
AlexanderG2207 Oct 2, 2023
a882aca
add gridBackground
AlexanderG2207 Oct 5, 2023
54988d9
Add comments
AlexanderG2207 Oct 5, 2023
38cbdc1
Merge branch 'develop' into feature/add-apollon-ios-package
AlexanderG2207 Oct 5, 2023
33b0735
Added GridBackgroundView() and check if diagram type is supported
AlexanderG2207 Oct 6, 2023
3941cda
Improve error handling
terlan98 Oct 8, 2023
8e4e449
Merge branch 'develop' into feature/add-apollon-ios-package
AlexanderG2207 Nov 29, 2023
974c6c4
Update for Apollon v3
AlexanderG2207 Nov 30, 2023
4b9396f
Remove CachedAsyncImage
AlexanderG2207 Nov 30, 2023
de9b609
Merge branch 'develop' into feature/add-apollon-ios-package
AlexanderG2207 Jan 11, 2024
61e339a
Refactor and change Apollon-iOS-Module dependency to version "1.0.0"
AlexanderG2207 Jan 12, 2024
20df273
change error message for unsupported diagram version
AlexanderG2207 Jan 22, 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
135 changes: 39 additions & 96 deletions Themis.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

0 Themis/Models/UML/UMLBadgeSymbol.swift → ...s/Extensions/Apollon/UMLBadgeSymbol.swift
View file
Open in desktop
File renamed without changes.
36 changes: 0 additions & 36 deletions Themis/Extensions/CGPointExtension.swift
View file
Open in desktop

This file was deleted.

4 changes: 3 additions & 1 deletion Themis/Extensions/Core/UserFacingErrorExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ extension UserFacingError {

// MARK: - Modeling
static let diagramNotSupported = UserFacingError(title: "This UML diagram type is not supported")

static let couldNotParseDiagram = UserFacingError(title: "Could not find UML diagram")
static let unsupportedDiagramVersion = UserFacingError(title: "This UML diagram has an unsupported or invalid version")

// MARK: - File Upload
static let couldNotFetchFileDetails = UserFacingError(title: """
Could not fetch details of the uploaded file. The file URL may be invalid.
Expand Down
1 change: 1 addition & 0 deletions Themis/Models/Feedback/ModelingFeedbackDetail.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

import Foundation
import SharedModels
import ApollonShared

struct ModelingFeedbackDetail: FeedbackDetail {
var umlItem: SelectableUMLItem?
Expand Down
49 changes: 0 additions & 49 deletions Themis/Models/UML/SelectableUMLItem.swift
View file
Open in desktop

This file was deleted.

101 changes: 0 additions & 101 deletions Themis/Models/UML/UMLElement.swift
View file
Open in desktop

This file was deleted.

65 changes: 0 additions & 65 deletions Themis/Models/UML/UMLElementType.swift
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions Themis/Models/UML/UMLModel.swift
View file
Open in desktop

This file was deleted.

Loading
Loading