General: Release 1.2.0 - Merge pull request #154

Author: anian03

Artemis.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -21,7 +21,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.1.0</string>
+	<string>1.2.0</string>
 	<key>CFBundleVersion</key>
 	<string>1</string>
 	<key>LSRequiresIPhoneOS</key>

Artemis/Supporting/Info.plist

@@ -22,7 +22,7 @@ let package = Package(
         .package(url: "https://github.com/daltoniam/Starscream.git", exact: "4.0.4"),
         .package(url: "https://github.com/Kelvas09/EmojiPicker.git", from: "1.0.0"),
         .package(url: "https://github.com/ls1intum/apollon-ios-module", .upToNextMajor(from: "1.0.2")),
-        .package(url: "https://github.com/ls1intum/artemis-ios-core-modules", .upToNextMajor(from: "13.2.0")),
+        .package(url: "https://github.com/ls1intum/artemis-ios-core-modules", .upToNextMajor(from: "14.0.3")),
         .package(url: "https://github.com/mac-cain13/R.swift.git", from: "7.0.0")
     ],
     targets: [

ArtemisKit/Package.swift

@@ -47,6 +47,7 @@ public struct ExerciseDetailView: View {
         }
         .task {
             await viewModel.loadExercise()
+            await viewModel.loadAssociatedChannel()
         }
         .refreshable {
             await viewModel.refreshExercise()
@@ -218,6 +219,19 @@ private extension ExerciseDetailView {
                     }
                 }
             }
+
+            if let channel = viewModel.channel.value {
+                Divider()
+                    .frame(height: 1.0)
+                    .overlay(Color.Artemis.artemisBlue)
+
+                ExerciseDetailCell(descriptionText: R.string.localizable.communication() + ":") {
+                    NavigationLink(value: ConversationPath(conversation: .channel(conversation: channel),
+                                                           coursePath: .init(id: viewModel.courseId))) {
+                        Text("\(channel.conversationName) \(Image(systemName: "chevron.forward"))")
+                    }
+                }
+            }
         }
         .background {
             RoundedRectangle(cornerRadius: 3.0)

ArtemisKit/Sources/CourseView/ExerciseTab/ExerciseDetailView.swift

@@ -17,6 +17,7 @@ final class ExerciseDetailViewModel {
     let exerciseId: Int
 
     var exercise: DataState<Exercise>
+    var channel: DataState<Channel> = .loading
 
     var isFeedbackPresented = false
     var latestResultId: Int?
@@ -77,6 +78,10 @@ final class ExerciseDetailViewModel {
         webViewId = UUID()
     }
 
+    func loadAssociatedChannel() async {
+        channel = await ExerciseChannelServiceFactory.shared.getAssociatedChannel(for: exerciseId, in: courseId)
+    }
+
     private func setParticipationAndResultId(from exercise: Exercise) {
         isWebViewLoading = true
 

ArtemisKit/Sources/CourseView/ExerciseTab/ExerciseDetailViewModel.swift

@@ -10,6 +10,7 @@ import Common
 import SharedModels
 import ArtemisMarkdown
 import DesignLibrary
+import Navigation
 
 public struct LectureDetailView: View {
 
@@ -58,11 +59,23 @@ public struct LectureDetailView: View {
                                 AttachmentCell(attachment: attachment)
                             }
                         }
+                        if let channel = viewModel.channel.value {
+                            Text(R.string.localizable.communication())
+                                .font(.headline)
+                            ChannelCell(courseId: viewModel.courseId, channel: channel)
+                        }
                         Spacer()
                     }
                     Spacer()
                 }.padding(.l)
             }
+            .onChange(of: viewModel.course.value, initial: true) { _, newValue in
+                if newValue != nil {
+                    Task {
+                        await viewModel.loadAssociatedChannel()
+                    }
+                }
+            }
         }
             .navigationTitle(viewModel.lecture.value?.title ?? R.string.localizable.loading())
             .navigationBarTitleDisplayMode(.inline)
@@ -73,6 +86,40 @@ public struct LectureDetailView: View {
     }
 }
 
+private struct ChannelCell: View {
+
+    @EnvironmentObject var navigationController: NavigationController
+    let courseId: Int
+    let channel: Channel
+
+    var body: some View {
+        Button {
+            navigationController.path.append(ConversationPath(id: channel.id, coursePath: CoursePath(id: courseId)))
+        } label: {
+            HStack {
+                VStack(alignment: .leading, spacing: .l) {
+                    Label {
+                        Text(channel.conversationName)
+                    } icon: {
+                        channel.icon
+                    }
+                    .font(.title3)
+
+                    if let description = channel.description {
+                        Text(description)
+                    }
+                }
+                .foregroundColor(Color.Artemis.primaryLabel)
+                Spacer()
+                Image(systemName: "chevron.forward")
+            }
+            .frame(maxWidth: .infinity, alignment: .leading)
+            .padding(.l)
+            .cardModifier(backgroundColor: .Artemis.exerciseCardBackgroundColor, cornerRadius: .m)
+        }
+    }
+}
+
 private struct AttachmentCell: View {
 
     let attachment: Attachment

ArtemisKit/Sources/CourseView/LectureTab/LectureDetailView.swift

@@ -14,6 +14,7 @@ class LectureDetailViewModel: BaseViewModel {
 
     @Published var lecture: DataState<Lecture> = .loading
     @Published var course: DataState<Course> = .loading
+    @Published var channel: DataState<Channel> = .loading
 
     let lectureId: Int
     let courseId: Int
@@ -55,6 +56,13 @@ class LectureDetailViewModel: BaseViewModel {
         }
     }
 
+    func loadAssociatedChannel() async {
+        // We only have a channel if communication is enabled
+        guard course.value?.courseInformationSharingConfiguration != .disabled else { return }
+
+        channel = await LectureServiceFactory.shared.getAssociatedChannel(for: lectureId, in: courseId)
+    }
+
     func updateLectureUnitCompletion(lectureUnit: LectureUnit, completed: Bool) async -> LectureUnit {
         let result = await LectureServiceFactory.shared.updateLectureUnitCompletion(lectureId: lectureId,
                                                                                     lectureUnitId: lectureUnit.id,

ArtemisKit/Sources/CourseView/LectureTab/LectureDetailViewModel.swift

@@ -96,3 +96,4 @@
 "lectureUnits" = "Lecture Units";
 "lecturesGroupTitle" = "%s (Lectures: %i)";
 "attachments" = "Attachments";
+"communication" = "Communication";

ArtemisKit/Sources/CourseView/Resources/en.lproj/Localizable.strings

@@ -0,0 +1,18 @@
+//
+//  ExerciseChannelService.swift
+//  
+//
+//  Created by Anian Schleyer on 18.08.24.
+//
+
+import Foundation
+import Common
+import SharedModels
+
+protocol ExerciseChannelService {
+    func getAssociatedChannel(for exerciseId: Int, in courseId: Int) async -> DataState<Channel>
+}
+
+enum ExerciseChannelServiceFactory {
+    static let shared: ExerciseChannelService = ExerciseChannelServiceImpl()
+}

ArtemisKit/Sources/CourseView/Services/ExerciseService/ExerciseChannelService.swift

@@ -0,0 +1,41 @@
+//
+//  ExerciseChannelServiceImpl.swift
+//
+//
+//  Created by Anian Schleyer on 18.08.24.
+//
+
+import APIClient
+import Common
+import SharedModels
+
+struct ExerciseChannelServiceImpl: ExerciseChannelService {
+
+    let client = APIClient()
+
+    struct GetExerciseChannelRequest: APIRequest {
+        typealias Response = Channel
+
+        let courseId: Int
+        let exerciseId: Int
+
+        var method: HTTPMethod {
+            .get
+        }
+
+        var resourceName: String {
+            "api/courses/\(courseId)/exercises/\(exerciseId)/channel"
+        }
+    }
+
+    func getAssociatedChannel(for exerciseId: Int, in courseId: Int) async -> DataState<Channel> {
+        let result = await client.sendRequest(GetExerciseChannelRequest(courseId: courseId, exerciseId: exerciseId))
+
+        switch result {
+        case let .success((response, _)):
+            return .done(response: response)
+        case let .failure(error):
+            return .failure(error: UserFacingError(error: error))
+        }
+    }
+}