From 7fcfd102848d4e95bd4f8320d9dbd7676cc62402 Mon Sep 17 00:00:00 2001 From: giiiita Date: Fri, 29 May 2020 18:27:10 +0900 Subject: [PATCH 1/2] Changed the displayMode of navigationbarTitle to be able to decide --- Sources/SwiftUIPullToRefresh/PullToRefresh.swift | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Sources/SwiftUIPullToRefresh/PullToRefresh.swift b/Sources/SwiftUIPullToRefresh/PullToRefresh.swift index d5588e2..09df1e8 100644 --- a/Sources/SwiftUIPullToRefresh/PullToRefresh.swift +++ b/Sources/SwiftUIPullToRefresh/PullToRefresh.swift @@ -51,14 +51,20 @@ class RefreshData: ObservableObject { public struct RefreshableNavigationView: View { let content: () -> Content let action: () -> Void + let navigationBarTitleDisplayMode: NavigationBarItem.TitleDisplayMode private var title: String @Binding var isDone: Bool @ObservedObject var data: RefreshData - public init(title:String, action: @escaping () -> Void,isDone: Binding ,@ViewBuilder content: @escaping () -> Content) { + public init( + title:String, action: @escaping () -> Void, + isDone: Binding, + navigationBarTitleDisplayMode: NavigationBarItem.TitleDisplayMode, + @ViewBuilder content: @escaping () -> Content) { self.title = title self.action = action + self.navigationBarTitleDisplayMode = navigationBarTitleDisplayMode self.content = content self._isDone = isDone self.data = RefreshData(isDone: isDone) @@ -75,7 +81,7 @@ public struct RefreshableNavigationView: View { NavigationView{ RefreshableList(data: data, action: self.action) { self.content() - }.navigationBarTitle(title) + }.navigationBarTitle(Text(title), displayMode: self.navigationBarTitileDisplayMode) } } } @@ -250,3 +256,4 @@ struct Spinner_Previews: PreviewProvider { Spinner(percentage: .constant(1)) } } + From 18cde62d644e1b02bedc994e5c5233d9fdf0f865 Mon Sep 17 00:00:00 2001 From: giiiita Date: Fri, 29 May 2020 18:40:58 +0900 Subject: [PATCH 2/2] Add line break --- Sources/SwiftUIPullToRefresh/PullToRefresh.swift | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/SwiftUIPullToRefresh/PullToRefresh.swift b/Sources/SwiftUIPullToRefresh/PullToRefresh.swift index 09df1e8..b41b692 100644 --- a/Sources/SwiftUIPullToRefresh/PullToRefresh.swift +++ b/Sources/SwiftUIPullToRefresh/PullToRefresh.swift @@ -58,7 +58,8 @@ public struct RefreshableNavigationView: View { @ObservedObject var data: RefreshData public init( - title:String, action: @escaping () -> Void, + title:String, + action: @escaping () -> Void, isDone: Binding, navigationBarTitleDisplayMode: NavigationBarItem.TitleDisplayMode, @ViewBuilder content: @escaping () -> Content) {