Check in Riverlea extension with history from v0.7

.gitignore

@@ -42,6 +42,7 @@
 !/ext/scheduled_communications
 !/ext/user_dashboard
 !/ext/tellafriend
+!/ext/riverlea
 backdrop/
 bower_components
 CRM/Case/xml/configuration

distmaker/dists/backdrop.sh

@@ -25,7 +25,6 @@ dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
 dm_install_drupal "$SRC/backdrop" "$TRG/backdrop"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
-dm_install_cvext riverlea "$TRG/ext/riverlea"
 
 dm_h1 "Generate archive (civicrm-*-backdrop.tar.gz)"
 cd $TRG/..

distmaker/dists/drupal7.sh

@@ -25,7 +25,6 @@ dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
 dm_install_drupal "$SRC/drupal" "$TRG/drupal"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
-dm_install_cvext riverlea "$TRG/ext/riverlea"
 
 dm_h1 "Generate archive (civicrm-*-drupal.tar.gz)"
 cd $TRG/..

distmaker/dists/drupal7_dir.sh

@@ -32,7 +32,6 @@ dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
 dm_install_drupal "$DM_DRUPALDIR" "$TRG/drupal"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
-dm_install_cvext riverlea "$TRG/ext/riverlea"
 
 dm_h1 "Generate archive (civicrm-*-drupal dir)"
 cd $TRG

distmaker/dists/drupal7_sk.sh

@@ -25,7 +25,6 @@ dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
 dm_install_drupal "$SRC/drupal" "$TRG/drupal"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
-dm_install_cvext riverlea "$TRG/ext/riverlea"
 
 dm_h1 "Prune packages"
 # delete packages that distributions on Drupal.org repalce if present

distmaker/dists/joomla4.sh

@@ -24,7 +24,6 @@ dm_install_packages "$SRC/packages" "$TRG/packages"
 dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
-dm_install_cvext riverlea "$TRG/ext/riverlea"
 
 ## WTF: It's so good we'll install it twice!
 ## (The first is probably extraneous, but there could be bugs dependent on it.)

distmaker/dists/joomla5bc.sh

@@ -25,7 +25,6 @@ dm_install_vendor "$SRC/vendor" "$TRG/vendor"
 rm -rf "$TRG/vendor/psr/log"
 dm_install_bower "$SRC/bower_components" "$TRG/bower_components"
 dm_install_cvext com.iatspayments.civicrm "$TRG/ext/iatspayments"
-dm_install_cvext riverlea "$TRG/ext/riverlea"
 
 ## WTF: It's so good we'll install it twice!
 ## (The first is probably extraneous, but there could be bugs dependent on it.)

distmaker/dists/standalone.sh

@@ -22,7 +22,6 @@ dm_install_packages "$SRC/packages" "$TRG/core/packages"
 dm_install_vendor "$SRC/vendor" "$TRG/core/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/core/bower_components"
 dm_install_cvext com.iatspayments.civicrm "$TRG/core/ext/iatspayments"
-dm_install_cvext riverlea "$TRG/core/ext/riverlea"
 "$SRC/tools/standalone/bin/scaffold" "$TRG"
 
 dm_h1 "Generate archive (civicrm-*-standalone.tar.gz)"

distmaker/dists/wordpress.sh

@@ -25,7 +25,6 @@ dm_install_vendor "$SRC/vendor" "$TRG/civicrm/civicrm/vendor"
 dm_install_bower "$SRC/bower_components" "$TRG/civicrm/civicrm/bower_components"
 dm_install_wordpress "$SRC/WordPress" "$TRG/civicrm"
 dm_install_cvext com.iatspayments.civicrm "$TRG/civicrm/civicrm/ext/iatspayments"
-dm_install_cvext riverlea "$TRG/civicrm/civicrm/ext/riverlea"
 
 dm_h1 "Generate archive (civicrm-*-wordpress.zip)"
 cd $TRG

ext/riverlea/.gitignore

@@ -0,0 +1,4 @@
+node_modules
+css/.DS_store
+.DS_store
+streams/thames/css/aah

ext/riverlea/Civi/riverlea/DynamicCss.php

@@ -0,0 +1,114 @@
+<?php
+
+namespace Civi\riverlea;
+
+use \CRM_riverlea_ExtensionUtil as E;
+
+/**
+ * This class generates a `river.css` file for Riverlea themes containing
+ * dynamically generated css content
+ *
+ * At the moment this is used to serve the right vars for a given dark mode setting
+ *
+ * In the future it might allow other dynamic tweaks
+ *
+ * @service riverlea.dynamic_css
+ */
+class DynamicCss implements \Symfony\Component\EventDispatcher\EventSubscriberInterface, \Civi\Core\Service\AutoServiceInterface {
+
+  use \Civi\Core\Service\AutoServiceTrait;
+
+  public const CSS_FILE = 'river.css';
+
+  public static function getSubscribedEvents() {
+    return [
+      'hook_civicrm_buildAsset' => ['buildAssetCss', 0],
+    ];
+  }
+
+  public static function getCssParams(): array {
+    $darkModeSetting = \CRM_Utils_System::isFrontendPage() ?
+      \Civi::settings()->get('riverlea_dark_mode_frontend') :
+      \Civi::settings()->get('riverlea_dark_mode_backend');
+
+    return [
+      'stream' => \Civi::service('themes')->getActiveThemeKey(),
+      'dark' => $darkModeSetting,
+    ];
+  }
+
+  /**
+   * Generate asset content (when accessed via AssetBuilder).
+   *
+   * @param \Civi\Core\Event\GenericHookEvent $event
+   *
+   * @see CRM_Utils_hook::buildAsset()
+   * @see \Civi\Core\AssetBuilder
+   */
+  public static function buildAssetCss($e) {
+    if ($e->asset !== static::CSS_FILE) {
+      return;
+    }
+    $e->mimeType = 'text/css';
+
+    $params = $e->params;
+
+    $stream = $params['stream'] ?? 'empty';
+
+    $content = [];
+
+    // add base vars for the stream
+    $content[] = self::getCSSFromFile('_variables.css', $stream);
+
+    switch ($params['dark'] ?? NULL) {
+      case 'light':
+        // nothing more to do
+        break;
+
+      case 'dark':
+        // add dark vars unconditionally
+        $content[] = self::getCSSFromFile('_dark.css', $stream);
+        break;
+
+      case 'inherit':
+      default:
+        // add dark vars wrapped inside a media query
+        $content[] = '@media (prefers-color-scheme: dark) {';
+        $content[] = self::getCSSFromFile('_dark.css', $stream);
+        $content[] = '}';
+        break;
+    }
+
+    $e->content = implode("\n", $content);
+  }
+
+  /**
+   * Check file exists and return contents or empty string
+   *
+   * @param string $cssFileName The name of the css file (eg. _variables.css)
+   * @param string $stream The name of the riverlea stream (eg. walbrook)
+   *
+   * @return string
+   */
+  private static function getCSSFromFile(string $cssFileName, string $stream): string {
+    $res = \Civi::resources();
+    $theme = \Civi::service('themes')->get($stream);
+    $file = '';
+    // For riverlea themes CSS should be located in stream/streamname/css - prefix="stream/streamname/"
+    if (isset($theme['prefix'])) {
+      $file .= $theme['prefix'];
+    }
+    // Append css dir and filename so we end up with stream/streamname/css/filename.css
+    $file .= 'css/' . $cssFileName;
+    $file = $res->filterMinify($theme['ext'], $file);
+
+    // Now get the full path for the css file
+    $filePath = $res->getPath($theme['ext'], $file);
+    if (is_file($filePath)) {
+      // File exists and is a file? Return it!
+      return file_get_contents($filePath) ?? '';
+    }
+    return '';
+  }
+
+}