admin/Reflect
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

less rounded corners on UI

Browse Source
This commit is contained in:
Trey t
2022-02-04 17:09:15 -06:00
parent bcfa63e914
commit b4636ebd2b
6 changed files with 29 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Shared/views/AddMoodHeaderView.swift
View File

@@ -49,7 +49,7 @@ struct AddMoodHeaderView: View {
.background( .background(
Color(theme.secondaryBGColor) Color(theme.secondaryBGColor)
) )
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
.frame(minHeight: 88, maxHeight: 150) .frame(minHeight: 88, maxHeight: 150)
.frame(minWidth: 0, maxWidth: .infinity) .frame(minWidth: 0, maxWidth: .infinity)
} }

4
Shared/views/ContentView.swift
View File

@@ -307,7 +307,7 @@ struct ContentView: View {
} }
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
.padding() .padding()
} }
@@ -331,7 +331,7 @@ struct ContentView: View {
.background( .background(
Color(theme.secondaryBGColor) Color(theme.secondaryBGColor)
) )
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
.padding() .padding()
.padding([.top, .bottom], 5) .padding([.top, .bottom], 5)

18
Shared/views/FilterView.swift
View File

@@ -49,7 +49,7 @@ struct FilterView: View {
statsView statsView
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 120, maxHeight: 120) .frame(minWidth: 0, maxWidth: .infinity, minHeight: 120, maxHeight: 120)
.cornerRadius(25) .cornerRadius(10)
.padding([.leading, .trailing]) .padding([.leading, .trailing])
Text(String(localized: "filter_view_total") + ": \(self.viewModel.numberOfRatings)") Text(String(localized: "filter_view_total") + ": \(self.viewModel.numberOfRatings)")
@@ -81,7 +81,7 @@ struct FilterView: View {
.frame(height: 44) .frame(height: 44)
.foregroundColor(Color(UIColor.label)) .foregroundColor(Color(UIColor.label))
.background(Color(theme.secondaryBGColor)) .background(Color(theme.secondaryBGColor))
.cornerRadius(25) .cornerRadius(10)
}).frame(maxWidth: .infinity) }).frame(maxWidth: .infinity)
} }
@@ -112,7 +112,7 @@ struct FilterView: View {
} }
} }
} }
.cornerRadius(25) .cornerRadius(10)
.padding() .padding()
} }
@@ -131,7 +131,7 @@ struct FilterView: View {
.padding() .padding()
} }
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44) .frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44)
.cornerRadius(25) .cornerRadius(10)
.padding([.leading, .trailing]) .padding([.leading, .trailing])
ZStack { ZStack {
@@ -146,7 +146,7 @@ struct FilterView: View {
.padding() .padding()
} }
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44) .frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44)
.cornerRadius(25) .cornerRadius(10)
.padding([.leading, .trailing]) .padding([.leading, .trailing])
ZStack { ZStack {
@@ -173,7 +173,7 @@ struct FilterView: View {
} }
} }
.frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44) .frame(minWidth: 0, maxWidth: .infinity, minHeight: 44, maxHeight: 44)
.cornerRadius(25) .cornerRadius(10)
.padding([ .leading, .trailing]) .padding([ .leading, .trailing])
} }
filterButon filterButon
@@ -193,7 +193,7 @@ struct FilterView: View {
private var gridView: some View { private var gridView: some View {
VStack { VStack {
monthsHeader monthsHeader
.cornerRadius(25) .cornerRadius(10)
.padding([.leading, .trailing]) .padding([.leading, .trailing])
VStack { VStack {
@@ -206,7 +206,7 @@ struct FilterView: View {
.background( .background(
Color(theme.secondaryBGColor) Color(theme.secondaryBGColor)
) )
.cornerRadius(25) .cornerRadius(10)
} }
} }
.simultaneousGesture(DragGesture().onChanged({ _ in .simultaneousGesture(DragGesture().onChanged({ _ in
@@ -235,7 +235,7 @@ struct FilterView: View {
} }
.padding([.leading, .trailing, .top, .bottom]) .padding([.leading, .trailing, .top, .bottom])
} }
.cornerRadius(25) .cornerRadius(10)
} }
} }

10
Shared/views/GraphView.swift
View File

@@ -27,7 +27,7 @@ struct GraphView: View {
BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10))) BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10)))
]) ])
} }
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
.padding() .padding()
ZStack { ZStack {
@@ -40,7 +40,7 @@ struct GraphView: View {
BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10))) BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10)))
]) ])
} }
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
.padding() .padding()
} }
@@ -53,7 +53,8 @@ struct GraphView: View {
BarChartDataEntry(x: 4, y: Double(Int.random(in: 0...10))), BarChartDataEntry(x: 4, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10))) BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10)))
]) ])
}.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) }
.cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
.padding() .padding()
ZStack { ZStack {
@@ -65,7 +66,8 @@ struct GraphView: View {
BarChartDataEntry(x: 4, y: Double(Int.random(in: 0...10))), BarChartDataEntry(x: 4, y: Double(Int.random(in: 0...10))),
BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10))) BarChartDataEntry(x: 5, y: Double(Int.random(in: 0...10)))
]) ])
}.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) }
.cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
.padding() .padding()
} }
} }

20
Shared/views/SettingsView.swift
View File

@@ -95,7 +95,7 @@ struct SettingsView: View {
} }
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
} }
private var addTestDataCell: some View { private var addTestDataCell: some View {
@@ -110,7 +110,7 @@ struct SettingsView: View {
.padding() .padding()
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
} }
private var clearDB: some View { private var clearDB: some View {
@@ -125,7 +125,7 @@ struct SettingsView: View {
.padding() .padding()
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
} }
private var whyBackgroundMode: some View { private var whyBackgroundMode: some View {
@@ -147,7 +147,7 @@ struct SettingsView: View {
} }
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
} }
let iconSets: [(String,String)] = [ let iconSets: [(String,String)] = [
@@ -189,7 +189,7 @@ struct SettingsView: View {
} }
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
} }
private var showOnboardingButton: some View { private var showOnboardingButton: some View {
@@ -203,7 +203,7 @@ struct SettingsView: View {
.padding() .padding()
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
} }
private var cloudKitEnable: some View { private var cloudKitEnable: some View {
@@ -221,7 +221,7 @@ struct SettingsView: View {
.padding(.bottom) .padding(.bottom)
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
} }
private var cloudKitStatus: some View { private var cloudKitStatus: some View {
@@ -235,7 +235,7 @@ struct SettingsView: View {
.padding() .padding()
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
} }
private var canDelete: some View { private var canDelete: some View {
@@ -248,7 +248,7 @@ struct SettingsView: View {
} }
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
} }
private var themePicker: some View { private var themePicker: some View {
@@ -276,7 +276,7 @@ struct SettingsView: View {
.padding() .padding()
} }
.fixedSize(horizontal: false, vertical: true) .fixedSize(horizontal: false, vertical: true)
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous)) .cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
} }
} }

2
Shared/views/SwitchableView.swift
View File

@@ -50,8 +50,8 @@ struct SwitchableView: View {
.background( .background(
Color(theme.secondaryBGColor) Color(theme.secondaryBGColor)
) )
.clipShape(RoundedRectangle(cornerRadius: 25, style: .continuous))
.contentShape(Rectangle()) .contentShape(Rectangle())
.cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
.padding(.bottom, 30) .padding(.bottom, 30)
.onTapGesture { .onTapGesture {
currentViewIdx += 1 currentViewIdx += 1