From 2211abd1002d8f2e1b6014368a8501751d744e19 Mon Sep 17 00:00:00 2001 From: David Huh <38101884+qt1337@users.noreply.github.com> Date: Sun, 7 Feb 2021 15:49:02 +0100 Subject: [PATCH] :lipstick: Changed UI/UX a bit --- .../l10n/de.lproj/HomeView.strings | 1 + .../l10n/en.lproj/HomeView.strings | 1 + DHBW-Service/Views/Tabs/HomeView.swift | 23 +++++++++++++++---- 3 files changed, 21 insertions(+), 4 deletions(-) diff --git a/DHBW-Service/Supporting Files/l10n/de.lproj/HomeView.strings b/DHBW-Service/Supporting Files/l10n/de.lproj/HomeView.strings index 91b8b10..48b54fc 100644 --- a/DHBW-Service/Supporting Files/l10n/de.lproj/HomeView.strings +++ b/DHBW-Service/Supporting Files/l10n/de.lproj/HomeView.strings @@ -6,6 +6,7 @@ */ +"hey" = "Hey 👋🏻"; "today" = "Heute"; "tomorrow" = "Morgen"; "upcomingExams" = "Nächste Klausuren"; diff --git a/DHBW-Service/Supporting Files/l10n/en.lproj/HomeView.strings b/DHBW-Service/Supporting Files/l10n/en.lproj/HomeView.strings index 30c1289..0b25092 100644 --- a/DHBW-Service/Supporting Files/l10n/en.lproj/HomeView.strings +++ b/DHBW-Service/Supporting Files/l10n/en.lproj/HomeView.strings @@ -6,6 +6,7 @@ */ +"hey" = "Hey 👋🏻"; "today" = "Today"; "tomorrow" = "Tomorrow"; "upcomingExams" = "Upcoming exams"; diff --git a/DHBW-Service/Views/Tabs/HomeView.swift b/DHBW-Service/Views/Tabs/HomeView.swift index 5449f90..fef94e9 100644 --- a/DHBW-Service/Views/Tabs/HomeView.swift +++ b/DHBW-Service/Views/Tabs/HomeView.swift @@ -21,9 +21,23 @@ struct HomeView: View { NavigationView { VStack { HStack { - Text("name".localized(tableName: "General", plural: false) + ": ") - Text(self.name) + Spacer() + VStack { + Text("hey".localized(tableName: "HomeView", plural: false)) + .font(.title3) + .frame(maxWidth: .infinity, alignment: .leading) + Text(self.name) + .bold() + .frame(maxWidth: .infinity, alignment: .leading) + } + .padding() + .background( + RoundedRectangle(cornerRadius: 10) + .fill(Color.gray) + ) + Spacer() } + Spacer() HStack { Text("course".localized(tableName: "General", plural: false) + ": ") Text(self.course) @@ -43,7 +57,7 @@ struct HomeView: View { VStack { Text("today".localized(tableName: "HomeView")) - .font(/*@START_MENU_TOKEN@*/.title/*@END_MENU_TOKEN@*/) + .font(.title) .frame(maxWidth: .infinity, alignment: .leading) VStack { if(!todaysEvents.isEmpty){ @@ -65,7 +79,7 @@ struct HomeView: View { VStack { Text("tomorrow".localized(tableName: "HomeView")) - .font(/*@START_MENU_TOKEN@*/.title/*@END_MENU_TOKEN@*/) + .font(.title) .frame(maxWidth: .infinity, alignment: .leading) VStack { if(!tomorrowsEvents.isEmpty){ @@ -120,6 +134,7 @@ struct HomeView: View { Spacer() } + Spacer() } .navigationBarTitle(Text("Home")) }