Update picker style and set sample deployment target to iOS 14 (google#131)

mdmathias · petea · web-flow · commit b0f8d26f08ea · 2022-05-11T19:04:32.000-07:00
* Update picker style and set sample deployment target to iOS 13

* Update iOS version to 14 and remove unnecessary accessibilityLabels

Co-authored-by: Peter Andrews &lt;petea@google.com&gt;
diff --git a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthday.xcodeproj/project.pbxproj b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthday.xcodeproj/project.pbxproj
@@ -414,7 +414,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -471,7 +471,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 14.5;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				SDKROOT = iphoneos;
diff --git a/Samples/Swift/DaysUntilBirthday/Shared/Views/BirthdayView.swift b/Samples/Swift/DaysUntilBirthday/Shared/Views/BirthdayView.swift
@@ -25,7 +25,6 @@ struct BirthdayView: View {
       VStack {
         Text(birthdayViewModel.daysUntilBirthday)
           .font(.system(size: 80))
-          .accessibilityLabel("Number of days until your birthday")
         Spacer()
       }
       .navigationTitle(NSLocalizedString("Days Until Birthday",
diff --git a/Samples/Swift/DaysUntilBirthday/Shared/Views/SignInView.swift b/Samples/Swift/DaysUntilBirthday/Shared/Views/SignInView.swift
@@ -64,7 +64,7 @@ struct SignInView: View {
             }
           }
           #if os(iOS)
-            .pickerStyle(.automatic)
+            .pickerStyle(.segmented)
           #endif
         }
       }
diff --git a/Samples/Swift/DaysUntilBirthday/iOS/UserProfileView.swift b/Samples/Swift/DaysUntilBirthday/iOS/UserProfileView.swift
@@ -34,9 +34,7 @@ struct UserProfileView: View {
             VStack(alignment: .leading) {
               Text(userProfile.name)
                 .font(.headline)
-                .accessibilityLabel(Text("User name."))
               Text(userProfile.email)
-                .accessibilityLabel(Text("User email."))
             }
           }
           NavigationLink(NSLocalizedString("View Days Until Birthday", comment: "View birthday days"),
@@ -57,14 +55,11 @@ struct UserProfileView: View {
         .toolbar {
           ToolbarItemGroup(placement: .navigationBarTrailing) {
             Button(NSLocalizedString("Disconnect", comment: "Disconnect button"), action: disconnect)
-              .accessibilityLabel(Text("Disconnect scope button."))
             Button(NSLocalizedString("Sign Out", comment: "Sign out button"), action: signOut)
-              .accessibilityLabel(Text("Sign out button"))
           }
         }
       } else {
         Text(NSLocalizedString("Failed to get user profile!", comment: "Empty user profile text"))
-          .accessibilityLabel(Text("Failed to get user profile"))
       }
     }
   }
diff --git a/Samples/Swift/DaysUntilBirthday/macOS/UserProfileView.swift b/Samples/Swift/DaysUntilBirthday/macOS/UserProfileView.swift
@@ -18,22 +18,18 @@ struct UserProfileView: View {
             VStack(alignment: .leading) {
               Text(userProfile.name)
                 .font(.headline)
-                .accessibilityLabel(Text("User name."))
               Text(userProfile.email)
-                .accessibilityLabel(Text("User email."))
             }
           }
           Button(NSLocalizedString("Sign Out", comment: "Sign out button"), action: signOut)
             .background(Color.blue)
             .foregroundColor(Color.white)
             .cornerRadius(5)
-            .accessibilityLabel(Text("Sign out button"))
 
           Button(NSLocalizedString("Disconnect", comment: "Disconnect button"), action: disconnect)
             .background(Color.blue)
             .foregroundColor(Color.white)
             .cornerRadius(5)
-            .accessibilityLabel(Text("Disconnect scope button."))
           Spacer()
           NavigationLink(NSLocalizedString("View Days Until Birthday", comment: "View birthday days"),
                          destination: BirthdayView(birthdayViewModel: birthdayViewModel).onAppear {
@@ -51,12 +47,10 @@ struct UserProfileView: View {
             .background(Color.blue)
             .foregroundColor(Color.white)
             .cornerRadius(5)
-            .accessibilityLabel(Text("View days until birthday."))
           Spacer()
         }
       } else {
         Text(NSLocalizedString("Failed to get user profile!", comment: "Empty user profile text"))
-          .accessibilityLabel(Text("Failed to get user profile"))
       }
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,6 @@ struct BirthdayView: View {`
`25`	`25`	`VStack {`
`26`	`26`	`Text(birthdayViewModel.daysUntilBirthday)`
`27`	`27`	`.font(.system(size: 80))`
`28`		`- .accessibilityLabel("Number of days until your birthday")`
`29`	`28`	`Spacer()`
`30`	`29`	`}`
`31`	`30`	`.navigationTitle(NSLocalizedString("Days Until Birthday",`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ struct SignInView: View {`
`64`	`64`	`}`
`65`	`65`	`}`
`66`	`66`	`#if os(iOS)`
`67`		`- .pickerStyle(.automatic)`
	`67`	`+ .pickerStyle(.segmented)`
`68`	`68`	`#endif`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,7 @@ struct UserProfileView: View {`
`34`	`34`	`VStack(alignment: .leading) {`
`35`	`35`	`Text(userProfile.name)`
`36`	`36`	`.font(.headline)`
`37`		`- .accessibilityLabel(Text("User name."))`
`38`	`37`	`Text(userProfile.email)`
`39`		`- .accessibilityLabel(Text("User email."))`
`40`	`38`	`}`
`41`	`39`	`}`
`42`	`40`	`NavigationLink(NSLocalizedString("View Days Until Birthday", comment: "View birthday days"),`
`@@ -57,14 +55,11 @@ struct UserProfileView: View {`
`57`	`55`	`.toolbar {`
`58`	`56`	`ToolbarItemGroup(placement: .navigationBarTrailing) {`
`59`	`57`	`Button(NSLocalizedString("Disconnect", comment: "Disconnect button"), action: disconnect)`
`60`		`- .accessibilityLabel(Text("Disconnect scope button."))`
`61`	`58`	`Button(NSLocalizedString("Sign Out", comment: "Sign out button"), action: signOut)`
`62`		`- .accessibilityLabel(Text("Sign out button"))`
`63`	`59`	`}`
`64`	`60`	`}`
`65`	`61`	`} else {`
`66`	`62`	`Text(NSLocalizedString("Failed to get user profile!", comment: "Empty user profile text"))`
`67`		`- .accessibilityLabel(Text("Failed to get user profile"))`
`68`	`63`	`}`
`69`	`64`	`}`
`70`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,22 +18,18 @@ struct UserProfileView: View {`
`18`	`18`	`VStack(alignment: .leading) {`
`19`	`19`	`Text(userProfile.name)`
`20`	`20`	`.font(.headline)`
`21`		`- .accessibilityLabel(Text("User name."))`
`22`	`21`	`Text(userProfile.email)`
`23`		`- .accessibilityLabel(Text("User email."))`
`24`	`22`	`}`
`25`	`23`	`}`
`26`	`24`	`Button(NSLocalizedString("Sign Out", comment: "Sign out button"), action: signOut)`
`27`	`25`	`.background(Color.blue)`
`28`	`26`	`.foregroundColor(Color.white)`
`29`	`27`	`.cornerRadius(5)`
`30`		`- .accessibilityLabel(Text("Sign out button"))`
`31`	`28`
`32`	`29`	`Button(NSLocalizedString("Disconnect", comment: "Disconnect button"), action: disconnect)`
`33`	`30`	`.background(Color.blue)`
`34`	`31`	`.foregroundColor(Color.white)`
`35`	`32`	`.cornerRadius(5)`
`36`		`- .accessibilityLabel(Text("Disconnect scope button."))`
`37`	`33`	`Spacer()`
`38`	`34`	`NavigationLink(NSLocalizedString("View Days Until Birthday", comment: "View birthday days"),`
`39`	`35`	`destination: BirthdayView(birthdayViewModel: birthdayViewModel).onAppear {`
`@@ -51,12 +47,10 @@ struct UserProfileView: View {`
`51`	`47`	`.background(Color.blue)`
`52`	`48`	`.foregroundColor(Color.white)`
`53`	`49`	`.cornerRadius(5)`
`54`		`- .accessibilityLabel(Text("View days until birthday."))`
`55`	`50`	`Spacer()`
`56`	`51`	`}`
`57`	`52`	`} else {`
`58`	`53`	`Text(NSLocalizedString("Failed to get user profile!", comment: "Empty user profile text"))`
`59`		`- .accessibilityLabel(Text("Failed to get user profile"))`
`60`	`54`	`}`
`61`	`55`	`}`
`62`	`56`	`}`