ios: rename DecodeHints -> ReaderOptions

See zxing-cpp#678

Author: axxel

wrappers/ios/Sources/Wrapper/Reader/ZXIBarcodeReader.h

@@ -6,14 +6,14 @@
 #import <CoreGraphics/CoreGraphics.h>
 #import <CoreImage/CoreImage.h>
 #import "ZXIResult.h"
-#import "ZXIDecodeHints.h"
+#import "ZXIReaderOptions.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ZXIBarcodeReader : NSObject
-@property(nonatomic, strong) ZXIDecodeHints *hints;
+@property(nonatomic, strong) ZXIReaderOptions *options;
 
--(instancetype)initWithHints:(ZXIDecodeHints*)options;
+-(instancetype)initWithOptions:(ZXIReaderOptions*)options;
 
 -(nullable NSArray<ZXIResult *> *)readCIImage:(nonnull CIImage *)image
                                 error:(NSError *__autoreleasing  _Nullable *)error;

wrappers/ios/Sources/Wrapper/Reader/ZXIBarcodeReader.mm

@@ -41,13 +41,13 @@ @interface ZXIBarcodeReader()
 @implementation ZXIBarcodeReader
 
 - (instancetype)init {
-    return [self initWithHints: [[ZXIDecodeHints alloc] init]];
+    return [self initWithOptions: [[ZXIReaderOptions alloc] init]];
 }
 
-- (instancetype)initWithHints:(ZXIDecodeHints*)hints{
+- (instancetype)initWithOptions:(ZXIReaderOptions*)options{
     self = [super init];
     self.ciContext = [[CIContext alloc] initWithOptions:@{kCIContextWorkingColorSpace: [NSNull new]}];
-    self.hints = hints;
+    self.options = options;
     return self;
 }
 
@@ -117,29 +117,28 @@ - (instancetype)initWithHints:(ZXIDecodeHints*)hints{
     return [self readImageView:imageView error:error];
 }
 
-+ (DecodeHints)DecodeHintsFromZXIOptions:(ZXIDecodeHints*)hints {
++ (DecodeHints)DecodeHintsFromZXIReaderOptions:(ZXIReaderOptions*)options {
     BarcodeFormats formats;
-    for(NSNumber* flag in hints.formats) {
+    for(NSNumber* flag in options.formats) {
         formats.setFlag(BarcodeFormatFromZXIFormat((ZXIFormat)flag.integerValue));
     }
     DecodeHints resultingHints = DecodeHints()
-        .setTryRotate(hints.tryRotate)
-        .setTryHarder(hints.tryHarder)
-        .setTryInvert(hints.tryInvert)
-        .setTryDownscale(hints.tryDownscale)
-        .setTryCode39ExtendedMode(hints.tryCode39ExtendedMode)
-        .setValidateCode39CheckSum(hints.validateCode39CheckSum)
-        .setValidateITFCheckSum(hints.validateITFCheckSum)
-
         .setFormats(formats)
-        .setMaxNumberOfSymbols(hints.maxNumberOfSymbols);
+        .setTryRotate(options.tryRotate)
+        .setTryHarder(options.tryHarder)
+        .setTryInvert(options.tryInvert)
+        .setTryDownscale(options.tryDownscale)
+        .setTryCode39ExtendedMode(options.tryCode39ExtendedMode)
+        .setValidateCode39CheckSum(options.validateCode39CheckSum)
+        .setValidateITFCheckSum(options.validateITFCheckSum)
+        .setMaxNumberOfSymbols(options.maxNumberOfSymbols);
     return resultingHints;
 }
 
 - (NSArray<ZXIResult*> *)readImageView:(ImageView)imageView
                                  error:(NSError *__autoreleasing _Nullable *)error {
     try {
-        Results results = ReadBarcodes(imageView, [ZXIBarcodeReader DecodeHintsFromZXIOptions:self.hints]);
+        Results results = ReadBarcodes(imageView, [ZXIBarcodeReader DecodeHintsFromZXIReaderOptions:self.options]);
         NSMutableArray* zxiResults = [NSMutableArray array];
         for (auto result: results) {
             [zxiResults addObject:

wrappers/ios/Sources/Wrapper/Reader/ZXIDecodeHints.h wrappers/ios/Sources/Wrapper/Reader/ZXIReaderOptions.h

@@ -6,7 +6,9 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-@interface ZXIDecodeHints : NSObject
+@interface ZXIReaderOptions : NSObject
+/// An array of ZXIFormat
+@property(nonatomic, strong) NSArray<NSNumber*> *formats;
 @property(nonatomic) BOOL tryHarder;
 @property(nonatomic) BOOL tryRotate;
 @property(nonatomic) BOOL tryInvert;
@@ -17,10 +19,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property(nonatomic) uint8_t downscaleFactor;
 @property(nonatomic) uint16_t downscaleThreshold;
 @property(nonatomic) NSInteger maxNumberOfSymbols;
-/// An array of ZXIFormat
-@property(nonatomic, strong) NSArray<NSNumber*> *formats;
 
-- (instancetype)initWithTryHarder:(BOOL)tryHarder
+- (instancetype)initWithFormats:(NSArray<NSNumber*>*)formats
+					    tryHarder:(BOOL)tryHarder
                         tryRotate:(BOOL)tryRotate
                         tryInvert:(BOOL)tryInvert
                      tryDownscale:(BOOL)tryDownscale
@@ -29,8 +30,7 @@ NS_ASSUME_NONNULL_BEGIN
               validateITFCheckSum:(BOOL)validateITFCheckSum
                   downscaleFactor:(uint8_t)downscaleFactor
                downscaleThreshold:(uint16_t)downscaleThreshold
-               maxNumberOfSymbols:(NSInteger)maxNumberOfSymbols
-                          formats:(NSArray<NSNumber*>*)formats;
+               maxNumberOfSymbols:(NSInteger)maxNumberOfSymbols;
 @end
 
 NS_ASSUME_NONNULL_END

wrappers/ios/Sources/Wrapper/Reader/ZXIDecodeHints.mm wrappers/ios/Sources/Wrapper/Reader/ZXIReaderOptions.mm

@@ -2,22 +2,23 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#import "ZXIDecodeHints.h"
+#import "ZXIReaderOptions.h"
 #import "DecodeHints.h"
 
-@interface ZXIDecodeHints()
+@interface ZXIReaderOptions()
 @property(nonatomic) ZXing::DecodeHints zxingHints;
 @end
 
-@implementation ZXIDecodeHints
+@implementation ZXIReaderOptions
 
 -(instancetype)init {
     self = [super init];
     self.zxingHints = ZXing::DecodeHints();
     return self;
 }
 
-- (instancetype)initWithTryHarder:(BOOL)tryHarder
+- (instancetype)initWithFormats:(NSArray<NSNumber*>*)formats
+                        tryHarder:(BOOL)tryHarder
                         tryRotate:(BOOL)tryRotate
                         tryInvert:(BOOL)tryInvert
                      tryDownscale:(BOOL)tryDownscale
@@ -26,8 +27,7 @@ - (instancetype)initWithTryHarder:(BOOL)tryHarder
               validateITFCheckSum:(BOOL)validateITFCheckSum
                   downscaleFactor:(uint8_t)downscaleFactor
                downscaleThreshold:(uint16_t)downscaleThreshold
-               maxNumberOfSymbols:(NSInteger)maxNumberOfSymbols
-                          formats:(NSArray<NSNumber*>*)formats {
+               maxNumberOfSymbols:(NSInteger)maxNumberOfSymbols {
     self = [super init];
     self.zxingHints = ZXing::DecodeHints();
     self.tryHarder = tryHarder;

wrappers/ios/Sources/Wrapper/UmbrellaHeader.h

@@ -10,7 +10,7 @@
 #import "Reader/ZXIPosition.h"
 #import "Reader/ZXIPoint.h"
 #import "Reader/ZXIGTIN.h"
-#import "Reader/ZXIDecodeHints.h"
+#import "Reader/ZXIReaderOptions.h"
 #import "Writer/ZXIEncodeHints.h"
 #import "Writer/ZXIBarcodeWriter.h"
 #import "ZXIErrors.h"

zxing-cpp.podspec

@@ -31,7 +31,7 @@ Pod::Spec.new do |s|
     ss.dependency 'zxing-cpp/Core'
     ss.frameworks = 'CoreGraphics', 'CoreImage', 'CoreVideo'
     ss.source_files = 'wrappers/ios/Sources/Wrapper/**/*.{h,m,mm}'
-    ss.public_header_files = 'wrappers/ios/Sources/Wrapper/Reader/{ZXIBarcodeReader,ZXIResult,ZXIPosition,ZXIPoint,ZXIGTIN,ZXIDecodeHints}.h',
+    ss.public_header_files = 'wrappers/ios/Sources/Wrapper/Reader/{ZXIBarcodeReader,ZXIResult,ZXIPosition,ZXIPoint,ZXIGTIN,ZXIReaderOptions}.h',
                              'wrappers/ios/Sources/Wrapper/Writer/{ZXIBarcodeWriter,ZXIEncodeHints}.h',
                              'wrappers/ios/Sources/Wrapper/{ZXIErrors,ZXIFormat}.h'
     ss.exclude_files = 'wrappers/ios/Sources/Wrapper/UmbrellaHeader.h'