From 9373ec04848220bdb6d28e8c18e70d31eb916f14 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 12 Oct 2025 22:50:18 +0300 Subject: [PATCH 1/3] feature/remove-usage-of-cloudinary-context making cloudinary argument required instead of optional and removing the usage of cloudinary context --- lib/image/cld_image.dart | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/lib/image/cld_image.dart b/lib/image/cld_image.dart index ae632ef..c6524a8 100644 --- a/lib/image/cld_image.dart +++ b/lib/image/cld_image.dart @@ -5,8 +5,6 @@ import 'package:cloudinary_url_gen/transformation/transformation.dart'; import 'package:cloudinary_flutter/image/no_disk_cache_manager.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter_cache_manager/flutter_cache_manager.dart'; - -import '../cloudinary_context.dart'; import 'cld_image_widget_configuration.dart'; /// A widget that displays a Cloudinary-hosted image. Its constructor offers various attributes to customize image presentation. @@ -20,7 +18,7 @@ class CldImageWidget extends CachedNetworkImage { {required String publicId, super.key, this.configuration, - Cloudinary? cloudinary, + required Cloudinary cloudinary, String? version, String? extension, String? urlSuffix, @@ -65,7 +63,6 @@ class CldImageWidget extends CachedNetworkImage { fit: fit, repeat: repeat, matchTextDirection: matchTextDirection) { - cloudinary ??= CloudinaryContext.cloudinary; cldImage = cloudinary.image(publicId); if (version != null) { cldImage.version(version); From 85e504d0d8c2182ac22ea3d28106492433843f16 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 12 Oct 2025 22:50:31 +0300 Subject: [PATCH 2/3] feature/remove-usage-of-cloudinary-context making cloudinary argument required instead of optional and removing the usage of cloudinary context --- lib/video/cld_video_controller.dart | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/video/cld_video_controller.dart b/lib/video/cld_video_controller.dart index 353098e..14cda4e 100644 --- a/lib/video/cld_video_controller.dart +++ b/lib/video/cld_video_controller.dart @@ -4,7 +4,6 @@ import 'package:cloudinary_url_gen/transformation/transformation.dart'; import 'package:cloudinary_url_gen/transformation/video_edit/transcode/transcode.dart'; import 'package:cloudinary_url_gen/transformation/video_edit/transcode/transcode_actions.dart'; import 'package:video_player/video_player.dart'; -import '../cloudinary_context.dart'; import 'analytics/video_analytics.dart'; import 'analytics/video_events_manager.dart'; @@ -12,6 +11,7 @@ import 'dart:ui'; class CldVideoController extends VideoPlayerController with VideoControllerListeners { + @override late final Uri uri; @override late VideoEventsManager eventsManager; @@ -43,7 +43,7 @@ class CldVideoController extends VideoPlayerController CldVideoController({ required String publicId, - Cloudinary? cloudinary, + required Cloudinary cloudinary, String? version, String? extension, String? urlSuffix, @@ -62,13 +62,13 @@ class CldVideoController extends VideoPlayerController transformation, automaticStreamingProfile)) { eventsManager = VideoEventsManager( - cloudName: cloudinary?.config.cloudConfig.cloudName, + cloudName: cloudinary.config.cloudConfig.cloudName, publicId: publicId); } static Uri _buildVideoUri( String publicId, - Cloudinary? cloudinary, + Cloudinary cloudinary, String? version, String? extension, String? urlSuffix, @@ -77,7 +77,6 @@ class CldVideoController extends VideoPlayerController Transformation? transformation, bool? automaticStreamingProfile, ) { - cloudinary ??= CloudinaryContext.cloudinary; CldVideo video = cloudinary.video(publicId); ((version != null) ? video.version(version) : null); ((extension != null) ? video.extension(extension) : null); From cac89a6322f0afe27836f467fb5cc5e28d17503a Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 12 Oct 2025 22:50:49 +0300 Subject: [PATCH 3/3] feature/remove-usage-of-cloudinary-context correcting test by not using cloudinary context --- test/cld_video_controller_test.dart | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/cld_video_controller_test.dart b/test/cld_video_controller_test.dart index b8c86d9..8c35503 100644 --- a/test/cld_video_controller_test.dart +++ b/test/cld_video_controller_test.dart @@ -1,4 +1,3 @@ -import 'package:cloudinary_flutter/cloudinary_context.dart'; import 'package:cloudinary_flutter/cloudinary_object.dart'; import 'package:cloudinary_flutter/video/analytics/video_analytics.dart'; import 'package:cloudinary_flutter/video/cld_video_controller.dart'; @@ -10,9 +9,8 @@ import 'package:shared_preferences/shared_preferences.dart'; void main() { SharedPreferences.setMockInitialValues({'user_id': '12345'}); - CloudinaryContext.cloudinary = - Cloudinary.fromCloudName(cloudName: 'test_cloud'); - CloudinaryContext.cloudinary.config.urlConfig.analytics = false; + Cloudinary cloudinary = CloudinaryObject.fromCloudName(cloudName: 'test_cloud'); + cloudinary.config.urlConfig.analytics = false; group('CldVideoController Tests', () { test('CldVideoController.networkUrl() sets correct URI', () { final Uri testUri = Uri.parse('https://example.com/video.mp4'); @@ -36,6 +34,7 @@ void main() { final CldVideoController controller = CldVideoController( publicId: publicId, + cloudinary: cloudinary, version: version, extension: extension, assetType: assetType, @@ -56,6 +55,7 @@ void main() { final CldVideoController controller = CldVideoController( publicId: publicId, + cloudinary: cloudinary, automaticStreamingProfile: true, ); @@ -74,6 +74,7 @@ void main() { final CldVideoController controller = CldVideoController( publicId: publicId, + cloudinary: cloudinary, transformation: transformation, );