Paddy/DHBW-Service-App
1
0
Fork 0
mirror of https://github.com/Mueller-Patrick/DHBW-Service-App.git synced 2026-05-26 12:38:05 +00:00
Code Issues Projects Releases Wiki Activity

Compare commits

base: Paddy/DHBW-Service-App:543bd190eb44f354924cc9aaf0d821b2dbec4482
Branches Tags
Paddy/DHBW-Service-App:main Paddy/DHBW-Service-App:colorextension Paddy/DHBW-Service-App:coredata-refactor Paddy/DHBW-Service-App:ui-refactor
..
compare: Paddy/DHBW-Service-App:main
Branches Tags
Paddy/DHBW-Service-App:main Paddy/DHBW-Service-App:colorextension Paddy/DHBW-Service-App:coredata-refactor Paddy/DHBW-Service-App:ui-refactor

6 Commits
543bd190eb .. main

Author SHA1 Message Date
Paddy 600f4c9c76 💄 Refactoring color management and extending to all views 
- Thanks to @liza-kl for the color scheme <3
 2021-07-08 18:27:49 +02:00
Paddy c49c5186e1 Merge remote-tracking branch 'refs/remotes/origin/main' 2021-05-14 20:39:24 +02:00
Paddy 476e1caf9e 👥 Adding Lisa as contributor 2021-05-14 20:37:57 +02:00
Patrick 1431720850 Update README.md 2021-05-13 01:04:42 +02:00
Lisa be3582c19e Merge pull request #7 from Mueller-Patrick/colorextension 
💄 Added a Color Extension with some rgb color codes for ligh…
 2021-05-11 15:27:09 +02:00
li54 590e89fb1a 💄 Added a Color Extension with some rgb color codes for light and darkmode 2021-05-11 15:13:07 +02:00
10 changed files with 148 additions and 14 deletions
Expand all files Collapse all files
DHBW-Service.xcodeproj/project.pbxproj
+4
View File
@@ -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 = "<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>"; };
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 */,
CD8555C225C47B5300C4ACD6 /* ApiService.swift */,
CDB1E946261DDA0200EDE9EB /* DateExtension.swift */,
42560F9F264AB7E40062053B /* ColorExtension.swift */,
);
path = Utility;
sourceTree = "<group>";
@@ -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 */,
DHBW-Service/Supporting Files/Assets.xcassets/DarkColor.colorset/Contents.json
+38
View File
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "174",
"green" : "174",
"red" : "174"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0.153",
"green" : "0.125",
"red" : "0.063"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DHBW-Service/Supporting Files/Assets.xcassets/LightColor.colorset/Contents.json
+38
View File
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "255",
"green" : "255",
"red" : "255"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "123",
"green" : "114",
"red" : "98"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DHBW-Service/Supporting Files/Assets.xcassets/PrimaryColor.colorset/Contents.json
+38
View File
@@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "224",
"green" : "224",
"red" : "224"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "79",
"green" : "71",
"red" : "55"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
DHBW-Service/Utility/ColorExtension.swift
+13
View File
@@ -0,0 +1,13 @@
//
// ColorExtension.swift
// DHBW-Service
//
// Created by Lisa Kletsko on 11.05.21.
//
import SwiftUI
import Foundation
extension Color {
static let primaryColor = Color("PrimaryColor")
static let darkColor = Color("DarkColor")
static let lightColor = Color("LightColor")
}
DHBW-Service/Views/Tabs/HomeView.swift
+9 -7
View File
@@ -33,7 +33,7 @@ struct HomeView: View {
.padding()
.background(
RoundedRectangle(cornerRadius: 10)
.fill(Color.gray)
.fill(Color.primaryColor)
)
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.primaryColor)
)
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.primaryColor)
)
}
}
@@ -274,11 +276,11 @@ struct UpcomingExamsBlock: View {
.padding()
.background(
RoundedRectangle(cornerRadius: 10)
.fill(Color.gray)
.fill(Color.primaryColor)
)
.overlay(
RoundedRectangle(cornerRadius: 10)
.stroke(Color.red, lineWidth: 4)
.stroke(Color("AccentColor"), lineWidth: 4)
)
}
}
DHBW-Service/Views/Tabs/LecturePlanItem.swift
+2 -2
View File
@@ -54,7 +54,7 @@ struct LecturePlanItem: View {
}
}
.padding()
.foregroundColor(.white)
.foregroundColor(.primary)
.background(Color.blue)
.cornerRadius(15)
Spacer()
@@ -63,7 +63,7 @@ struct LecturePlanItem: View {
.padding()
.background(
RoundedRectangle(cornerRadius: 10)
.fill(Color.gray)
.fill(Color.primaryColor)
)
Spacer()
}
DHBW-Service/Views/Tabs/LecturePlanList.swift
+2 -2
View File
@@ -198,7 +198,7 @@ struct DayWithEventsBlock: View {
.padding()
.background(
RoundedRectangle(cornerRadius: 10)
.fill(Color(#colorLiteral(red: 0.2549019754, green: 0.2745098174, blue: 0.3019607961, alpha: 1)))
.fill(Color.darkColor)
)
}
// When an event gets updated from child view, reload it here as this will not trigger the onAppear() function
@@ -228,7 +228,7 @@ struct DayWithEventsBlock: View {
.padding()
.background(
RoundedRectangle(cornerRadius: 10)
.fill(Color.gray)
.fill(Color.primaryColor)
)
}
}
DHBW-Service/Views/Tabs/SettingsSubViews/SettingsAcknowledgements.swift
+3 -2
View File
@@ -13,8 +13,9 @@ struct SettingsAcknowledgements: View {
Text("contributors".localized(tableName: "General", plural: false))
.font(/*@START_MENU_TOKEN@*/.title/*@END_MENU_TOKEN@*/)
Spacer()
Text("David Huh")
Text("Patrick Müller")
Text("David Huh (davidhuh.de)")
Text("Lisa Kletsko (li54.de)")
Text("Patrick Müller (mueller-patrick.tech)")
Spacer()
}
}
README.md
+1 -1
View File
@@ -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.
<b>Disclaimer:</b> This project is not affiliated with the DHBW Karlsruhe