From 68f0301d8648ac52a5d78081e78ef62212e32159 Mon Sep 17 00:00:00 2001
From: Nityananda Zbil <nityananda.zbil@tum.de>
Date: Thu, 24 Aug 2023 18:49:48 +0200
Subject: [PATCH 1/5] Add instance contact button

---
 .../Views/AccountNavigationBarMenuView.swift       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Sources/Account/Views/AccountNavigationBarMenuView.swift b/Sources/Account/Views/AccountNavigationBarMenuView.swift
index 0437085..828393f 100644
--- a/Sources/Account/Views/AccountNavigationBarMenuView.swift
+++ b/Sources/Account/Views/AccountNavigationBarMenuView.swift
@@ -27,9 +27,8 @@ struct AccountNavigationBarMenuView: View {
                     showProfile = true
                 }, label: {
                     HStack {
-                        Image(systemName: "person.fill")
                         Text(account.login)
-                        Spacer()
+                        Image(systemName: "person.fill")
                     }
                 })
             }
@@ -38,12 +37,19 @@ struct AccountNavigationBarMenuView: View {
                     showNotificationSettings = true
                 }, label: {
                     HStack {
-                        Image(systemName: "gearshape.fill")
                         Text(R.string.localizable.notificationSettingsLabel())
-                        Spacer()
+                        Image(systemName: "gearshape.fill")
                     }
                 })
             }
+            Button {
+                //
+            } label: {
+                HStack {
+                    Text("Instance Contact")
+                    Image(systemName: "info.bubble.fill")
+                }
+            }
             Button(R.string.localizable.logoutLabel()) {
                 viewModel.logout()
             }

From af5fa497582b7f8068337cfed276b5f9fff52035 Mon Sep 17 00:00:00 2001
From: Nityananda Zbil <nityananda.zbil@tum.de>
Date: Fri, 8 Sep 2023 01:03:58 +0200
Subject: [PATCH 2/5] Add code of conduct

---
 Sources/SharedModels/Course.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/SharedModels/Course.swift b/Sources/SharedModels/Course.swift
index 412dff0..07b9eb5 100644
--- a/Sources/SharedModels/Course.swift
+++ b/Sources/SharedModels/Course.swift
@@ -21,6 +21,7 @@ public struct Course: Codable, Identifiable {
     public var lectures: [Lecture]?
     public var accuracyOfScores: Int?
     public var courseInformationSharingConfiguration: CourseInformationSharingConfiguration
+    public var courseInformationSharingMessagingCodeOfConduct: String? = ""
     public var instructorGroupName: String?
     public var editorGroupName: String?
     public var teachingAssistantGroupName: String?

From ca0d88c30d96c134db927cd2c5d11a0d38cc139c Mon Sep 17 00:00:00 2001
From: Nityananda Zbil <nityananda.zbil@tum.de>
Date: Thu, 21 Sep 2023 20:58:41 +0200
Subject: [PATCH 3/5] Revert "Add instance contact button"

This reverts commit 68f0301d8648ac52a5d78081e78ef62212e32159.
---
 .../Views/AccountNavigationBarMenuView.swift       | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/Sources/Account/Views/AccountNavigationBarMenuView.swift b/Sources/Account/Views/AccountNavigationBarMenuView.swift
index 828393f..0437085 100644
--- a/Sources/Account/Views/AccountNavigationBarMenuView.swift
+++ b/Sources/Account/Views/AccountNavigationBarMenuView.swift
@@ -27,8 +27,9 @@ struct AccountNavigationBarMenuView: View {
                     showProfile = true
                 }, label: {
                     HStack {
-                        Text(account.login)
                         Image(systemName: "person.fill")
+                        Text(account.login)
+                        Spacer()
                     }
                 })
             }
@@ -37,19 +38,12 @@ struct AccountNavigationBarMenuView: View {
                     showNotificationSettings = true
                 }, label: {
                     HStack {
-                        Text(R.string.localizable.notificationSettingsLabel())
                         Image(systemName: "gearshape.fill")
+                        Text(R.string.localizable.notificationSettingsLabel())
+                        Spacer()
                     }
                 })
             }
-            Button {
-                //
-            } label: {
-                HStack {
-                    Text("Instance Contact")
-                    Image(systemName: "info.bubble.fill")
-                }
-            }
             Button(R.string.localizable.logoutLabel()) {
                 viewModel.logout()
             }

From 7dceb52c0b061d0403318b59807115b410e8bd2c Mon Sep 17 00:00:00 2001
From: Nityananda Zbil <nityananda.zbil@tum.de>
Date: Thu, 21 Sep 2023 21:07:17 +0200
Subject: [PATCH 4/5] Propose version 3.5.0

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2a6b877..104c890 100644
--- a/README.md
+++ b/README.md
@@ -36,7 +36,7 @@ In Project Settings, on the tab "Package Dependencies", click "+" and add <https
 1. Add a dependency in Package.swift:
 ```swift
 dependencies: [
-    .package(url: "https://github.com/ls1intum/artemis-ios-core-modules", .upToNextMajor(from: "2.3.6")),
+    .package(url: "https://github.com/ls1intum/artemis-ios-core-modules", .upToNextMajor(from: "3.5.0")),
 ]
 ```
 
@@ -118,4 +118,4 @@ A navigation bar menu, integrated across all clients, facilitates the detail vie
 The Push Notifications subsystem manages all aspects related to push notifications.
 It encompasses the push notification setup user interface and the notification settings interface.
 Further, it includes handlers for the decryption and deep-linking of notifications.
-The User Session Store securely stores encryption keys. Currently, the `App` exclusively utilizes this subsystem.
\ No newline at end of file
+The User Session Store securely stores encryption keys. Currently, the `App` exclusively utilizes this subsystem.

From 27f16407ccdbb558aa50b29ba12c70757ac8addc Mon Sep 17 00:00:00 2001
From: Nityananda Zbil <nityananda.zbil@tum.de>
Date: Thu, 21 Sep 2023 21:25:01 +0200
Subject: [PATCH 5/5] Add keyboard type

---
 Sources/Login/Views/InstitutionSelectionView.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Sources/Login/Views/InstitutionSelectionView.swift b/Sources/Login/Views/InstitutionSelectionView.swift
index f2c89e9..c7b119d 100644
--- a/Sources/Login/Views/InstitutionSelectionView.swift
+++ b/Sources/Login/Views/InstitutionSelectionView.swift
@@ -73,6 +73,7 @@ private struct CustomInstanceCell: View {
 
             TextField(R.string.localizable.account_select_artemis_instance_custom_instance(), text: $customUrl)
                 .textFieldStyle(ArtemisTextField())
+                .keyboardType(.URL)
                 .background(Color.gray.opacity(0.2))
             Button(R.string.localizable.select()) {
                 guard let url = URL(string: customUrl) else {