Merge branch 'main' of https://github.com/EnsembleUI/ensemble

Author: vusters

lib/framework/action.dart

@@ -27,6 +27,7 @@ import 'package:ensemble/framework/widget/view_util.dart';
 import 'package:ensemble/receive_intent_manager.dart';
 import 'package:ensemble/screen_controller.dart';
 import 'package:ensemble/util/utils.dart';
+import 'package:ensemble/widget/stub_widgets.dart';
 import 'package:ensemble_ts_interpreter/invokables/invokable.dart';
 import 'package:flutter/material.dart';
 import 'package:source_span/source_span.dart';
@@ -980,6 +981,25 @@ class SaveKeychain extends EnsembleAction {
   }
 }
 
+class SignInAnonymousAction extends EnsembleAction {
+  final EnsembleAction? onAuthenticated;
+  final EnsembleAction? onError;
+
+  SignInAnonymousAction({
+    super.initiator,
+    super.inputs,
+    required this.onAuthenticated,
+    required this.onError,
+  });
+
+  factory SignInAnonymousAction.fromYaml({Map? payload}) {
+    return SignInAnonymousAction(
+      onAuthenticated: EnsembleAction.fromYaml(payload?['onAuthenticated']),
+      onError: EnsembleAction.fromYaml(payload?['onError']),
+    );
+  }
+}
+
 class ClearKeychain extends EnsembleAction {
   ClearKeychain({
     required this.key,
@@ -1083,6 +1103,8 @@ enum ActionType {
   callNativeMethod,
   deeplinkInit,
   authenticateByBiometric,
+  setLanguage,
+  signInAnonymous,
   handleDeeplink,
   createDeeplink,
   verifySignIn,
@@ -1193,6 +1215,8 @@ abstract class EnsembleAction {
       return FilePickerAction.fromYaml(payload: payload);
     } else if (actionType == ActionType.uploadFiles) {
       return FileUploadAction.fromYaml(payload: payload);
+    } else if (actionType == ActionType.signInAnonymous) {
+      return SignInAnonymousAction.fromYaml(payload: payload);
     } else if (actionType == ActionType.pickFiles) {
       return FilePickerAction.fromYaml(payload: payload);
     } else if (actionType == ActionType.openUrl) {

lib/framework/stub/auth_context_manager.dart

@@ -37,7 +37,8 @@ class AuthenticatedUser with Invokable {
       this.emailLVerified,
       this.tenantId,
       this.creationTime,
-      this.lastSignInTime});
+      this.lastSignInTime,
+      this.isAnonymous = false});
 
   final SignInClient? client;
   SignInProvider? provider;
@@ -55,6 +56,8 @@ class AuthenticatedUser with Invokable {
   DateTime? creationTime;
   DateTime? lastSignInTime;
 
+  bool isAnonymous;
+
   // optional server credentials (bearer token, cookies, ....) associated with this user account
   // TODO: move to secure storage
   Map? data;

lib/framework/theme_manager.dart

@@ -268,7 +268,7 @@ class EnsembleTheme {
       String key = '.$className'; // Prepend '.' to match the style keys
       var classStyle = styles[key];
       if (classStyle != null) {
-        resolvedStyles = {...resolvedStyles, ...classStyle};
+        resolvedStyles = mergeMaps(resolvedStyles, classStyle);
       }
     }
     return resolvedStyles;

lib/layout/helpers/list_view_core.dart

@@ -69,6 +69,7 @@ class ListViewCore extends StatefulWidget {
     this.loadingBuilder,
     this.errorBuilder,
     this.separatorBuilder,
+    this.onScroll,
   });
 
   final bool shrinkWrap;
@@ -89,20 +90,27 @@ class ListViewCore extends StatefulWidget {
   final WidgetBuilder? errorBuilder;
   final IndexedWidgetBuilder? separatorBuilder;
   final ItemBuilder itemBuilder;
+  final void Function(double)? onScroll;
 
   @override
   State<ListViewCore> createState() => _ListViewCoreState();
 }
 
 class _ListViewCoreState extends State<ListViewCore> {
   late final Debouncer debounce;
+  late final Debouncer _scrollDebouce;
+  late final ScrollController _scrollController;
 
   int? _lastFetchedIndex;
 
   @override
   void initState() {
     super.initState();
     debounce = Debouncer(widget.debounceDuration);
+    _scrollDebouce = Debouncer(const Duration(milliseconds: 15));
+    _scrollController = widget.scrollController ?? ScrollController();
+    _scrollController.addListener(_onScroll);
+
     attemptFetch();
   }
 
@@ -116,8 +124,13 @@ class _ListViewCoreState extends State<ListViewCore> {
 
   @override
   void dispose() {
-    super.dispose();
+    _scrollController.removeListener(_onScroll);
+    if (widget.scrollController == null) {
+      _scrollController.dispose();
+    }
     debounce.cancel();
+    _scrollDebouce.cancel();
+    super.dispose();
   }
 
   void attemptFetch() {
@@ -135,6 +148,14 @@ class _ListViewCoreState extends State<ListViewCore> {
     }
   }
 
+  void _onScroll() {
+    if (widget.onScroll != null) {
+      _scrollDebouce.run(() {
+        widget.onScroll?.call(_scrollController.position.pixels);
+      });
+    }
+  }
+
   WidgetBuilder get loadingBuilder =>
       widget.loadingBuilder ??
       (context) => const Center(child: flutter.CircularProgressIndicator());
@@ -162,7 +183,7 @@ class _ListViewCoreState extends State<ListViewCore> {
       scrollDirection: widget.scrollDirection,
       reverse: widget.reverse,
       shrinkWrap: widget.shrinkWrap,
-      controller: widget.scrollController,
+      controller: _scrollController,
       physics: widget.physics,
       cacheExtent: widget.cacheExtent,
       slivers: [

lib/layout/list_view.dart

@@ -1,6 +1,7 @@
 import 'package:ensemble/action/haptic_action.dart';
 import 'package:ensemble/framework/action.dart';
 import 'package:ensemble/framework/error_handling.dart';
+import 'package:ensemble/framework/event.dart';
 import 'package:ensemble/framework/scope.dart';
 import 'package:ensemble/framework/studio/studio_debugger.dart';
 import 'package:ensemble/framework/view/data_scope_widget.dart';
@@ -79,6 +80,8 @@ class ListView extends StatefulWidget
           _controller.hasReachedMax = Utils.getBool(value, fallback: false),
       'loadingWidget': (value) => _controller.loadingWidget = value,
       'data': (value) => _controller.itemTemplate?.data = value,
+      'onScroll': (value) =>
+          controller.onScroll = EnsembleAction.fromYaml(value, initiator: this),
     };
   }
 
@@ -113,6 +116,7 @@ class ListViewController extends BoxLayoutController {
   bool hasReachedMax = false;
 
   ListViewState? widgetState;
+  EnsembleAction? onScroll;
 
   void _bind(ListViewState state) {
     widgetState = state;
@@ -177,6 +181,15 @@ class ListViewState extends WidgetState<ListView>
       isLoading: showLoading,
       onFetchData: _fetchData,
       hasReachedMax: widget._controller.hasReachedMax,
+      onScroll: (pixel) {
+        if (widget._controller.onScroll != null) {
+          ScreenController().executeAction(
+            context,
+            widget._controller.onScroll!,
+            event: EnsembleEvent(null, data: {'pixel': pixel}),
+          );
+        }
+      },
       scrollController: (footerScope != null &&
               footerScope.isColumnScrollableAndRoot(context))
           ? null

lib/module/auth_module.dart

@@ -16,7 +16,7 @@ class AuthModuleStub implements AuthModule {
     GetIt.I.registerFactory<SignInWithAuth0>(() => const SignInWithAuth0Stub());
     GetIt.I.registerSingleton<TokenManager>(TokenManagerStub());
     GetIt.I.registerFactory<OAuthController>(() => OAuthControllerStub());
-
+    GetIt.I.registerFactory<SignInAnonymous>(() => SignInAnonymousStub());
     // note that we don't inject AuthContextManagerStub(), since its presence
     // will prevent data_context to load
   }

lib/provider.dart

@@ -132,6 +132,7 @@ class RemoteDefinitionProvider extends DefinitionProvider {
       : super(i18nProps, cacheEnabled: cacheEnabled);
   final String path;
   final String appHome;
+  UserAppConfig? appConfig;
   FlutterI18nDelegate? _i18nDelegate;
 
   @override
@@ -172,12 +173,19 @@ class RemoteDefinitionProvider extends DefinitionProvider {
 
   @override
   Future<AppBundle> getAppBundle({bool? bypassCache = false}) async {
+    final env = await _readYamlFile('appConfig.yaml');
+    if (env != null) {
+      appConfig = UserAppConfig(
+        baseUrl: path,
+        envVariables: env as Map<String, dynamic>,
+      );
+    }
     return AppBundle(
-        theme: await _readFile('theme.ensemble'),
-        resources: await _readFile('resources.ensemble'));
+        theme: await _readYamlFile('theme.ensemble'),
+        resources: await _readYamlFile('resources.ensemble'));
   }
 
-  Future<YamlMap?> _readFile(String file) async {
+  Future<YamlMap?> _readYamlFile(String file) async {
     try {
       http.Response response = await http.get(Uri.parse(path + file));
       if (response.statusCode == 200) {
@@ -189,16 +197,14 @@ class RemoteDefinitionProvider extends DefinitionProvider {
     return null;
   }
 
-  // TODO: to be implemented
   @override
   UserAppConfig? getAppConfig() {
-    return null;
+    return appConfig;
   }
 
-  // TODO: to be implemented
   @override
   Map<String, String> getSecrets() {
-    return <String, String>{};
+    return dotenv.env;
   }
 }
 

lib/screen_controller.dart

@@ -34,6 +34,7 @@ import 'package:ensemble/layout/ensemble_page_route.dart';
 import 'package:ensemble/page_model.dart';
 import 'package:ensemble/util/notification_utils.dart';
 import 'package:ensemble/util/utils.dart';
+import 'package:ensemble/widget/stub_widgets.dart';
 import 'package:ensemble_ts_interpreter/invokables/context.dart';
 import 'package:ensemble_ts_interpreter/parser/newjs_interpreter.dart';
 import 'package:flutter/foundation.dart';
@@ -465,6 +466,8 @@ class ScreenController {
           scopeManager: scopeManager);
     } else if (action is FilePickerAction) {
       GetIt.I<FileManager>().pickFiles(context, action, scopeManager);
+    } else if (action is SignInAnonymousAction) {
+      GetIt.I<SignInAnonymous>().signInAnonymously(context, action: action);
     } else if (action is WalletConnectAction) {
       //  TODO store session:  WalletConnectSession? session = await sessionStorage.getSession();
 

lib/widget/stub_widgets.dart

@@ -1,4 +1,6 @@
+import 'package:ensemble/framework/action.dart';
 import 'package:ensemble/framework/error_handling.dart';
+import 'package:ensemble/framework/scope.dart';
 import 'package:flutter/cupertino.dart';
 
 class StubWidget extends StatelessWidget {
@@ -52,3 +54,17 @@ abstract class SignInWithAuth0 {
 class SignInWithAuth0Stub extends StubWidget implements SignInWithAuth0 {
   const SignInWithAuth0Stub({super.key}) : super(moduleName: 'Auth');
 }
+
+abstract class SignInAnonymous {
+  Future<void> signInAnonymously(BuildContext context,
+      {required SignInAnonymousAction action});
+}
+
+class SignInAnonymousStub implements SignInAnonymous {
+  @override
+  Future<void> signInAnonymously(BuildContext context,
+      {required SignInAnonymousAction action}) {
+    throw ConfigError(
+        "Auth is not enabled. Please review the Ensemble documentation.");
+  }
+}