From e29a2d4f0ab00611e0de91be28beab31d2d871d2 Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Wed, 19 May 2021 16:23:24 -0700 Subject: [PATCH 1/2] [image_picker] Fix camera alert localization analyzer warning --- packages/image_picker/image_picker/CHANGELOG.md | 5 ++++- .../image_picker/ios/Classes/FLTImagePickerPlugin.m | 6 +++--- packages/image_picker/image_picker/pubspec.yaml | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/image_picker/image_picker/CHANGELOG.md b/packages/image_picker/image_picker/CHANGELOG.md index d453c82f9ac4..4b8d35b46937 100644 --- a/packages/image_picker/image_picker/CHANGELOG.md +++ b/packages/image_picker/image_picker/CHANGELOG.md @@ -1,9 +1,12 @@ +## 0.7.5+3 +* Localize `UIAlertController` strings. + ## 0.7.5+2 * Implement `UIAlertController` with a preferredStyle of `UIAlertControllerStyleAlert` since `UIAlertView` is deprecated. ## 0.7.5+1 -* Fixes a rotation problem where Select Photos limited access is chosen but the image that is picked +* Fixes a rotation problem where Select Photos limited access is chosen but the image that is picked is not included selected photos and image is scaled. ## 0.7.5 diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m index 25ddaf48f426..655d3cf37f0b 100644 --- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m +++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m @@ -191,10 +191,10 @@ - (void)showCamera { completion:nil]; } else { UIAlertController *cameraErrorAlert = - [UIAlertController alertControllerWithTitle:@"Error" - message:@"Camera not available." + [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Error", @"Alert title when camera unavailable") + message:NSLocalizedString(@"Camera not available.", "Alert message when camera unavailable") preferredStyle:UIAlertControllerStyleAlert]; - [cameraErrorAlert addAction:[UIAlertAction actionWithTitle:@"OK" + [cameraErrorAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"Alert button when camera unavailable") style:UIAlertActionStyleDefault handler:^(UIAlertAction *action){ }]]; diff --git a/packages/image_picker/image_picker/pubspec.yaml b/packages/image_picker/image_picker/pubspec.yaml index 408045d66aa4..fecc40199abf 100755 --- a/packages/image_picker/image_picker/pubspec.yaml +++ b/packages/image_picker/image_picker/pubspec.yaml @@ -2,7 +2,7 @@ name: image_picker description: Flutter plugin for selecting images from the Android and iOS image library, and taking new pictures with the camera. homepage: https://github.com/flutter/plugins/tree/master/packages/image_picker/image_picker -version: 0.7.5+2 +version: 0.7.5+3 flutter: plugin: From 9e8658500e8cdd4595de29fd913d58bce2cd70ae Mon Sep 17 00:00:00 2001 From: Jenn Magder Date: Wed, 19 May 2021 17:20:11 -0700 Subject: [PATCH 2/2] Format --- .../ios/Classes/FLTImagePickerPlugin.m | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m index 655d3cf37f0b..d0e8aacbb64c 100644 --- a/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m +++ b/packages/image_picker/image_picker/ios/Classes/FLTImagePickerPlugin.m @@ -190,14 +190,17 @@ - (void)showCamera { animated:YES completion:nil]; } else { - UIAlertController *cameraErrorAlert = - [UIAlertController alertControllerWithTitle:NSLocalizedString(@"Error", @"Alert title when camera unavailable") - message:NSLocalizedString(@"Camera not available.", "Alert message when camera unavailable") - preferredStyle:UIAlertControllerStyleAlert]; - [cameraErrorAlert addAction:[UIAlertAction actionWithTitle:NSLocalizedString(@"OK", @"Alert button when camera unavailable") - style:UIAlertActionStyleDefault - handler:^(UIAlertAction *action){ - }]]; + UIAlertController *cameraErrorAlert = [UIAlertController + alertControllerWithTitle:NSLocalizedString(@"Error", @"Alert title when camera unavailable") + message:NSLocalizedString(@"Camera not available.", + "Alert message when camera unavailable") + preferredStyle:UIAlertControllerStyleAlert]; + [cameraErrorAlert + addAction:[UIAlertAction actionWithTitle:NSLocalizedString( + @"OK", @"Alert button when camera unavailable") + style:UIAlertActionStyleDefault + handler:^(UIAlertAction *action){ + }]]; [[self viewControllerWithWindow:nil] presentViewController:cameraErrorAlert animated:YES completion:nil];