diff --git a/images/platforms/white/bridgy_fed.svg b/images/platforms/white/bridgy_fed.svg index 90fe34d8be..4326188486 100644 --- a/images/platforms/white/bridgy_fed.svg +++ b/images/platforms/white/bridgy_fed.svg @@ -1,11 +1,12 @@ - - - - - - + + + + + + + + + + + diff --git a/images/platforms/white/bridgy_fed.svg.license b/images/platforms/white/bridgy_fed.svg.license index 330e2cb8af..3ffce40c5f 100644 --- a/images/platforms/white/bridgy_fed.svg.license +++ b/images/platforms/white/bridgy_fed.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design -SPDX-License-Identifier: CC0-1.0 +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/calckey.svg b/images/platforms/white/calckey.svg index 90fe34d8be..05de635f32 100644 --- a/images/platforms/white/calckey.svg +++ b/images/platforms/white/calckey.svg @@ -1,11 +1,5 @@ - - - - - - + + + + diff --git a/images/platforms/white/castopod.svg b/images/platforms/white/castopod.svg new file mode 100644 index 0000000000..a6c0c6df5e --- /dev/null +++ b/images/platforms/white/castopod.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/images/platforms/white/castopod.svg.license b/images/platforms/white/castopod.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/castopod.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/dolphin.svg b/images/platforms/white/dolphin.svg new file mode 100644 index 0000000000..590bb6728d --- /dev/null +++ b/images/platforms/white/dolphin.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/images/platforms/white/dolphin.svg.license b/images/platforms/white/dolphin.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/dolphin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/flohmarkt.svg b/images/platforms/white/flohmarkt.svg new file mode 100644 index 0000000000..cbab50efe0 --- /dev/null +++ b/images/platforms/white/flohmarkt.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/images/platforms/white/flohmarkt.svg.license b/images/platforms/white/flohmarkt.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/flohmarkt.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/glitch-soc.svg b/images/platforms/white/glitch-soc.svg new file mode 100644 index 0000000000..54ad242c76 --- /dev/null +++ b/images/platforms/white/glitch-soc.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/images/platforms/white/glitch-soc.svg.license b/images/platforms/white/glitch-soc.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/glitch-soc.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/guppe.svg b/images/platforms/white/guppe.svg new file mode 100644 index 0000000000..25b62c1a56 --- /dev/null +++ b/images/platforms/white/guppe.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/platforms/white/guppe.svg.license b/images/platforms/white/guppe.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/guppe.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/hollo.svg b/images/platforms/white/hollo.svg new file mode 100644 index 0000000000..ad53ba31f8 --- /dev/null +++ b/images/platforms/white/hollo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/platforms/white/hollo.svg.license b/images/platforms/white/hollo.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/hollo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/hubzilla.svg b/images/platforms/white/hubzilla.svg new file mode 100644 index 0000000000..9c9168a4c1 --- /dev/null +++ b/images/platforms/white/hubzilla.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/platforms/white/hubzilla.svg.license b/images/platforms/white/hubzilla.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/hubzilla.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/iceshrimp.svg b/images/platforms/white/iceshrimp.svg new file mode 100644 index 0000000000..7b942fe652 --- /dev/null +++ b/images/platforms/white/iceshrimp.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/images/platforms/white/iceshrimp.svg.license b/images/platforms/white/iceshrimp.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/iceshrimp.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/kbin.svg b/images/platforms/white/kbin.svg index 2867d2d37c..7cc7811bde 100644 --- a/images/platforms/white/kbin.svg +++ b/images/platforms/white/kbin.svg @@ -1 +1,4 @@ - \ No newline at end of file + + + + diff --git a/images/platforms/white/kbin.svg.license b/images/platforms/white/kbin.svg.license index bf13a3d696..3ffce40c5f 100644 --- a/images/platforms/white/kbin.svg.license +++ b/images/platforms/white/kbin.svg.license @@ -1,2 +1,2 @@ -SPDX-FileCopyrightText: iconify https://icon-sets.iconify.design -SPDX-License-Identifier: MIT +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/loforo.svg b/images/platforms/white/loforo.svg new file mode 100644 index 0000000000..76724dd834 --- /dev/null +++ b/images/platforms/white/loforo.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/platforms/white/loforo.svg.license b/images/platforms/white/loforo.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/loforo.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/loops.svg b/images/platforms/white/loops.svg new file mode 100644 index 0000000000..4ba2f33ba5 --- /dev/null +++ b/images/platforms/white/loops.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/images/platforms/white/loops.svg.license b/images/platforms/white/loops.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/loops.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/mbin.svg b/images/platforms/white/mbin.svg new file mode 100644 index 0000000000..28e9b49345 --- /dev/null +++ b/images/platforms/white/mbin.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/images/platforms/white/mbin.svg.license b/images/platforms/white/mbin.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/mbin.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/owncast.svg b/images/platforms/white/owncast.svg new file mode 100644 index 0000000000..cf0ada166b --- /dev/null +++ b/images/platforms/white/owncast.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/images/platforms/white/owncast.svg.license b/images/platforms/white/owncast.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/owncast.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/phanpy.svg b/images/platforms/white/phanpy.svg new file mode 100644 index 0000000000..f9f8073e41 --- /dev/null +++ b/images/platforms/white/phanpy.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/images/platforms/white/phanpy.svg.license b/images/platforms/white/phanpy.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/phanpy.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/plume.svg b/images/platforms/white/plume.svg new file mode 100644 index 0000000000..b4fbff3127 --- /dev/null +++ b/images/platforms/white/plume.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/platforms/white/plume.svg.license b/images/platforms/white/plume.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/plume.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/soapbox.svg b/images/platforms/white/soapbox.svg new file mode 100644 index 0000000000..b852de2381 --- /dev/null +++ b/images/platforms/white/soapbox.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/platforms/white/soapbox.svg.license b/images/platforms/white/soapbox.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/soapbox.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/socialhome.svg b/images/platforms/white/socialhome.svg new file mode 100644 index 0000000000..513f2bb6d0 --- /dev/null +++ b/images/platforms/white/socialhome.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/images/platforms/white/socialhome.svg.license b/images/platforms/white/socialhome.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/socialhome.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/streams.svg b/images/platforms/white/streams.svg new file mode 100644 index 0000000000..3b7224134a --- /dev/null +++ b/images/platforms/white/streams.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/images/platforms/white/streams.svg.license b/images/platforms/white/streams.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/streams.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/takahe.svg b/images/platforms/white/takahe.svg new file mode 100644 index 0000000000..31146146ea --- /dev/null +++ b/images/platforms/white/takahe.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/images/platforms/white/takahe.svg.license b/images/platforms/white/takahe.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/takahe.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/write.as.svg b/images/platforms/white/write.as.svg new file mode 100644 index 0000000000..b910f3d480 --- /dev/null +++ b/images/platforms/white/write.as.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/images/platforms/white/write.as.svg.license b/images/platforms/white/write.as.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/write.as.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/writefreely.svg b/images/platforms/white/writefreely.svg new file mode 100644 index 0000000000..e6e7e76d16 --- /dev/null +++ b/images/platforms/white/writefreely.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/platforms/white/writefreely.svg.license b/images/platforms/white/writefreely.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/writefreely.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/images/platforms/white/zap.svg b/images/platforms/white/zap.svg new file mode 100644 index 0000000000..6e1470d88b --- /dev/null +++ b/images/platforms/white/zap.svg @@ -0,0 +1,4 @@ + + + + diff --git a/images/platforms/white/zap.svg.license b/images/platforms/white/zap.svg.license new file mode 100644 index 0000000000..3ffce40c5f --- /dev/null +++ b/images/platforms/white/zap.svg.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: wakest https://codeberg.org/FediverseIconography +SPDX-License-Identifier: GPL-3.0-only diff --git a/src/Content/ContactSelector.php b/src/Content/ContactSelector.php index 7cf8bcf1b2..d4ec3d4ab8 100644 --- a/src/Content/ContactSelector.php +++ b/src/Content/ContactSelector.php @@ -229,11 +229,14 @@ class ContactSelector 'wildebeest', 'wordpress', 'write.as', 'writefreely', 'wxwclub', 'xwiki', 'zap']; if ($platform_icon_style == self::SVG_WHITE) { - $svg = ['activitypub', 'akkoma', 'andstatus', 'bluesky', 'bonfire', 'bookwyrm', 'bridgy_fed', - 'calckey', 'diaspora', 'discourse', 'drupal', 'email', 'firefish', 'flipboard', 'forgejo', - 'friendica', 'funkwhale', 'ghost', 'gitlab', 'gnusocial', 'gotosocial', 'kbin', 'lemmy', - 'mastodon', 'microblog', 'minds', 'misskey', 'mobilizon', 'nextcloud', 'peertube', - 'pixelfed', 'pleroma', 'rss', 'shark', 'threads', 'wordpress', 'xwiki']; + $svg = ['activitypub', 'akkoma', 'andstatus', 'bluesky', 'bonfire', 'bookwyrm', 'bridgy_fed', + 'calckey', 'castopod', 'diaspora', 'discourse', 'dolphin', 'drupal', 'email', 'firefish', + 'flipboard', 'flohmarkt', 'forgejo', 'friendica', 'funkwhale', 'ghost', 'gitlab', + 'glitch-soc', 'gnusocial', 'gotosocial', 'guppe', 'hollo', 'hubzilla', 'iceshrimp', 'kbin', + 'lemmy', 'loforo', 'loops', 'mastodon', 'mbin', 'microblog', 'minds', 'misskey', 'mobilizon', + 'nextcloud', 'owncast', 'peertube', 'phanpy', 'pixelfed', 'pleroma', 'plume', 'rss', 'shark', + 'soapbox', 'socialhome', 'streams', 'takahē', 'threads', 'wordpress', 'write.as', + 'writefreely', 'xwiki', 'zap']; } if (!empty($platform)) { diff --git a/view/theme/frio/config.php b/view/theme/frio/config.php index 75074da2f9..b16289a032 100644 --- a/view/theme/frio/config.php +++ b/view/theme/frio/config.php @@ -8,6 +8,7 @@ */ use Friendica\App; +use Friendica\Content\ContactSelector; use Friendica\Core\Renderer; use Friendica\DI; @@ -20,6 +21,8 @@ function theme_post(App $a) return; } + $previous_scheme = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'frio', 'scheme'); + if (isset($_POST['frio-settings-submit'])) { foreach ([ 'scheme', @@ -40,8 +43,22 @@ function theme_post(App $a) } } - DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'frio', 'css_modified', time()); + + $current_scheme = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'frio', 'scheme'); + + if ($previous_scheme != $current_scheme) { + $icon_style = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'accessibility', 'platform_icon_style'); + if (in_array($current_scheme, ['dark', 'black']) && in_array($icon_style, [ContactSelector::SVG_BLACK])) { + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'accessibility', 'platform_icon_style', ContactSelector::SVG_WHITE); + } elseif (in_array($current_scheme, ['dark', 'black']) && in_array($icon_style, [ContactSelector::SVG_COLOR_BLACK])) { + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'accessibility', 'platform_icon_style', ContactSelector::SVG_COLOR_WHITE); + } elseif (in_array($current_scheme, ['light']) && in_array($icon_style, [ContactSelector::SVG_WHITE])) { + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'accessibility', 'platform_icon_style', ContactSelector::SVG_BLACK); + } elseif (in_array($current_scheme, ['light']) && in_array($icon_style, [ContactSelector::SVG_COLOR_WHITE])) { + DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'accessibility', 'platform_icon_style', ContactSelector::SVG_COLOR_BLACK); + } + } } }