ios: rename ZXIEncodeHints to ZXIWriterOptions

Also make the Writer interface consistent with the Reader by making
options a property of the writer instead.

Author: axxel

wrappers/ios/Sources/Wrapper/UmbrellaHeader.h

@@ -11,7 +11,7 @@
 #import "Reader/ZXIPoint.h"
 #import "Reader/ZXIGTIN.h"
 #import "Reader/ZXIReaderOptions.h"
-#import "Writer/ZXIEncodeHints.h"
+#import "Writer/ZXIWriterOptions.h"
 #import "Writer/ZXIBarcodeWriter.h"
 #import "ZXIErrors.h"
 #import "ZXIFormat.h"

wrappers/ios/Sources/Wrapper/Writer/ZXIBarcodeWriter.h

@@ -3,18 +3,19 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #import <Foundation/Foundation.h>
-#import "ZXIEncodeHints.h"
+#import "ZXIWriterOptions.h"
 
 NS_ASSUME_NONNULL_BEGIN
 
 @interface ZXIBarcodeWriter : NSObject
+@property(nonatomic, strong) ZXIWriterOptions *options;
+
+-(instancetype)initWithOptions:(ZXIWriterOptions*)options;
 
 -(nullable CGImageRef)writeString:(NSString *)contents
-                            hints:(ZXIEncodeHints *)hints
                             error:(NSError *__autoreleasing  _Nullable *)error;
 
 -(nullable CGImageRef)writeData:(NSData *)data
-                          hints:(ZXIEncodeHints *)hints
                           error:(NSError *__autoreleasing  _Nullable *)error;
 
 @end

wrappers/ios/Sources/Wrapper/Writer/ZXIBarcodeWriter.mm

@@ -4,7 +4,7 @@
 
 #import <CoreGraphics/CoreGraphics.h>
 #import "ZXIBarcodeWriter.h"
-#import "ZXIEncodeHints.h"
+#import "ZXIWriterOptions.h"
 #import "MultiFormatWriter.h"
 #import "BitMatrix.h"
 #import "BitMatrixIO.h"
@@ -32,29 +32,37 @@
 
 @implementation ZXIBarcodeWriter
 
+- (instancetype)init {
+    return [self initWithOptions: [[ZXIWriterOptions alloc] init]];
+}
+
+- (instancetype)initWithOptions:(ZXIWriterOptions*)options{
+    self = [super init];
+    self.options = options;
+    return self;
+}
+
 -(CGImageRef)writeData:(NSData *)data
-                 hints:(ZXIEncodeHints *)hints
                  error:(NSError *__autoreleasing  _Nullable *)error {
     return [self encode: NSDataToStringW(data)
                encoding: CharacterSet::BINARY
-                 format: hints.format
-                  width: hints.width
-                 height: hints.height
-                 margin: hints.margin
-                ecLevel: hints.ecLevel
+                 format: self.options.format
+                  width: self.options.width
+                 height: self.options.height
+                 margin: self.options.margin
+                ecLevel: self.options.ecLevel
                   error: error];
 }
 
 -(CGImageRef)writeString:(NSString *)contents
-                   hints:(ZXIEncodeHints *)hints
                    error:(NSError *__autoreleasing  _Nullable *)error {
     return [self encode: NSStringToStringW(contents)
                encoding: CharacterSet::UTF8
-                 format: hints.format
-                  width: hints.width
-                 height: hints.height
-                 margin: hints.margin
-                ecLevel: hints.ecLevel
+                 format: self.options.format
+                  width: self.options.width
+                 height: self.options.height
+                 margin: self.options.margin
+                ecLevel: self.options.ecLevel
                   error: error];
 }
 

wrappers/ios/Sources/Wrapper/Writer/ZXIEncodeHints.h wrappers/ios/Sources/Wrapper/Writer/ZXIWriterOptions.h

@@ -30,7 +30,7 @@ extern const int PDF417_ERROR_CORRECTION_6;
 extern const int PDF417_ERROR_CORRECTION_7;
 extern const int PDF417_ERROR_CORRECTION_8;
 
-@interface ZXIEncodeHints : NSObject
+@interface ZXIWriterOptions : NSObject
 @property(nonatomic) ZXIFormat format;
 @property(nonatomic) int width;
 @property(nonatomic) int height;

wrappers/ios/Sources/Wrapper/Writer/ZXIEncodeHints.mm wrappers/ios/Sources/Wrapper/Writer/ZXIWriterOptions.mm

@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: Apache-2.0
 
-#import "ZXIEncodeHints.h"
+#import "ZXIWriterOptions.h"
 
 const int AZTEC_ERROR_CORRECTION_0 = 0;
 const int AZTEC_ERROR_CORRECTION_12 = 1;
@@ -27,7 +27,7 @@
 const int PDF417_ERROR_CORRECTION_7 = 7;
 const int PDF417_ERROR_CORRECTION_8 = 8;
 
-@implementation ZXIEncodeHints
+@implementation ZXIWriterOptions
 
 - (instancetype)initWithFormat:(ZXIFormat)format {
     self = [super init];

wrappers/ios/demo/demo/WriteViewController.swift

@@ -14,9 +14,9 @@ class WriteViewController: UIViewController {
     // MARK: - Actions
 
     @IBAction func textFieldChanged(_ sender: UITextField) {
-        let hints = ZXIEncodeHints(format: .QR_CODE, width: 200, height: 200, ecLevel: QR_ERROR_CORRECTION_LOW, margin: -1)
+        let options = ZXIWriterOptions(format: .QR_CODE, width: 200, height: 200, ecLevel: QR_ERROR_CORRECTION_LOW, margin: -1)
         guard let text = sender.text,
-              let image = try? ZXIBarcodeWriter().write(text, hints: hints)
+              let image = try? ZXIBarcodeWriter(options: options).write(text)
         else {
             return
         }

zxing-cpp.podspec

@@ -32,7 +32,7 @@ Pod::Spec.new do |s|
     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,ZXIReaderOptions}.h',
-                             'wrappers/ios/Sources/Wrapper/Writer/{ZXIBarcodeWriter,ZXIEncodeHints}.h',
+                             'wrappers/ios/Sources/Wrapper/Writer/{ZXIBarcodeWriter,ZXIWriterOptions}.h',
                              'wrappers/ios/Sources/Wrapper/{ZXIErrors,ZXIFormat}.h'
     ss.exclude_files = 'wrappers/ios/Sources/Wrapper/UmbrellaHeader.h'
   end