mirror of
https://github.com/imarkoff/Marble-shell-theme.git
synced 2025-12-03 18:56:44 -08:00
Refactored Theme class to correspond SOLID patterns
This commit is contained in:
@@ -4,6 +4,7 @@ from scripts import config
|
||||
from scripts.gdm import GlobalTheme
|
||||
from scripts.install.theme_installer import ThemeInstaller
|
||||
from scripts.utils.logger.console import Console, Color, Format
|
||||
from theme import SourceFolder
|
||||
|
||||
|
||||
class GlobalThemeInstaller(ThemeInstaller):
|
||||
@@ -16,7 +17,8 @@ class GlobalThemeInstaller(ThemeInstaller):
|
||||
|
||||
def _define_theme(self):
|
||||
gdm_temp = os.path.join(config.temp_folder, config.gdm_folder)
|
||||
self.theme = GlobalTheme(self.colors, f"{config.raw_theme_folder}/{config.gnome_folder}",
|
||||
source_folder = SourceFolder().gnome_shell
|
||||
self.theme = GlobalTheme(self.colors, source_folder,
|
||||
config.global_gnome_shell_theme, config.gnome_shell_gresource,
|
||||
gdm_temp, mode=self.args.mode, is_filled=self.args.filled)
|
||||
|
||||
|
||||
@@ -1,8 +1,6 @@
|
||||
import os.path
|
||||
|
||||
from scripts import config
|
||||
from scripts.install.theme_installer import ThemeInstaller
|
||||
from scripts.theme import Theme
|
||||
from scripts.utils.theme.gnome_shell_theme_builder import GnomeShellThemeBuilder
|
||||
from scripts.utils.theme.theme import Theme
|
||||
from scripts.utils import remove_files
|
||||
from scripts.utils.logger.console import Console, Color, Format
|
||||
|
||||
@@ -15,10 +13,10 @@ class LocalThemeInstaller(ThemeInstaller):
|
||||
remove_files(self.args, colors)
|
||||
|
||||
def _define_theme(self):
|
||||
theme_folder = os.path.join(config.raw_theme_folder, config.gnome_folder)
|
||||
self.theme = Theme("gnome-shell", self.colors, theme_folder,
|
||||
config.themes_folder, config.temp_folder,
|
||||
mode=self.args.mode, is_filled=self.args.filled)
|
||||
theme_builder = GnomeShellThemeBuilder(self.colors)
|
||||
theme_builder.with_mode(self.args.mode)
|
||||
theme_builder.filled(self.args.filled)
|
||||
self.theme = theme_builder.build()
|
||||
|
||||
def _install_theme(self, hue, theme_name, sat):
|
||||
self.theme.install(hue, theme_name, sat)
|
||||
|
||||
@@ -3,7 +3,7 @@ import concurrent.futures
|
||||
from abc import ABC, abstractmethod
|
||||
|
||||
from scripts.install.colors_definer import ColorsDefiner
|
||||
from scripts.theme import Theme
|
||||
from scripts.utils.theme.theme import Theme
|
||||
from scripts.tweaks_manager import TweaksManager
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user