Merge branch 'develop' into sharing
This commit is contained in:
@@ -212,7 +212,6 @@ struct ContentView: View {
|
|||||||
.contentShape(Rectangle())
|
.contentShape(Rectangle())
|
||||||
}
|
}
|
||||||
.tabViewStyle(.page)
|
.tabViewStyle(.page)
|
||||||
.padding([.trailing, .leading])
|
|
||||||
.onChange(of: switchableViewSelectedIndex) { value in
|
.onChange(of: switchableViewSelectedIndex) { value in
|
||||||
if value == 1 {
|
if value == 1 {
|
||||||
currentSelectedHeaderViewBackDays = 30
|
currentSelectedHeaderViewBackDays = 30
|
||||||
@@ -288,7 +287,6 @@ struct ContentView: View {
|
|||||||
Color(theme.currentTheme.secondaryBGColor)
|
Color(theme.currentTheme.secondaryBGColor)
|
||||||
)
|
)
|
||||||
.cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
|
.cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
|
||||||
.padding()
|
|
||||||
.padding([.top, .bottom], 5)
|
.padding([.top, .bottom], 5)
|
||||||
|
|
||||||
Spacer()
|
Spacer()
|
||||||
@@ -296,11 +294,13 @@ struct ContentView: View {
|
|||||||
.opacity(1 - headerOpacity)
|
.opacity(1 - headerOpacity)
|
||||||
}
|
}
|
||||||
.frame(height: headerHeight + 20)
|
.frame(height: headerHeight + 20)
|
||||||
|
|
||||||
|
|
||||||
listView
|
listView
|
||||||
.padding([.leading, .trailing])
|
|
||||||
.padding(.top, -25)
|
.padding(.top, -25)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
.padding()
|
||||||
.padding(.bottom, 5)
|
.padding(.bottom, 5)
|
||||||
.background(
|
.background(
|
||||||
theme.currentTheme.bg
|
theme.currentTheme.bg
|
||||||
|
|||||||
@@ -78,13 +78,12 @@ struct SmallRollUpHeaderView: View {
|
|||||||
textView(forModel: model)
|
textView(forModel: model)
|
||||||
.font(.title)
|
.font(.title)
|
||||||
.fontWeight(.bold)
|
.fontWeight(.bold)
|
||||||
.frame(width: 40, height: 40)
|
|
||||||
.scaledToFill()
|
.scaledToFill()
|
||||||
.minimumScaleFactor(0.5)
|
.minimumScaleFactor(0.5)
|
||||||
.lineLimit(1)
|
.lineLimit(1)
|
||||||
.foregroundColor(Color(UIColor.white))
|
.foregroundColor(Color(UIColor.white))
|
||||||
}
|
}
|
||||||
.padding([.leading, .trailing], 5)
|
.frame(maxWidth: .infinity, alignment: .center)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user