Skip to content
Merged
Prev Previous commit
Next Next commit
Implement host sides of new API
  • Loading branch information
stuartmorgan-g committed Jan 5, 2023
commit cbe1026c59f9ff9c3a645cb7ac809931624ac2cd
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,11 @@ public byte[] echoUint8List(@NonNull byte[] aUint8List) {
return aUint8List;
}

@Override
public @NonNull Object echoObject(@NonNull Object anObject) {
return anObject;
}

@Override
public @Nullable String extractNestedNullableString(@NonNull AllNullableTypesWrapper wrapper) {
return wrapper.getValues().getANullableString();
Expand Down Expand Up @@ -124,6 +129,11 @@ public byte[] echoUint8List(@NonNull byte[] aUint8List) {
return aNullableUint8List;
}

@Override
public @Nullable Object echoNullableObject(@Nullable Object aNullableObject) {
return aNullableObject;
}

@Override
public void noopAsync(Result<Void> result) {
result.success(null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@ - (nullable FlutterStandardTypedData *)echoUint8List:(FlutterStandardTypedData *
return aUint8List;
}

- (nullable id)echoObject:(id)anObject error:(FlutterError *_Nullable *_Nonnull)error {
return anObject;
}

- (nullable NSString *)extractNestedNullableStringFrom:(AllNullableTypesWrapper *)wrapper
error:(FlutterError *_Nullable *_Nonnull)error {
return wrapper.values.aNullableString;
Expand Down Expand Up @@ -114,6 +118,11 @@ - (nullable NSString *)echoNullableString:(nullable NSString *)aNullableString
return aNullableUint8List;
}

- (nullable id)echoNullableObject:(nullable id)aNullableObject
error:(FlutterError *_Nullable *_Nonnull)error {
return aNullableObject;
}

- (void)noopAsyncWithCompletion:(void (^)(FlutterError *_Nullable))completion {
completion(nil);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ class TestPlugin: FlutterPlugin, HostIntegrationCoreApi {
return aUint8List
}

override fun fun echoObject(anObject: Any): Any {
return anObject
}

override fun extractNestedNullableString(wrapper: AllNullableTypesWrapper): String? {
return wrapper.values.aNullableString
}
Expand All @@ -75,22 +79,31 @@ class TestPlugin: FlutterPlugin, HostIntegrationCoreApi {
override fun sendMultipleNullableTypes(aNullableBool: Boolean?, aNullableInt: Long?, aNullableString: String?): AllNullableTypes {
return AllNullableTypes(aNullableBool = aNullableBool, aNullableInt = aNullableInt, aNullableString = aNullableString)
}

override fun echoNullableInt(aNullableInt: Long?): Long? {
return aNullableInt
}

override fun echoNullableDouble(aNullableDouble: Double?): Double? {
return aNullableDouble
}

override fun echoNullableBool(aNullableBool: Boolean?): Boolean? {
return aNullableBool
}

override fun echoNullableString(aNullableString: String?): String? {
return aNullableString
}

override fun echoNullableUint8List(aNullableUint8List: ByteArray?): ByteArray? {
return aNullableUint8List
}

override fun fun echoNullableObject(aNullableObject: Any?): Any? {
return aNullableObject
}

override fun noopAsync(callback: () -> Unit) {
callback()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
return aUint8List
}

func echoObject(anObject: Any) -> Any {
return anObject
}

func extractNestedNullableString(wrapper: AllNullableTypesWrapper) -> String? {
return wrapper.values.aNullableString;
}
Expand Down Expand Up @@ -92,6 +96,10 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
return aNullableUint8List
}

func echoNullableObject(aNullableObject: Any?) -> Any? {
return aNullableObject
}

func noopAsync(completion: @escaping () -> Void) {
completion()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
return aUint8List
}

func echoObject(anObject: Any) -> Any {
return anObject
}

func extractNestedNullableString(wrapper: AllNullableTypesWrapper) -> String? {
return wrapper.values.aNullableString;
}
Expand Down Expand Up @@ -92,6 +96,10 @@ public class TestPlugin: NSObject, FlutterPlugin, HostIntegrationCoreApi {
return aNullableUint8List
}

func echoNullableObject(aNullableObject: Any?) -> Any? {
return aNullableObject
}

func noopAsync(completion: @escaping () -> Void) {
completion()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ ErrorOr<std::vector<uint8_t>> TestPlugin::EchoUint8List(
return a_uint8_list;
}

ErrorOr<flutter::EncodableValue> TestPlugin::EchoObject(
const flutter::EncodableValue& an_object) {
return an_object;
}

ErrorOr<std::optional<std::string>> TestPlugin::ExtractNestedNullableString(
const AllNullableTypesWrapper& wrapper) {
const std::string* inner_string = wrapper.values().a_nullable_string();
Expand Down Expand Up @@ -153,6 +158,14 @@ ErrorOr<std::optional<std::vector<uint8_t>>> TestPlugin::EchoNullableUint8List(
return *a_nullable_uint8_list;
};

ErrorOr<std::optional<flutter::EncodableValue>> TestPlugin::EchoNullableObject(
const flutter::EncodableValue* a_nullable_object) {
if (!a_nullable_object) {
return std::nullopt;
}
return *a_nullable_object;
};

void TestPlugin::NoopAsync(
std::function<void(std::optional<FlutterError> reply)> result) {
result(std::nullopt);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,8 @@ class TestPlugin : public flutter::Plugin,
const std::string& a_string) override;
core_tests_pigeontest::ErrorOr<std::vector<uint8_t>> EchoUint8List(
const std::vector<uint8_t>& a_uint8_list) override;
core_tests_pigeontest::ErrorOr<flutter::EncodableValue> EchoObject(
const flutter::EncodableValue& an_object) override;
core_tests_pigeontest::ErrorOr<std::optional<std::string>>
ExtractNestedNullableString(
const core_tests_pigeontest::AllNullableTypesWrapper& wrapper) override;
Expand All @@ -67,7 +69,8 @@ class TestPlugin : public flutter::Plugin,
core_tests_pigeontest::ErrorOr<std::optional<std::vector<uint8_t>>>
EchoNullableUint8List(
const std::vector<uint8_t>* a_nullable_uint8_list) override;

core_tests_pigeontest::ErrorOr<std::optional<flutter::EncodableValue>>
EchoNullableObject(const flutter::EncodableValue* a_nullable_object) override;
void NoopAsync(std::function<
void(std::optional<core_tests_pigeontest::FlutterError> reply)>
result) override;
Expand Down