Merge pull request #491 from Adamant-im/dev/trello.com/c/bfhjk1NL

[trello.com/c/bfhjk1NL] Fixed: Back button disappears from the toolbar

Adamant/Modules/PartnerQR/PartnerQRView.swift

@@ -12,33 +12,37 @@ struct PartnerQRView: View {
     @ObservedObject var viewModel: PartnerQRViewModel
 
     var body: some View {
-        Form {
-            infoSection()
-            toggleSection() 
-            buttonSection()
-        }
-        .navigationBarTitleDisplayMode(.inline)
-        .toolbar {
-            ToolbarItem(placement: .principal) {
-                toolbar()
+        GeometryReader { geometry in
+            Form {
+                infoSection()
+                toggleSection()
+                buttonSection()
+            }
+            .navigationBarTitleDisplayMode(.inline)
+            .toolbar {
+                ToolbarItem(placement: .principal) {
+                    toolbar(maxWidth: geometry.size.width)
+                }
             }
         }
     }
 }
 
 private extension PartnerQRView {
-    func toolbar() -> some View {
-        Button(action: {
-            viewModel.renameContact()
-        }) {
+    func toolbar(maxWidth: CGFloat) -> some View {
+        Button(action: viewModel.renameContact) {
             HStack {
                 if let uiImage = viewModel.partnerImage {
                     Image(uiImage: uiImage)
                         .resizable()
                         .frame(squareSize: viewModel.partnerImageSize)
                 }
-                Text(viewModel.partnerName).font(.headline)
+                Text(viewModel.partnerName)
+                    .font(.headline)
+                    .minimumScaleFactor(0.7)
+                    .lineLimit(1)
             }
+            .frame(maxWidth: maxWidth - toolbarSpace, alignment: .center)
         }
     }
 
@@ -101,3 +105,5 @@ private extension PartnerQRView {
         }
     }
 }
+
+private let toolbarSpace: CGFloat = 150