wait #6381 @0.25

diff --git a/app/Elearning/QuizCompiler.php b/app/Elearning/QuizCompiler.php
index fe7d0d44ddb86602bfc8d65b0324542c4738bbf5..768e1d1bbacbc988c890bf4371cd0e5d97769701 100644 (file)
--- a/app/Elearning/QuizCompiler.php
+++ b/app/Elearning/QuizCompiler.php
@@ -136,12 +136,17 @@ class QuizCompiler extends Base
         $this->data['theme'] = new Data($themeData);
     }
 
+
     protected function writeStyles()
     {
+        $darkTheme = $this->theme->isDarkTheme();
+        $textsColor = $this->theme->getTextsColor();
+        $oppositeTextsColor = $this->theme->getTextsColor(true);
+
         // Main texts color
-        $this->sassVariables['texts-color'] = $this->theme->getTextsColor();
+        $this->sassVariables['texts-color'] = $textsColor;
         $this->sassVariables['button-texts-color'] = $this->theme->getButtonTextColor();
-        $this->sassVariables['opposite-texts-color'] = $this->theme->getTextsColor(true);
+        $this->sassVariables['opposite-texts-color'] = $oppositeTextsColor;
         // Font
         $this->sassVariables['font'] = $this->_font($this->theme->font);
         // Colors
@@ -149,6 +154,8 @@ class QuizCompiler extends Base
         $this->sassVariables['neutral-color'] = $this->theme->neutralColor;
         $this->sassVariables['ok-color'] = $this->theme->okColor;
         $this->sassVariables['nok-color'] = $this->theme->nokColor;
+        $this->sassVariables['card-disabled-background'] = $darkTheme ? $this->theme->neutralColor : $textsColor;
+        $this->sassVariables['card-disabled-color'] = $darkTheme ? $textsColor : $oppositeTextsColor;
         // Fonts size:Line Height
         $this->sassVariables['fonts-size'] = "(14: 20px, 16: 22px, 20: 28px, 24: 35px)";
 
@@ -156,8 +163,7 @@ class QuizCompiler extends Base
         $this->sassVariables['intro-fill-area'] = $this->theme->introColor ?: 'transparent';
         $this->sassVariables['outro-fill-area'] = $this->theme->outroColor ?: 'transparent';
         $this->sassVariables['standard-fill-area'] = $this->theme->standardColor ?: 'transparent';
-        $this->sassVariables['drangandrop-area1-fill-area'] = $this->theme->draganddropArea1Color ?: 'transparent';
-        $this->sassVariables['drangandrop-area2-fill-area'] = $this->theme->draganddropArea2Color ?: 'transparent';
+        $this->sassVariables['drangandrop-fill-area'] = $this->theme->draganddropColor ?: 'transparent';
 
         // Main background
         $this->sassVariables['background-color'] = Color::colorToCSS($this->theme->backgroundColor);

diff --git a/app/Models/QuizTheme.php b/app/Models/QuizTheme.php
index 02ea5b65f3038869181719347b4d8be0de9d1d52..c742d10dee084dc9946f779cdfdaa784e4b71b51 100644 (file)
--- a/app/Models/QuizTheme.php
+++ b/app/Models/QuizTheme.php
@@ -38,6 +38,9 @@ class QuizTheme extends ToolboxModel
     const MOBILE_SIZE = '390 x 844px';
     const ICON_SIZE = '512 x 512px';
 
+    const DARK_COLOR = '#383838';
+    const LIGHT_COLOR = '#ffffff';
+
     public function setFields()
     {
         parent::setFields();
@@ -147,6 +150,16 @@ class QuizTheme extends ToolboxModel
         return $this->_getAutoTextColor($this->neutralColor, $this->textColor, $opposite);
     }
 
+    public function isDarkTheme()
+    {
+        return $this->getTextsColor() === self::LIGHT_COLOR;
+    }
+
+    public function isLightTheme()
+    {
+        return !$this->isDarkTheme();
+    }
+
     public function getButtonTextColor($opposite = false)
     {
         return $this->_getAutoTextColor($this->mainColor, $this->buttonTextColor, $opposite);
@@ -154,27 +167,26 @@ class QuizTheme extends ToolboxModel
 
     protected function _getAutoTextColor($base, $color, $opposite = false)
     {
-        $darkColor = '#383838';
-        $lightColor = '#ffffff';
+
 
         if ($color == 'auto' || !$color) {
             // If auto mode, check between black and white which have the biggest distance (i.e. most contrast) with neutralColor
             $neutral = new \Cubist\Util\Graphics\Color($base);
-            $black = new \Cubist\Util\Graphics\Color($darkColor);
-            $white = new \Cubist\Util\Graphics\Color($lightColor);
+            $black = new \Cubist\Util\Graphics\Color(self::DARK_COLOR);
+            $white = new \Cubist\Util\Graphics\Color(self::LIGHT_COLOR);
             $distBlack = $neutral->distance($black);
             $distWhite = $neutral->distance($white);
             if ($distWhite > $distBlack) {
-                $res = $lightColor;
+                $res = self::LIGHT_COLOR;
             } else {
-                $res = $darkColor;
+                $res = self::DARK_COLOR;
             }
         } else {
             $res = match ($color) {
-                'dark' => $darkColor,
-                '#000000' => $darkColor,
-                '#ffffff' => $lightColor,
-                'light' => $lightColor,
+                'dark' => self::DARK_COLOR,
+                '#000000' => self::DARK_COLOR,
+                '#ffffff' => self::LIGHT_COLOR,
+                'light' => self::LIGHT_COLOR,
             };
         }
 
@@ -182,10 +194,10 @@ class QuizTheme extends ToolboxModel
             return $res;
         }
 
-        if ($res === $darkColor) {
-            return $lightColor;
+        if ($res === self::DARK_COLOR) {
+            return self::LIGHT_COLOR;
         } else {
-            return $darkColor;
+            return self::DARK_COLOR;
         }
     }