From 9fb376d8b2affdeb1089244ba46b6f4e3703d8f0 Mon Sep 17 00:00:00 2001
From: maxpozdeev <maxpozdeev@gmail.com>
Date: Wed, 6 Sep 2023 14:35:03 +0300
Subject: [PATCH] + add setting for compulsory dark theme (closes GH-70)

---
 src/content/theme/dark.css    | 7 ++++---
 src/includes/class.config.php | 2 +-
 src/includes/lang/en.json     | 3 ++-
 src/includes/lang/ru.json     | 1 +
 src/includes/theme.php        | 2 +-
 src/settings.php              | 5 +++--
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/content/theme/dark.css b/src/content/theme/dark.css
index 7a856fe..a3bb232 100644
--- a/src/content/theme/dark.css
+++ b/src/content/theme/dark.css
@@ -5,9 +5,10 @@
 
 /* Dark mode */
 
-@media (prefers-color-scheme: dark) {
+/* prefers-color-scheme media query value detected in js part */
+html[data-appearance=dark],
+html[data-appearance=system][data-system-appearance=dark] {
 
-  :root {
     color-scheme: dark;
 
     --color-bg: #151515;
@@ -95,5 +96,5 @@
 
     /*--svg-select: url(images/select-dark.svg);*/
     --svg-select: url("data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAxNCAxNCI+PHBvbHlsaW5lIHBvaW50cz0iMiA2LCA3IDExLCAxMiA2IiBzdHJva2Utd2lkdGg9IjIiIHN0cm9rZT0iI2FhYSIgZmlsbD0ibm9uZSIvPjwvc3ZnPg==");
-  }
+
 }
diff --git a/src/includes/class.config.php b/src/includes/class.config.php
index 028e6d2..4daaf02 100644
--- a/src/includes/class.config.php
+++ b/src/includes/class.config.php
@@ -86,7 +86,7 @@ class Config
         'markup' => array('default'=>'markdown', 'type'=>'s'),
 
         # Appearance: system default or always light
-        'appearance' => array('default'=>'system', 'type'=>'s', 'options'=>array('system','light')),
+        'appearance' => array('default'=>'system', 'type'=>'s', 'options'=>array('system','light','dark')),
 
         # Array of activated extensions
         'extensions' => array('default'=>[], 'type'=>'a')
diff --git a/src/includes/lang/en.json b/src/includes/lang/en.json
index dc9b0db..e58daa2 100644
--- a/src/includes/lang/en.json
+++ b/src/includes/lang/en.json
@@ -184,7 +184,8 @@
     "set_showtime": "Show time",
     "set_appearance": "Appearance",
     "set_appearance_system": "Same as system",
-    "set_appearance_light": "Light theme",
+    "set_appearance_light": "Light",
+    "set_appearance_dark": "Dark",
     "set_extensions": "Extensions",
     "set_activate": "Activate",
     "set_deactivate": "Deactivate",
diff --git a/src/includes/lang/ru.json b/src/includes/lang/ru.json
index 1d6a5f8..3e4b23d 100644
--- a/src/includes/lang/ru.json
+++ b/src/includes/lang/ru.json
@@ -185,6 +185,7 @@
     "set_appearance": "Тема оформления",
     "set_appearance_system": "Как в системе",
     "set_appearance_light": "Светлая",
+    "set_appearance_dark": "Тёмная",
     "set_extensions": "Дополнения",
     "set_activate": "Активировать",
     "set_deactivate": "Деактивировать",
diff --git a/src/includes/theme.php b/src/includes/theme.php
index c9ca917..5ab2bc4 100644
--- a/src/includes/theme.php
+++ b/src/includes/theme.php
@@ -12,7 +12,7 @@
   <link rel="icon" type="image/gif" href="<?php mttinfo('theme_url'); ?>images/logo.gif">
   <link rel="stylesheet" type="text/css" href="<?php mttinfo('theme_url'); ?>style.css?v=<?php mttinfo('version'); ?>" media="all">
   <link rel="stylesheet" type="text/css" href="<?php mttinfo('theme_url'); ?>markdown.css?v=<?php mttinfo('version'); ?>" media="all">
-  <?php if (get_mttinfo('appearance') == 'system'): ?>
+  <?php if (in_array(get_mttinfo('appearance'), ['system','dark'])): ?>
   <link rel="stylesheet" type="text/css" href="<?php mttinfo('theme_url'); ?>dark.css?v=<?php mttinfo('version'); ?>" media="screen">
   <?php endif; ?>
   <link rel="stylesheet" type="text/css" href="<?php mttinfo('theme_url'); ?>print.css?v=<?php mttinfo('version'); ?>" media="print">
diff --git a/src/settings.php b/src/settings.php
index f23fe0b..8f75a0d 100644
--- a/src/settings.php
+++ b/src/settings.php
@@ -368,8 +368,9 @@ header('Content-type:text/html; charset=utf-8');
 <div class="tr">
 <div class="th"><?php _e('set_appearance');?>:</div>
 <div class="td">
- <label><input type="radio" name="appearance" value="system" <?php if(_c('appearance') == 'system') echo 'checked="checked"'; ?> /> <?php _e('set_appearance_system');?></label> <br/>
- <label><input type="radio" name="appearance" value="light"  <?php if(_c('appearance') == 'light')  echo 'checked="checked"'; ?> /> <?php _e('set_appearance_light');?></label>
+ <label><input type="radio" name="appearance" value="system" <?php if(_c('appearance') == 'system') echo 'checked="checked"'; ?> /> <?php _e('set_appearance_system');?></label> <br>
+ <label><input type="radio" name="appearance" value="light"  <?php if(_c('appearance') == 'light')  echo 'checked="checked"'; ?> /> <?php _e('set_appearance_light');?></label> <br>
+ <label><input type="radio" name="appearance" value="dark"  <?php if(_c('appearance') == 'dark')  echo 'checked="checked"'; ?> /> <?php _e('set_appearance_dark');?></label>
 </div>
 </div>