tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix padding and other minor UI improvements

Browse Source
This commit is contained in:
Jacob Davis
2022-12-17 16:11:19 -05:00
committed by William Casarin
parent 300cae6800
commit 2c44366ca5
9 changed files with 72 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
damus/ContentView.swift
View File

@@ -73,11 +73,11 @@ struct ContentView: View {
let timer = Timer.publish(every: 4, on: .main, in: .common).autoconnect()
let sub_id = UUID().description
@Environment(\.colorScheme) var colorScheme
var PostingTimelineView: some View {
VStack{
FiltersView
.padding([.bottom], 8)
ZStack {
if let damus = self.damus_state {
TimelineView(events: $home.events, loading: $home.loading, damus: damus, show_friend_icon: false, filter: filter_event)
@@ -89,6 +89,16 @@ struct ContentView: View {
}
}
}
.safeAreaInset(edge: .top) {
VStack(spacing: 0) {
FiltersView
//.frame(maxWidth: 275)
.padding()
Divider()
.frame(height: 1)
}
.background(colorScheme == .dark ? Color.black : Color.white)
}
}
var FiltersView: some View {
@@ -139,7 +149,7 @@ struct ContentView: View {
EmptyView()
}
}
.navigationBarTitle("Damus", displayMode: .inline)
.navigationBarTitle(selected_timeline == .home ? "Home" : "Global", displayMode: .inline)
}
var MaybeSearchView: some View {

2
damus/Views/ChatroomView.swift
View File

@@ -37,6 +37,8 @@ struct ChatroomView: View {
}
}
.padding(.horizontal)
.padding(.top)
EndBlock()
}

46
damus/Views/DMChatView.swift
View File

@@ -12,12 +12,6 @@ struct DMChatView: View {
let pubkey: String
@EnvironmentObject var dms: DirectMessageModel
@State var message: String = ""
init(damus_state: DamusState, pubkey: String) {
self.damus_state = damus_state
self.pubkey = pubkey
UITextView.appearance().backgroundColor = .clear
}
var Messages: some View {
ScrollViewReader { scroller in
@@ -29,6 +23,7 @@ struct DMChatView: View {
}
EndBlock(height: 80)
}
.padding(.horizontal)
}
.onAppear {
scroller.scrollTo("endblock")
@@ -53,9 +48,16 @@ struct DMChatView: View {
var InputField: some View {
TextEditor(text: $message)
.cornerRadius(20)
.padding(8)
.background(InputBackground().cornerRadius(20))
.textEditorBackground {
InputBackground()
}
.cornerRadius(8)
.background(
RoundedRectangle(cornerRadius: 8)
.stroke(style: .init(lineWidth: 2))
.foregroundColor(.secondary.opacity(0.2))
)
.padding(16)
.foregroundColor(Color.primary)
}
@@ -63,9 +65,9 @@ struct DMChatView: View {
func InputBackground() -> Color {
if colorScheme == .light {
return Color.init(.sRGB, red: 0.8, green: 0.8, blue: 0.8, opacity: 1.0)
return Color.init(.sRGB, red: 0.9, green: 0.9, blue: 0.9, opacity: 1.0)
} else {
return Color.init(.sRGB, red: 0.2, green: 0.2, blue: 0.2, opacity: 1.0)
return Color.init(.sRGB, red: 0.1, green: 0.1, blue: 0.1, opacity: 1.0)
}
}
@@ -78,21 +80,21 @@ struct DMChatView: View {
}
var Footer: some View {
//ZStack {
//BackgroundColor()
ZStack {
BackgroundColor()
HStack(spacing: 0) {
InputField
HStack(spacing: 0) {
InputField
if !message.isEmpty {
Button(role: .none, action: send_message) {
Label("", systemImage: "arrow.right.circle")
.font(.title)
if !message.isEmpty {
Button(role: .none, action: send_message) {
Label("", systemImage: "arrow.right.circle")
.font(.title)
}
}
}
}
.frame(height: 50 + 20 * CGFloat(text_lines))
//}
}
var text_lines: Int {
@@ -123,12 +125,12 @@ struct DMChatView: View {
message = ""
damus_state.pool.send(.event(dm))
end_editing()
}
var body: some View {
ZStack {
Messages
.padding([.top, .leading, .trailing], 10)
.dismissKeyboardOnTap()
VStack {

2
damus/Views/DirectMessagesView.swift
View File

@@ -18,6 +18,8 @@ struct DirectMessagesView: View {
MaybeEvent(tup)
}
}
.padding(.horizontal)
.padding(.top)
}
}

20
damus/Views/EventDetailView.swift
View File

@@ -91,15 +91,19 @@ struct EventDetailView: View {
}
ScrollView(.vertical) {
let collapsed_events = calculated_collapsed_events(
privkey: damus.keypair.privkey,
collapsed: self.collapsed,
active: thread.event,
events: thread.events
)
ForEach(collapsed_events, id: \.id) { cev in
CollapsedEventView(cev, scroller: proxy)
LazyVStack {
let collapsed_events = calculated_collapsed_events(
privkey: damus.keypair.privkey,
collapsed: self.collapsed,
active: thread.event,
events: thread.events
)
ForEach(collapsed_events, id: \.id) { cev in
CollapsedEventView(cev, scroller: proxy)
}
}
.padding(.horizontal)
.padding(.top)
EndBlock()
}

22
damus/Views/SearchHomeView.swift
View File

@@ -17,7 +17,7 @@ struct SearchHomeView: View {
ZStack(alignment: .leading) {
HStack{
TextField("", text: $search)
.padding(5)
.padding(8)
.padding(.leading, 35)
.textInputAutocapitalization(.never)
Label("", systemImage: "xmark.square")
@@ -32,10 +32,10 @@ struct SearchHomeView: View {
.padding(.leading, 10)
}
.background {
RoundedRectangle(cornerRadius: 20)
.foregroundColor(.gray.opacity(0.2))
RoundedRectangle(cornerRadius: 8)
.foregroundColor(.secondary.opacity(0.2))
}
.padding()
//.padding()
}
var GlobalContent: some View {
@@ -56,12 +56,22 @@ struct SearchHomeView: View {
}
}
@Environment(\.colorScheme) var colorScheme
var body: some View {
VStack {
SearchInput
MainContent
}
.safeAreaInset(edge: .top) {
VStack(spacing: 0) {
SearchInput
//.frame(maxWidth: 275)
.padding()
Divider()
.frame(height: 1)
}
.background(colorScheme == .dark ? Color.black : Color.white)
}
.onChange(of: search) { s in
print("search change 1")
}

1
damus/Views/ThreadView.swift
View File

@@ -35,7 +35,6 @@ struct ThreadView: View {
}
*/
}
.padding([.leading, .trailing], 6)
.onReceive(handle_notify(.switched_timeline)) { n in
dismiss()
}

1
damus/Views/TimelineView.swift
View File

@@ -32,6 +32,7 @@ struct InnerTimelineView: View {
.buttonStyle(PlainButtonStyle())
}
}
.padding(.horizontal)
}
}