Merge branch 'develop' into sharing

This commit is contained in:
Trey t
2022-02-12 10:38:55 -06:00
2 changed files with 4 additions and 5 deletions

View File

@@ -212,7 +212,6 @@ struct ContentView: View {
.contentShape(Rectangle())
}
.tabViewStyle(.page)
.padding([.trailing, .leading])
.onChange(of: switchableViewSelectedIndex) { value in
if value == 1 {
currentSelectedHeaderViewBackDays = 30
@@ -288,7 +287,6 @@ struct ContentView: View {
Color(theme.currentTheme.secondaryBGColor)
)
.cornerRadius(10, corners: [.topLeft, .topRight, .bottomLeft, .bottomRight])
.padding()
.padding([.top, .bottom], 5)
Spacer()
@@ -296,11 +294,13 @@ struct ContentView: View {
.opacity(1 - headerOpacity)
}
.frame(height: headerHeight + 20)
listView
.padding([.leading, .trailing])
.padding(.top, -25)
}
}
.padding()
.padding(.bottom, 5)
.background(
theme.currentTheme.bg

View File

@@ -78,13 +78,12 @@ struct SmallRollUpHeaderView: View {
textView(forModel: model)
.font(.title)
.fontWeight(.bold)
.frame(width: 40, height: 40)
.scaledToFill()
.minimumScaleFactor(0.5)
.lineLimit(1)
.foregroundColor(Color(UIColor.white))
}
.padding([.leading, .trailing], 5)
.frame(maxWidth: .infinity, alignment: .center)
}
}
}