mirror of
https://github.com/Mueller-Patrick/DHBW-Service-App.git
synced 2024-11-22 17:33:57 +00:00
Merge pull request #7 from Mueller-Patrick/colorextension
💄 Added a Color Extension with some rgb color codes for ligh…
This commit is contained in:
commit
be3582c19e
|
@ -7,6 +7,7 @@
|
||||||
objects = {
|
objects = {
|
||||||
|
|
||||||
/* Begin PBXBuildFile section */
|
/* 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 */; };
|
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 */; };
|
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 */; };
|
CD2FC0C625A869FE00963178 /* dhbw-standard-icon@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = CD2FC0C125A869FE00963178 /* dhbw-standard-icon@3x.png */; };
|
||||||
|
@ -61,6 +62,7 @@
|
||||||
/* End PBXContainerItemProxy section */
|
/* End PBXContainerItemProxy section */
|
||||||
|
|
||||||
/* Begin PBXFileReference section */
|
/* Begin PBXFileReference section */
|
||||||
|
42560F9F264AB7E40062053B /* ColorExtension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ColorExtension.swift; sourceTree = "<group>"; };
|
||||||
CD17FAD125C9F93B0088D700 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/HomeView.strings; sourceTree = "<group>"; };
|
CD17FAD125C9F93B0088D700 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/HomeView.strings; sourceTree = "<group>"; };
|
||||||
CD17FAD625C9F9440088D700 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HomeView.strings; sourceTree = "<group>"; };
|
CD17FAD625C9F9440088D700 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/HomeView.strings; sourceTree = "<group>"; };
|
||||||
CD2FC0C025A869FE00963178 /* dhbw-standard-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "dhbw-standard-icon@2x.png"; sourceTree = "<group>"; };
|
CD2FC0C025A869FE00963178 /* dhbw-standard-icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "dhbw-standard-icon@2x.png"; sourceTree = "<group>"; };
|
||||||
|
@ -322,6 +324,7 @@
|
||||||
CD8555BD25C47AE500C4ACD6 /* RaPlaFetcher.swift */,
|
CD8555BD25C47AE500C4ACD6 /* RaPlaFetcher.swift */,
|
||||||
CD8555C225C47B5300C4ACD6 /* ApiService.swift */,
|
CD8555C225C47B5300C4ACD6 /* ApiService.swift */,
|
||||||
CDB1E946261DDA0200EDE9EB /* DateExtension.swift */,
|
CDB1E946261DDA0200EDE9EB /* DateExtension.swift */,
|
||||||
|
42560F9F264AB7E40062053B /* ColorExtension.swift */,
|
||||||
);
|
);
|
||||||
path = Utility;
|
path = Utility;
|
||||||
sourceTree = "<group>";
|
sourceTree = "<group>";
|
||||||
|
@ -477,6 +480,7 @@
|
||||||
CDDCF4842592028A0027CDC5 /* Localizer.swift in Sources */,
|
CDDCF4842592028A0027CDC5 /* Localizer.swift in Sources */,
|
||||||
CDD970DF25D453D90061755E /* Lecturer+CoreDataClass.swift in Sources */,
|
CDD970DF25D453D90061755E /* Lecturer+CoreDataClass.swift in Sources */,
|
||||||
CDCD7230259135C500FBF2F5 /* FirstOpeningSettings.swift in Sources */,
|
CDCD7230259135C500FBF2F5 /* FirstOpeningSettings.swift in Sources */,
|
||||||
|
42560FA0264AB7E40062053B /* ColorExtension.swift in Sources */,
|
||||||
CDA1CBB025D4591000DB2AE5 /* Lecturer+CoreDataProperties.swift in Sources */,
|
CDA1CBB025D4591000DB2AE5 /* Lecturer+CoreDataProperties.swift in Sources */,
|
||||||
CD9FAB8A258EC60600D6D0C5 /* Persistence.swift in Sources */,
|
CD9FAB8A258EC60600D6D0C5 /* Persistence.swift in Sources */,
|
||||||
CD730A35259A860E00E0BB69 /* SettingsAcknowledgements.swift in Sources */,
|
CD730A35259A860E00E0BB69 /* SettingsAcknowledgements.swift in Sources */,
|
||||||
|
|
18
DHBW-Service/Utility/ColorExtension.swift
Normal file
18
DHBW-Service/Utility/ColorExtension.swift
Normal file
|
@ -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)
|
||||||
|
}
|
|
@ -33,7 +33,7 @@ struct HomeView: View {
|
||||||
.padding()
|
.padding()
|
||||||
.background(
|
.background(
|
||||||
RoundedRectangle(cornerRadius: 10)
|
RoundedRectangle(cornerRadius: 10)
|
||||||
.fill(Color.gray)
|
.fill(Color.darkModePrimaryColor)
|
||||||
)
|
)
|
||||||
Spacer()
|
Spacer()
|
||||||
}
|
}
|
||||||
|
@ -41,7 +41,8 @@ struct HomeView: View {
|
||||||
Spacer()
|
Spacer()
|
||||||
VStack {
|
VStack {
|
||||||
Text("information".localized(tableName: "HomeView", plural: false))
|
Text("information".localized(tableName: "HomeView", plural: false))
|
||||||
.font(.title3)
|
.font(.headline)
|
||||||
|
.fontWeight(.semibold)
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
HStack {
|
HStack {
|
||||||
VStack(alignment: .leading) {
|
VStack(alignment: .leading) {
|
||||||
|
@ -59,7 +60,7 @@ struct HomeView: View {
|
||||||
.padding()
|
.padding()
|
||||||
.background(
|
.background(
|
||||||
RoundedRectangle(cornerRadius: 10)
|
RoundedRectangle(cornerRadius: 10)
|
||||||
.fill(Color.gray)
|
.fill(Color.darkModePrimaryColor)
|
||||||
)
|
)
|
||||||
Spacer()
|
Spacer()
|
||||||
}
|
}
|
||||||
|
@ -228,7 +229,8 @@ struct UpcomingLecturesBlock: View {
|
||||||
var body: some View {
|
var body: some View {
|
||||||
VStack {
|
VStack {
|
||||||
Text(titleKey.localized(tableName: "HomeView"))
|
Text(titleKey.localized(tableName: "HomeView"))
|
||||||
.font(.title)
|
.font(.title2)
|
||||||
|
.fontWeight(.semibold)
|
||||||
.frame(maxWidth: .infinity, alignment: .leading)
|
.frame(maxWidth: .infinity, alignment: .leading)
|
||||||
VStack {
|
VStack {
|
||||||
if(!eventsList.isEmpty){
|
if(!eventsList.isEmpty){
|
||||||
|
@ -245,7 +247,7 @@ struct UpcomingLecturesBlock: View {
|
||||||
.padding()
|
.padding()
|
||||||
.background(
|
.background(
|
||||||
RoundedRectangle(cornerRadius: 10)
|
RoundedRectangle(cornerRadius: 10)
|
||||||
.fill(Color.gray)
|
.fill(Color.darkModePrimaryColor)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -274,11 +276,11 @@ struct UpcomingExamsBlock: View {
|
||||||
.padding()
|
.padding()
|
||||||
.background(
|
.background(
|
||||||
RoundedRectangle(cornerRadius: 10)
|
RoundedRectangle(cornerRadius: 10)
|
||||||
.fill(Color.gray)
|
.fill(Color.darkModePrimaryColor)
|
||||||
)
|
)
|
||||||
.overlay(
|
.overlay(
|
||||||
RoundedRectangle(cornerRadius: 10)
|
RoundedRectangle(cornerRadius: 10)
|
||||||
.stroke(Color.red, lineWidth: 4)
|
.stroke(Color("AccentColor"), lineWidth: 4)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user