From 590e89fb1a30f482356d91b9c0c70e66b8bab250 Mon Sep 17 00:00:00 2001 From: liza-kl Date: Tue, 11 May 2021 15:13:07 +0200 Subject: [PATCH 1/2] :lipstick: Added a Color Extension with some rgb color codes for light and darkmode --- DHBW-Service.xcodeproj/project.pbxproj | 4 ++++ DHBW-Service/Utility/ColorExtension.swift | 18 ++++++++++++++++++ DHBW-Service/Views/Tabs/HomeView.swift | 16 +++++++++------- 3 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 DHBW-Service/Utility/ColorExtension.swift diff --git a/DHBW-Service.xcodeproj/project.pbxproj b/DHBW-Service.xcodeproj/project.pbxproj index 91e1546..db6da8b 100644 --- a/DHBW-Service.xcodeproj/project.pbxproj +++ b/DHBW-Service.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 42560FA0264AB7E40062053B /* ColorExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 42560F9F264AB7E40062053B /* ColorExtension.swift */; }; CD17FAD025C9F93B0088D700 /* HomeView.strings in Resources */ = {isa = PBXBuildFile; fileRef = CD17FAD225C9F93B0088D700 /* HomeView.strings */; }; CD2FC0C525A869FE00963178 /* dhbw-standard-icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CD2FC0C025A869FE00963178 /* dhbw-standard-icon@2x.png */; }; CD2FC0C625A869FE00963178 /* dhbw-standard-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = CD2FC0C125A869FE00963178 /* dhbw-standard-icon@3x.png */; }; @@ -61,6 +62,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 42560F9F264AB7E40062053B /* ColorExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorExtension.swift; sourceTree = ""; }; CD17FAD125C9F93B0088D700 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/HomeView.strings; sourceTree = ""; }; CD17FAD625C9F9440088D700 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HomeView.strings; sourceTree = ""; }; CD2FC0C025A869FE00963178 /* dhbw-standard-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "dhbw-standard-icon@2x.png"; sourceTree = ""; }; @@ -322,6 +324,7 @@ CD8555BD25C47AE500C4ACD6 /* RaPlaFetcher.swift */, CD8555C225C47B5300C4ACD6 /* ApiService.swift */, CDB1E946261DDA0200EDE9EB /* DateExtension.swift */, + 42560F9F264AB7E40062053B /* ColorExtension.swift */, ); path = Utility; sourceTree = ""; @@ -477,6 +480,7 @@ CDDCF4842592028A0027CDC5 /* Localizer.swift in Sources */, CDD970DF25D453D90061755E /* Lecturer+CoreDataClass.swift in Sources */, CDCD7230259135C500FBF2F5 /* FirstOpeningSettings.swift in Sources */, + 42560FA0264AB7E40062053B /* ColorExtension.swift in Sources */, CDA1CBB025D4591000DB2AE5 /* Lecturer+CoreDataProperties.swift in Sources */, CD9FAB8A258EC60600D6D0C5 /* Persistence.swift in Sources */, CD730A35259A860E00E0BB69 /* SettingsAcknowledgements.swift in Sources */, diff --git a/DHBW-Service/Utility/ColorExtension.swift b/DHBW-Service/Utility/ColorExtension.swift new file mode 100644 index 0000000..86cca87 --- /dev/null +++ b/DHBW-Service/Utility/ColorExtension.swift @@ -0,0 +1,18 @@ +// +// ColorExtension.swift +// DHBW-Service +// +// Created by Lisa Kletsko on 11.05.21. +// +import SwiftUI +import Foundation +extension Color { + // For Darkmode + static let darkModeDarkColor = Color(red: 16 / 255, green: 32 / 255, blue: 39 / 255) + static let darkModePrimaryColor = Color(red: 55 / 255, green: 71 / 255, blue: 79 / 255) + static let darkModeLightColor = Color(red: 98 / 255, green: 114 / 255, blue: 123 / 255) + // For Lightmode + static let lightkModeDarkColor = Color(red: 174 / 255, green: 174 / 255, blue: 174 / 255) + static let lightModePrimaryColor = Color(red: 224 / 255, green: 224 / 255, blue: 224 / 255) + static let lightModeLightColor = Color(red: 255 / 255, green: 255 / 255, blue: 255 / 255) +} diff --git a/DHBW-Service/Views/Tabs/HomeView.swift b/DHBW-Service/Views/Tabs/HomeView.swift index 2765e8d..facf4d1 100644 --- a/DHBW-Service/Views/Tabs/HomeView.swift +++ b/DHBW-Service/Views/Tabs/HomeView.swift @@ -33,7 +33,7 @@ struct HomeView: View { .padding() .background( RoundedRectangle(cornerRadius: 10) - .fill(Color.gray) + .fill(Color.darkModePrimaryColor) ) Spacer() } @@ -41,7 +41,8 @@ struct HomeView: View { Spacer() VStack { Text("information".localized(tableName: "HomeView", plural: false)) - .font(.title3) + .font(.headline) + .fontWeight(.semibold) .frame(maxWidth: .infinity, alignment: .leading) HStack { VStack(alignment: .leading) { @@ -59,7 +60,7 @@ struct HomeView: View { .padding() .background( RoundedRectangle(cornerRadius: 10) - .fill(Color.gray) + .fill(Color.darkModePrimaryColor) ) Spacer() } @@ -228,7 +229,8 @@ struct UpcomingLecturesBlock: View { var body: some View { VStack { Text(titleKey.localized(tableName: "HomeView")) - .font(.title) + .font(.title2) + .fontWeight(.semibold) .frame(maxWidth: .infinity, alignment: .leading) VStack { if(!eventsList.isEmpty){ @@ -245,7 +247,7 @@ struct UpcomingLecturesBlock: View { .padding() .background( RoundedRectangle(cornerRadius: 10) - .fill(Color.gray) + .fill(Color.darkModePrimaryColor) ) } } @@ -274,11 +276,11 @@ struct UpcomingExamsBlock: View { .padding() .background( RoundedRectangle(cornerRadius: 10) - .fill(Color.gray) + .fill(Color.darkModePrimaryColor) ) .overlay( RoundedRectangle(cornerRadius: 10) - .stroke(Color.red, lineWidth: 4) + .stroke(Color("AccentColor"), lineWidth: 4) ) } } From 14317208509704973bea19fdf5bb257481127431 Mon Sep 17 00:00:00 2001 From: Patrick <50352812+Mueller-Patrick@users.noreply.github.com> Date: Thu, 13 May 2021 01:04:42 +0200 Subject: [PATCH 2/2] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cedbc79..c6394c2 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # DHBW-Service-App ## Introduction -This is a project by two students of the Cooperative State University in Karlsruhe (DHBW Karlsruhe). +This is a project by three students of the Cooperative State University in Karlsruhe (DHBW Karlsruhe). The goal is to develop a native iOS app providing easy and straightforward access to services like RaPla, Dualis and the canteen plan. Disclaimer: This project is not affiliated with the DHBW Karlsruhe