Skip to content

Fix swift compiler errors #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mityax wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix swift compiler errors #19

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b2e1cc
Update SwiftLearningTranslatePlugin.swift
mityax Jan 21, 2022
c592c4b
Update SwiftLearningTranslatePlugin.swift
mityax Jan 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 29 additions & 26 deletions packages/learning_translate/ios/Classes/SwiftLearningTranslatePlugin.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
import Flutter
import UIKit

import MLKit
import MLKitTranslate

public class SwiftLearningTranslatePlugin: NSObject, FlutterPlugin {

public static func register(with registrar: FlutterPluginRegistrar) {
let channel = FlutterMethodChannel(name: "LearningTranslate", binaryMessenger: registrar.messenger())
let instance = SwiftLearningTranslatePlugin()
registrar.addMethodCallDelegate(instance, channel: channel)
setModelManager(registrar)
instance.setModelManager(registrar: registrar)
}

public func handle(_ call: FlutterMethodCall, result: @escaping FlutterResult) {
if call.method == "translate" {
translate(call, result)
translate(call, result: result)
} else if call.method == "dispose" {
dispose(result)
dispose(result: result)
} else {
result(FlutterMethodNotImplemented)
}
Expand All @@ -28,18 +28,18 @@ public class SwiftLearningTranslatePlugin: NSObject, FlutterPlugin {

func translate(_ call: FlutterMethodCall, result: @escaping FlutterResult) {

guard let args = call.arguments else {
guard let args = call.arguments as? Dictionary<String, AnyObject> else {
result(FlutterError(
code: "NOARGUMENTS",
message: "No arguments",
details: nil))
return
}

let source: String? = args["from"]
let target: String? = args["to"]
let text: String? = args["text"]
let isDownloadRequireWifi: Bool = args["isDownloadRequireWifi"] ?? true
let source: String? = args["from"] as? String
let target: String? = args["to"] as? String
let text: String? = args["text"] as? String
let isDownloadRequireWifi: Bool = args["isDownloadRequireWifi"] as? Bool ?? true

if source == nil || target == nil || text == nil {
result(FlutterError(
Expand All @@ -49,7 +49,10 @@ public class SwiftLearningTranslatePlugin: NSObject, FlutterPlugin {
return
}

let options = TranslatorOptions(sourceLanguage: source!, targetLanguage: target!)
let options = TranslatorOptions(
sourceLanguage: TranslateLanguage(rawValue: source!),
targetLanguage: TranslateLanguage(rawValue: target!)
)
let translator = Translator.translator(options: options)

let conditions = ModelDownloadConditions(
Expand Down Expand Up @@ -85,15 +88,15 @@ public class SwiftLearningTranslatePlugin: NSObject, FlutterPlugin {
name: "LearningTranslationModelManager", binaryMessenger: registrar.messenger())

modelManagerChannel.setMethodCallHandler({
(call: FlutterMethodCall, result: FlutterResult) -> Void in
(call: FlutterMethodCall, result: @escaping FlutterResult) -> Void in
if call.method == "list" {
listModel(result)
self.listModel(result: result)
} else if call.method == "download" {
downloadModel(call, result)
self.downloadModel(call: call, result: result)
} else if call.method == "check" {
checkModel(call, result)
self.checkModel(call: call, result: result)
} else if call.method == "delete" {
deleteModel(call, result)
self.deleteModel(call: call, result: result)
} else {
result(FlutterMethodNotImplemented)
}
Expand All @@ -107,15 +110,15 @@ public class SwiftLearningTranslatePlugin: NSObject, FlutterPlugin {
}

func checkModel(call: FlutterMethodCall, result: FlutterResult) {
guard let args = call.arguments else {
guard let args = call.arguments as? Dictionary<String, AnyObject> else {
result(FlutterError(
code: "NOARGUMENTS",
message: "No arguments",
details: nil))
return
}

let language: String? = args["model"]
let language: String? = args["model"] as? String

if language == nil {
result(FlutterError(
Expand All @@ -126,21 +129,21 @@ public class SwiftLearningTranslatePlugin: NSObject, FlutterPlugin {
}

let modelManager = ModelManager.modelManager()
let model = TranslateRemoteModel.translateRemoteModel(language: language!)
let model = TranslateRemoteModel.translateRemoteModel(language: TranslateLanguage(rawValue: language!))
result(modelManager.isModelDownloaded(model))
}

func downloadModel(call: FlutterMethodCall, result: FlutterResult) {
guard let args = call.arguments else {
guard let args = call.arguments as? Dictionary<String, AnyObject> else {
result(FlutterError(
code: "NOARGUMENTS",
message: "No arguments",
details: nil))
return
}

let language: String? = args["model"]
let isDownloadRequireWifi: Bool = args["isDownloadRequireWifi"] ?? true
let language: String? = args["model"] as? String
let isDownloadRequireWifi: Bool = args["isDownloadRequireWifi"] as? Bool ?? true

if language == nil {
result(FlutterError(
Expand All @@ -151,7 +154,7 @@ public class SwiftLearningTranslatePlugin: NSObject, FlutterPlugin {
}

let modelManager = ModelManager.modelManager()
let model = TranslateRemoteModel.translateRemoteModel(language: language!)
let model = TranslateRemoteModel.translateRemoteModel(language: TranslateLanguage(rawValue: language!))
let conditions = ModelDownloadConditions(
allowsCellularAccess: !isDownloadRequireWifi,
allowsBackgroundDownloading: true
Expand All @@ -161,16 +164,16 @@ public class SwiftLearningTranslatePlugin: NSObject, FlutterPlugin {
result(true)
}

func deleteModel(call: FlutterMethodCall, result: FlutterResult) {
guard let args = call.arguments else {
func deleteModel(call: FlutterMethodCall, result: @escaping FlutterResult) {
guard let args = call.arguments as? Dictionary<String, AnyObject> else {
result(FlutterError(
code: "NOARGUMENTS",
message: "No arguments",
details: nil))
return
}

let language: String? = args["model"]
let language: String? = args["model"] as? String

if language == nil {
result(FlutterError(
Expand All @@ -181,7 +184,7 @@ public class SwiftLearningTranslatePlugin: NSObject, FlutterPlugin {
}

let modelManager = ModelManager.modelManager()
let model = TranslateRemoteModel.translateRemoteModel(language: language!)
let model = TranslateRemoteModel.translateRemoteModel(language: TranslateLanguage(rawValue: language!))
modelManager.deleteDownloadedModel(model) { error in
result(true)
}
Expand Down