Merge pull request #360 from Esri/Ting/Setup-GitHubButton

yo1995 · web-flow · commit 4fb115c94a3b · 2024-03-29T06:11:14.000+08:00
[Update] Replace deprecated API `navigationBarTrailing`
diff --git a/Samples.xcodeproj/project.pbxproj b/Samples.xcodeproj/project.pbxproj
@@ -2326,7 +2326,7 @@
 					StyleSymbolsFromMobileStyleFile,
 				);
 				LastSwiftUpdateCheck = 1330;
-				LastUpgradeCheck = 1500;
+				LastUpgradeCheck = 1530;
 				ORGANIZATIONNAME = Esri;
 				TargetAttributes = {
 					00E5401227F3CCA200CF66D5 = {
diff --git a/Samples.xcodeproj/xcshareddata/xcschemes/Samples.xcscheme b/Samples.xcodeproj/xcshareddata/xcschemes/Samples.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1500"
+   LastUpgradeVersion = "1530"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
diff --git a/Shared/Supporting Files/Views/FavoritesView.swift b/Shared/Supporting Files/Views/FavoritesView.swift
@@ -42,7 +42,7 @@ struct FavoritesView: View {
         }
         .listStyle(.sidebar)
         .toolbar {
-            ToolbarItemGroup(placement: .navigationBarTrailing) {
+            ToolbarItemGroup(placement: .topBarTrailing) {
                 EditButton()
                 
                 Button {
@@ -105,7 +105,7 @@ private extension FavoritesView {
                         Text("Choose a sample to add to Favorites")
                             .font(.subheadline)
                     }
-                    ToolbarItem(placement: .navigationBarTrailing) {
+                    ToolbarItem(placement: .topBarTrailing) {
                         Button("Done") {
                             dismiss()
                         }
diff --git a/Shared/Supporting Files/Views/SampleDetailView.swift b/Shared/Supporting Files/Views/SampleDetailView.swift
@@ -84,7 +84,7 @@ struct SampleDetailView: View {
         .navigationTitle(sample.name)
         .navigationBarTitleDisplayMode(.inline)
         .toolbar {
-            ToolbarItem(placement: .navigationBarTrailing) {
+            ToolbarItem(placement: .topBarTrailing) {
                 Button {
                     isSampleInfoViewPresented = true
                 } label: {
diff --git a/Shared/Supporting Files/Views/Sidebar.swift b/Shared/Supporting Files/Views/Sidebar.swift
@@ -34,7 +34,7 @@ struct Sidebar: View {
             }
         }
         .toolbar {
-            ToolbarItem(placement: .navigationBarTrailing) {
+            ToolbarItem(placement: .topBarTrailing) {
                 Button {
                     isAboutViewPresented = true
                 } label: {

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ struct FavoritesView: View {`
`42`	`42`	`}`
`43`	`43`	`.listStyle(.sidebar)`
`44`	`44`	`.toolbar {`
`45`		`- ToolbarItemGroup(placement: .navigationBarTrailing) {`
	`45`	`+ ToolbarItemGroup(placement: .topBarTrailing) {`
`46`	`46`	`EditButton()`
`47`	`47`
`48`	`48`	`Button {`
`@@ -105,7 +105,7 @@ private extension FavoritesView {`
`105`	`105`	`Text("Choose a sample to add to Favorites")`
`106`	`106`	`.font(.subheadline)`
`107`	`107`	`}`
`108`		`- ToolbarItem(placement: .navigationBarTrailing) {`
	`108`	`+ ToolbarItem(placement: .topBarTrailing) {`
`109`	`109`	`Button("Done") {`
`110`	`110`	`dismiss()`
`111`	`111`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ struct Sidebar: View {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`	`.toolbar {`
`37`		`- ToolbarItem(placement: .navigationBarTrailing) {`
	`37`	`+ ToolbarItem(placement: .topBarTrailing) {`
`38`	`38`	`Button {`
`39`	`39`	`isAboutViewPresented = true`
`40`	`40`	`} label: {`