moved function to module community

Author: ivanhrytsaim

Block/Adminhtml/HyvaThemeChecker.php

@@ -17,6 +17,8 @@
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Framework\View\Design\Theme\ThemeProviderInterface;
 use Magefan\Blog\Model\Config;
+use Magefan\Community\Model\HyvaThemeDetection;
+
 class HyvaThemeChecker extends Template
 {
     /**
@@ -39,6 +41,11 @@ class HyvaThemeChecker extends Template
      */
     protected $themeProvider;
 
+    /**
+     * @var HyvaThemeDetection
+     */
+    protected $hyvaThemeDetection;
+
     /**
      * @var Config
      */
@@ -62,13 +69,15 @@ public function __construct(
         ScopeConfigInterface $scopeConfig,
         ThemeProviderInterface $themeProvider,
         Config $config,
+        HyvaThemeDetection $hyvaThemeDetection,
         array $data = []
     ) {
         parent::__construct($context, $data);
         $this->moduleManager = $moduleManager;
         $this->storeManager = $storeManager;
         $this->scopeConfig = $scopeConfig;
         $this->themeProvider = $themeProvider;
+        $this->hyvaThemeDetection =$hyvaThemeDetection;
         $this->config = $config;
     }
 
@@ -101,37 +110,6 @@ public function getWitchModuleIsInstalled(): array
         return $hyvaModules;
     }
 
-    /**
-     * @return bool
-     */
-    private function isHyvaThemeInUse(): bool
-    {
-        $hyvaThemeEnabled = $this->moduleManager->isEnabled('Hyva_Theme');
-//        $hyvaThemeEnabled = true;
-        if ($hyvaThemeEnabled) {
-            $stores = $this->storeManager->getStores();
-
-            foreach ($stores as $store) {
-                $storeId = $store->getId();
-                $themeId = $this->scopeConfig->getValue(
-                    \Magento\Framework\View\DesignInterface::XML_PATH_THEME_ID,
-                    \Magento\Store\Model\ScopeInterface::SCOPE_STORE,
-                    $storeId
-                );
-                if ($themeId) {
-                    $theme = $this->themeProvider->getThemeById($themeId);
-                    $theme->getThemePath();
-                    $themePath = $theme->getThemePath();
-                    if (false !== stripos($themePath, 'hyva')) {
-                        return true;
-                    }
-                }
-            }
-        }
-
-        return false;
-    }
-
     /**
      * Produce and return block's html output
      *
@@ -142,7 +120,7 @@ private function isHyvaThemeInUse(): bool
     public function toHtml()
     {
         if ($this->config->isEnabled()){
-            if (!$this->isHyvaThemeInUse()) {
+            if (!$this->hyvaThemeDetection->execute()) {
                 return '';
             }