look and feel

main
Laurent 3 years ago
parent 9d8db42edf
commit 0e388c6a21
  1. 6
      LeCountdown/Views/Countdown/CountdownDialView.swift
  2. 34
      LeCountdown/Views/DialView.swift
  3. 2
      LeCountdown/Views/Stopwatch/StopwatchDialView.swift
  4. 2
      LeCountdown/Views/TimersView.swift

@ -17,8 +17,12 @@ struct CountdownDialView: View {
HStack { HStack {
VStack(alignment: .leading) { VStack(alignment: .leading) {
Text(countdown.activity?.name?.uppercased() ?? "").multilineTextAlignment(.leading) Text(countdown.activity?.name?.uppercased() ?? "")
.foregroundColor(.black)
.multilineTextAlignment(.leading)
Text(countdown.duration.minuteSecond) Text(countdown.duration.minuteSecond)
.fontWeight(.semibold)
.foregroundColor(.accentColor)
} }
Spacer() Spacer()
} }

@ -24,10 +24,6 @@ struct DialView: View {
var body: some View { var body: some View {
ZStack { ZStack {
Image(self.timer.imageName)
.resizable()
.saturation(self.isEditingBinding.wrappedValue ? 0.0 : 1.0)
switch self.isEditingBinding.wrappedValue { switch self.isEditingBinding.wrappedValue {
case false: case false:
Button { Button {
@ -50,38 +46,12 @@ struct DialView: View {
Spacer() Spacer()
} }
} }
// VStack {
// Spacer()
// self._dialView().padding(.horizontal)
// Spacer()
// }
//
// HStack {
// Spacer()
// NavigationLink {
// self._editView(timer: timer, isPresented: $boringContext.isShowingNewData)
// } label: {
// Image(systemName: "gearshape.fill")
// .font(.system(size: 30.0))
// .padding(.horizontal)
// .foregroundColor(Color.accentColor)
// }
// }
} }
} }
.background(Color(white: 0.95))
.frame(width: frameSize, height: 80.0) .frame(width: frameSize, height: 80.0)
.cornerRadius(20.0) .cornerRadius(20.0)
// .alert("Make sure your device is not on silent mode", isPresented: $showSilentModeAlert) {
// Button("OK", role: .cancel) {
// self._launchTimer()
// }
// Button("Don't show this again", role: .destructive) {
// self._launchTimer()
// Preferences.hideSilentModeAlerts(true)
// }
// }
} }
@ViewBuilder @ViewBuilder
@ -102,7 +72,7 @@ struct DialView: View {
} }
} }
.monospaced() .monospaced()
.font(Font.system(size: 16.0, weight: .semibold)) .font(.system(size: 16.0))
.foregroundColor(Color.white) .foregroundColor(Color.white)
} }

@ -15,7 +15,7 @@ struct StopwatchDialView: View {
var body: some View { var body: some View {
HStack { HStack {
Text(stopwatch.activity?.name?.uppercased() ?? "") Text(stopwatch.activity?.name?.uppercased() ?? "").foregroundColor(.black)
Spacer() Spacer()
} }
} }

@ -27,7 +27,7 @@ struct TimersView: View {
GeometryReader { reader in GeometryReader { reader in
let columns: [GridItem] = self._columns() let columns: [GridItem] = self._columns()
let width: CGFloat = reader.size.width / CGFloat(columns.count) - 15.0 let width: CGFloat = reader.size.width / CGFloat(columns.count) - 5.0
let abstractTimers: [AbstractTimer] = Array(self.timers) let abstractTimers: [AbstractTimer] = Array(self.timers)
if abstractTimers.count > 0 { if abstractTimers.count > 0 {

Loading…
Cancel
Save