Skip to content
Merged
Changes from all commits
Commits
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
35 changes: 30 additions & 5 deletions modules/ensemble/lib/widget/image.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import 'dart:io';
import 'dart:io' as io;

import 'package:cached_network_image/cached_network_image.dart';
import 'package:ensemble/action/haptic_action.dart';
import 'package:ensemble/framework/action.dart';
import 'package:ensemble/framework/data_context.dart';
import 'package:ensemble/framework/event.dart';
import 'package:ensemble/framework/widget/colored_box_placeholder.dart';
import 'package:ensemble/framework/widget/widget.dart';
Expand All @@ -11,7 +12,6 @@ import 'package:ensemble/util/utils.dart';
import 'package:ensemble/widget/helpers/ColorFilter_Composite.dart';
import 'package:ensemble/widget/helpers/box_wrapper.dart';
import 'package:ensemble/widget/helpers/controllers.dart';
import 'package:ensemble/widget/helpers/widgets.dart';
import 'package:ensemble_ts_interpreter/invokables/invokable.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
Expand Down Expand Up @@ -45,6 +45,7 @@ class EnsembleImage extends StatefulWidget
'placeholderColor': () => _controller.placeholderColor,
'colorFilter': () =>
_controller.colorFilter?.toString() ?? 'null',
'headers': () => _controller.headers,
};
}

Expand Down Expand Up @@ -74,7 +75,8 @@ class EnsembleImage extends StatefulWidget
'pinchToZoom': (value) =>
_controller.pinchToZoom = Utils.optionalBool(value),
'colorFilter': (value) => _controller.colorFilter = ColorFilterComposite.from(value),

'headers': (value) => _controller.headers = Utils.getMap(value)
?.map((key, value) => MapEntry(key.toString(), value.toString())),
};
}
}
Expand All @@ -101,6 +103,7 @@ class ImageController extends BoxController {
dynamic fallback;
bool cache = true;
bool? pinchToZoom;
Map<String, String>? headers;
}

class ImageState extends EWidgetState<EnsembleImage> {
Expand Down Expand Up @@ -166,10 +169,30 @@ class ImageState extends EWidgetState<EnsembleImage> {
return rtn;
}

/// Evaluate headers using DataContext
Map<String, String>? _evaluateHeaders() {
if (widget._controller.headers == null) {
return null;
}

DataContext? dataContext = scopeManager?.dataContext;
if (dataContext == null) {
return widget._controller.headers;
}

Map<String, String> evaluatedHeaders = {};
widget._controller.headers!.forEach((key, value) {
evaluatedHeaders[key] = dataContext.eval(value).toString();
});
return evaluatedHeaders;
}

Future<String> fetch(String url) async {
String str = (widget.controller.source.contains("?")) ? "&" : "?";
final http.Response response = await http
.get(Uri.parse("$url${str}timeStamp=${DateTime.now().toString()}"));
.get(
Uri.parse("$url${str}timeStamp=${DateTime.now().toString()}"),
headers: _evaluateHeaders());
DateTime lastModifiedDateTime =
parseHttpDate("${response.headers['last-modified']}");
if (widget._controller.lastModifiedCache == null ||
Expand Down Expand Up @@ -237,6 +260,7 @@ class ImageState extends EWidgetState<EnsembleImage> {
width: widget._controller.width?.toDouble(),
height: widget._controller.height?.toDouble(),
),
httpHeaders: _evaluateHeaders(),
);
}

Expand Down Expand Up @@ -267,7 +291,7 @@ class ImageState extends EWidgetState<EnsembleImage> {
height: widget._controller.height?.toDouble(),
fit: fit,
errorBuilder: (context, error, stacktrace) => errorFallback())
: Image.file(File(widget._controller.source),
: Image.file(io.File(widget._controller.source),
width: widget._controller.width?.toDouble(),
height: widget._controller.height?.toDouble(),
fit: fit,
Expand Down Expand Up @@ -315,6 +339,7 @@ class ImageState extends EWidgetState<EnsembleImage> {
width: widget._controller.width?.toDouble(),
height: widget._controller.height?.toDouble(),
),
headers: _evaluateHeaders(),
);
}
// attempt local assets
Expand Down
Loading