Skip to content

Feature/remove usage of cloudinary context #43

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

Closed
wants to merge 3 commits into from
Closed

Feature/remove usage of cloudinary context #43

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9373ec0
feature/remove-usage-of-cloudinary-context making cloudinary argument…
TomerPacific Oct 12, 2025
85e504d
feature/remove-usage-of-cloudinary-context making cloudinary argument…
TomerPacific Oct 12, 2025
cac89a6
feature/remove-usage-of-cloudinary-context correcting test by not usi…
TomerPacific Oct 12, 2025
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
5 changes: 1 addition & 4 deletions lib/image/cld_image.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
9 changes: 4 additions & 5 deletions lib/video/cld_video_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ 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';

import 'dart:ui';

class CldVideoController extends VideoPlayerController
with VideoControllerListeners {
@override
late final Uri uri;
@override
late VideoEventsManager eventsManager;
Expand Down Expand Up @@ -43,7 +43,7 @@ class CldVideoController extends VideoPlayerController

CldVideoController({
required String publicId,
Cloudinary? cloudinary,
required Cloudinary cloudinary,
String? version,
String? extension,
String? urlSuffix,
Expand All @@ -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,
Expand All @@ -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);
Expand Down
9 changes: 5 additions & 4 deletions test/cld_video_controller_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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');
Expand All @@ -36,6 +34,7 @@ void main() {

final CldVideoController controller = CldVideoController(
publicId: publicId,
cloudinary: cloudinary,
version: version,
extension: extension,
assetType: assetType,
Expand All @@ -56,6 +55,7 @@ void main() {

final CldVideoController controller = CldVideoController(
publicId: publicId,
cloudinary: cloudinary,
automaticStreamingProfile: true,
);

Expand All @@ -74,6 +74,7 @@ void main() {

final CldVideoController controller = CldVideoController(
publicId: publicId,
cloudinary: cloudinary,
transformation: transformation,
);

Expand Down