Skip to content

Commit 43091d8

Browse files
anian03anian03
authored
General: Release 1.1.0 (#132)
- Participation in Text Exercises - Improvements to Conversation List, such as swipe gestures, icons, simplified buttons and menus - New design of Exercise and Lecture List - Number of Lectures now shows "Lectures" instead of "Exercises" - Fix Notifications for Exercises could not be opened - Fix Pull to Refresh on Exercises was broken
1 parent b4c3077 commit 43091d8

File tree

68 files changed

+2306
-736
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+2306
-736
lines changed

‎Artemis.xcodeproj/project.pbxproj‎

Lines changed: 136 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,28 @@
1010
058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
1111
058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
1212
2152FB042600AC8F00CF470E /* ArtemisApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* ArtemisApp.swift */; };
13+
51F1B2252C0CC26800F14D01 /* ArtemisUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F1B2242C0CC26800F14D01 /* ArtemisUITests.swift */; };
14+
51F1B22C2C0CC2D700F14D01 /* SnapshotHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 51F1B22B2C0CC2D700F14D01 /* SnapshotHelper.swift */; };
1315
A166A2592B0381F000AB6119 /* ArtemisKit in Frameworks */ = {isa = PBXBuildFile; productRef = A166A2582B0381F000AB6119 /* ArtemisKit */; };
1416
/* End PBXBuildFile section */
1517

18+
/* Begin PBXContainerItemProxy section */
19+
51F1B2262C0CC26800F14D01 /* PBXContainerItemProxy */ = {
20+
isa = PBXContainerItemProxy;
21+
containerPortal = 7555FF73242A565900829871 /* Project object */;
22+
proxyType = 1;
23+
remoteGlobalIDString = 7555FF7A242A565900829871;
24+
remoteInfo = Artemis;
25+
};
26+
/* End PBXContainerItemProxy section */
27+
1628
/* Begin PBXFileReference section */
1729
058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
1830
058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
1931
2152FB032600AC8F00CF470E /* ArtemisApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtemisApp.swift; sourceTree = "<group>"; };
32+
51F1B2202C0CC26800F14D01 /* ArtemisUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = ArtemisUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
33+
51F1B2242C0CC26800F14D01 /* ArtemisUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArtemisUITests.swift; sourceTree = "<group>"; };
34+
51F1B22B2C0CC2D700F14D01 /* SnapshotHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SnapshotHelper.swift; sourceTree = "<group>"; };
2035
7555FF7B242A565900829871 /* Artemis.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Artemis.app; sourceTree = BUILT_PRODUCTS_DIR; };
2136
A166A2622B03893900AB6119 /* Gemfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Gemfile; sourceTree = SOURCE_ROOT; };
2237
A166A2632B03893900AB6119 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; };
@@ -39,6 +54,13 @@
3954
);
4055
runOnlyForDeploymentPostprocessing = 0;
4156
};
57+
51F1B21D2C0CC26800F14D01 /* Frameworks */ = {
58+
isa = PBXFrameworksBuildPhase;
59+
buildActionMask = 2147483647;
60+
files = (
61+
);
62+
runOnlyForDeploymentPostprocessing = 0;
63+
};
4264
/* End PBXFrameworksBuildPhase section */
4365

4466
/* Begin PBXGroup section */
@@ -57,12 +79,22 @@
5779
name = Frameworks;
5880
sourceTree = "<group>";
5981
};
82+
51F1B2212C0CC26800F14D01 /* ArtemisUITests */ = {
83+
isa = PBXGroup;
84+
children = (
85+
51F1B2242C0CC26800F14D01 /* ArtemisUITests.swift */,
86+
51F1B22B2C0CC2D700F14D01 /* SnapshotHelper.swift */,
87+
);
88+
path = ArtemisUITests;
89+
sourceTree = "<group>";
90+
};
6091
7555FF72242A565900829871 = {
6192
isa = PBXGroup;
6293
children = (
6394
D51AD00C299E390700FA5B94 /* Artemis.entitlements */,
6495
A1C7E0A92B03754200804542 /* ArtemisKit */,
6596
7555FF7D242A565900829871 /* Artemis */,
97+
51F1B2212C0CC26800F14D01 /* ArtemisUITests */,
6698
7555FF7C242A565900829871 /* Products */,
6799
22B6A91C292D785600F08C7E /* Frameworks */,
68100
);
@@ -72,6 +104,7 @@
72104
isa = PBXGroup;
73105
children = (
74106
7555FF7B242A565900829871 /* Artemis.app */,
107+
51F1B2202C0CC26800F14D01 /* ArtemisUITests.xctest */,
75108
);
76109
name = Products;
77110
sourceTree = "<group>";
@@ -105,6 +138,26 @@
105138
/* End PBXGroup section */
106139

107140
/* Begin PBXNativeTarget section */
141+
51F1B21F2C0CC26800F14D01 /* ArtemisUITests */ = {
142+
isa = PBXNativeTarget;
143+
buildConfigurationList = 51F1B22A2C0CC26800F14D01 /* Build configuration list for PBXNativeTarget "ArtemisUITests" */;
144+
buildPhases = (
145+
51F1B21C2C0CC26800F14D01 /* Sources */,
146+
51F1B21D2C0CC26800F14D01 /* Frameworks */,
147+
51F1B21E2C0CC26800F14D01 /* Resources */,
148+
);
149+
buildRules = (
150+
);
151+
dependencies = (
152+
51F1B2272C0CC26800F14D01 /* PBXTargetDependency */,
153+
);
154+
name = ArtemisUITests;
155+
packageProductDependencies = (
156+
);
157+
productName = ArtemisUITests;
158+
productReference = 51F1B2202C0CC26800F14D01 /* ArtemisUITests.xctest */;
159+
productType = "com.apple.product-type.bundle.ui-testing";
160+
};
108161
7555FF7A242A565900829871 /* Artemis */ = {
109162
isa = PBXNativeTarget;
110163
buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "Artemis" */;
@@ -133,10 +186,14 @@
133186
isa = PBXProject;
134187
attributes = {
135188
BuildIndependentTargetsInParallel = YES;
136-
LastSwiftUpdateCheck = 1130;
189+
LastSwiftUpdateCheck = 1520;
137190
LastUpgradeCheck = 1500;
138191
ORGANIZATIONNAME = orgName;
139192
TargetAttributes = {
193+
51F1B21F2C0CC26800F14D01 = {
194+
CreatedOnToolsVersion = 15.2;
195+
TestTargetID = 7555FF7A242A565900829871;
196+
};
140197
7555FF7A242A565900829871 = {
141198
CreatedOnToolsVersion = 11.3.1;
142199
};
@@ -158,11 +215,19 @@
158215
projectRoot = "";
159216
targets = (
160217
7555FF7A242A565900829871 /* Artemis */,
218+
51F1B21F2C0CC26800F14D01 /* ArtemisUITests */,
161219
);
162220
};
163221
/* End PBXProject section */
164222

165223
/* Begin PBXResourcesBuildPhase section */
224+
51F1B21E2C0CC26800F14D01 /* Resources */ = {
225+
isa = PBXResourcesBuildPhase;
226+
buildActionMask = 2147483647;
227+
files = (
228+
);
229+
runOnlyForDeploymentPostprocessing = 0;
230+
};
166231
7555FF79242A565900829871 /* Resources */ = {
167232
isa = PBXResourcesBuildPhase;
168233
buildActionMask = 2147483647;
@@ -195,6 +260,15 @@
195260
/* End PBXShellScriptBuildPhase section */
196261

197262
/* Begin PBXSourcesBuildPhase section */
263+
51F1B21C2C0CC26800F14D01 /* Sources */ = {
264+
isa = PBXSourcesBuildPhase;
265+
buildActionMask = 2147483647;
266+
files = (
267+
51F1B2252C0CC26800F14D01 /* ArtemisUITests.swift in Sources */,
268+
51F1B22C2C0CC2D700F14D01 /* SnapshotHelper.swift in Sources */,
269+
);
270+
runOnlyForDeploymentPostprocessing = 0;
271+
};
198272
7555FF77242A565900829871 /* Sources */ = {
199273
isa = PBXSourcesBuildPhase;
200274
buildActionMask = 2147483647;
@@ -205,7 +279,59 @@
205279
};
206280
/* End PBXSourcesBuildPhase section */
207281

282+
/* Begin PBXTargetDependency section */
283+
51F1B2272C0CC26800F14D01 /* PBXTargetDependency */ = {
284+
isa = PBXTargetDependency;
285+
target = 7555FF7A242A565900829871 /* Artemis */;
286+
targetProxy = 51F1B2262C0CC26800F14D01 /* PBXContainerItemProxy */;
287+
};
288+
/* End PBXTargetDependency section */
289+
208290
/* Begin XCBuildConfiguration section */
291+
51F1B2282C0CC26800F14D01 /* Debug */ = {
292+
isa = XCBuildConfiguration;
293+
buildSettings = {
294+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
295+
CODE_SIGN_STYLE = Automatic;
296+
CURRENT_PROJECT_VERSION = 1;
297+
DEBUG_INFORMATION_FORMAT = dwarf;
298+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
299+
GCC_C_LANGUAGE_STANDARD = gnu17;
300+
GENERATE_INFOPLIST_FILE = YES;
301+
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
302+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
303+
MARKETING_VERSION = 1.0;
304+
PRODUCT_BUNDLE_IDENTIFIER = de.tum.cit.artemis.ArtemisUITests;
305+
PRODUCT_NAME = "$(TARGET_NAME)";
306+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)";
307+
SWIFT_EMIT_LOC_STRINGS = NO;
308+
SWIFT_VERSION = 5.0;
309+
TARGETED_DEVICE_FAMILY = "1,2";
310+
TEST_TARGET_NAME = Artemis;
311+
};
312+
name = Debug;
313+
};
314+
51F1B2292C0CC26800F14D01 /* Release */ = {
315+
isa = XCBuildConfiguration;
316+
buildSettings = {
317+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
318+
CODE_SIGN_STYLE = Automatic;
319+
CURRENT_PROJECT_VERSION = 1;
320+
ENABLE_USER_SCRIPT_SANDBOXING = YES;
321+
GCC_C_LANGUAGE_STANDARD = gnu17;
322+
GENERATE_INFOPLIST_FILE = YES;
323+
IPHONEOS_DEPLOYMENT_TARGET = 17.2;
324+
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
325+
MARKETING_VERSION = 1.0;
326+
PRODUCT_BUNDLE_IDENTIFIER = de.tum.cit.artemis.ArtemisUITests;
327+
PRODUCT_NAME = "$(TARGET_NAME)";
328+
SWIFT_EMIT_LOC_STRINGS = NO;
329+
SWIFT_VERSION = 5.0;
330+
TARGETED_DEVICE_FAMILY = "1,2";
331+
TEST_TARGET_NAME = Artemis;
332+
};
333+
name = Release;
334+
};
209335
7555FFA3242A565B00829871 /* Debug */ = {
210336
isa = XCBuildConfiguration;
211337
buildSettings = {
@@ -385,6 +511,15 @@
385511
/* End XCBuildConfiguration section */
386512

387513
/* Begin XCConfigurationList section */
514+
51F1B22A2C0CC26800F14D01 /* Build configuration list for PBXNativeTarget "ArtemisUITests" */ = {
515+
isa = XCConfigurationList;
516+
buildConfigurations = (
517+
51F1B2282C0CC26800F14D01 /* Debug */,
518+
51F1B2292C0CC26800F14D01 /* Release */,
519+
);
520+
defaultConfigurationIsVisible = 0;
521+
defaultConfigurationName = Debug;
522+
};
388523
7555FF76242A565900829871 /* Build configuration list for PBXProject "Artemis" */ = {
389524
isa = XCConfigurationList;
390525
buildConfigurations = (

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

Lines changed: 6 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Artemis.xcodeproj/xcshareddata/xcschemes/Artemis.xcscheme‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,17 @@
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
31+
<TestableReference
32+
skipped = "NO"
33+
parallelizable = "YES">
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "51F1B21F2C0CC26800F14D01"
37+
BuildableName = "ArtemisUITests.xctest"
38+
BlueprintName = "ArtemisUITests"
39+
ReferencedContainer = "container:Artemis.xcodeproj">
40+
</BuildableReference>
41+
</TestableReference>
3142
</Testables>
3243
</TestAction>
3344
<LaunchAction

‎Artemis.xcodeproj/xcshareddata/xcschemes/ArtemisUITests.xcscheme‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1520"
4+
version = "1.7">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
</BuildAction>
9+
<TestAction
10+
buildConfiguration = "Debug"
11+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
12+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
shouldUseLaunchSchemeArgsEnv = "YES"
14+
shouldAutocreateTestPlan = "YES">
15+
<Testables>
16+
<TestableReference
17+
skipped = "NO"
18+
parallelizable = "YES">
19+
<BuildableReference
20+
BuildableIdentifier = "primary"
21+
BlueprintIdentifier = "51F1B21F2C0CC26800F14D01"
22+
BuildableName = "ArtemisUITests.xctest"
23+
BlueprintName = "ArtemisUITests"
24+
ReferencedContainer = "container:Artemis.xcodeproj">
25+
</BuildableReference>
26+
</TestableReference>
27+
</Testables>
28+
</TestAction>
29+
<LaunchAction
30+
buildConfiguration = "Debug"
31+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
32+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
33+
launchStyle = "0"
34+
useCustomWorkingDirectory = "NO"
35+
ignoresPersistentStateOnLaunch = "NO"
36+
debugDocumentVersioning = "YES"
37+
debugServiceExtension = "internal"
38+
allowLocationSimulation = "YES">
39+
</LaunchAction>
40+
<ProfileAction
41+
buildConfiguration = "Release"
42+
shouldUseLaunchSchemeArgsEnv = "YES"
43+
savedToolIdentifier = ""
44+
useCustomWorkingDirectory = "NO"
45+
debugDocumentVersioning = "YES">
46+
</ProfileAction>
47+
<AnalyzeAction
48+
buildConfiguration = "Debug">
49+
</AnalyzeAction>
50+
<ArchiveAction
51+
buildConfiguration = "Release"
52+
revealArchiveInOrganizer = "YES">
53+
</ArchiveAction>
54+
</Scheme>

‎Artemis/Supporting/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<key>CFBundlePackageType</key>
2222
<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
2323
<key>CFBundleShortVersionString</key>
24-
<string>1.0</string>
24+
<string>1.1.0</string>
2525
<key>CFBundleVersion</key>
2626
<string>1</string>
2727
<key>LSRequiresIPhoneOS</key>

‎ArtemisKit/Package.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ let package = Package(
2222
.package(url: "https://github.com/daltoniam/Starscream.git", exact: "4.0.4"),
2323
.package(url: "https://github.com/Kelvas09/EmojiPicker.git", from: "1.0.0"),
2424
.package(url: "https://github.com/ls1intum/apollon-ios-module", .upToNextMajor(from: "1.0.2")),
25-
.package(url: "https://github.com/ls1intum/artemis-ios-core-modules", .upToNextMajor(from: "11.0.0")),
25+
.package(url: "https://github.com/ls1intum/artemis-ios-core-modules", .upToNextMajor(from: "13.2.0")),
2626
.package(url: "https://github.com/mac-cain13/R.swift.git", from: "7.0.0")
2727
],
2828
targets: [

‎ArtemisKit/Sources/ArtemisKit/AppDelegate.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extension AppDelegate: UNUserNotificationCenterDelegate {
4646
}
4747

4848
public func application(_ application: UIApplication, didFailToRegisterForRemoteNotificationsWithError error: Error) {
49-
UserSession.shared.saveNotificationDeviceConfiguration(token: nil, encryptionKey: nil, skippedNotifications: true)
49+
UserSessionFactory.shared.saveNotificationDeviceConfiguration(token: nil, encryptionKey: nil, skippedNotifications: true)
5050
log.error("Did Fail To Register For Remote Notifications With Error: \(error)")
5151
}
5252

‎ArtemisKit/Sources/ArtemisKit/RootViewModel.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class RootViewModel: ObservableObject {
2727
private var cancellable: Set<AnyCancellable> = Set()
2828

2929
init(
30-
userSession: UserSession = .shared,
30+
userSession: UserSession = UserSessionFactory.shared,
3131
accountService: AccountService = AccountServiceFactory.shared
3232
) {
3333
self.userSession = userSession

0 commit comments

Comments
 (0)