add a way to create custom categories and manage application categories

lib/Service/AppRepository.php

@@ -21,10 +21,27 @@ class AppRepository
      */
     protected $l10nFactory;
 
-    public function __construct(\OC_App $ocApp, IFactory $l10nFactory)
+    /**
+     * @var ConfigProxy
+     */
+    protected $config;
+
+    /**
+     * @var CategoryRepository
+     */
+    protected $categoryRepository;
+
+    public function __construct(
+        \OC_App $ocApp,
+        IFactory $l10nFactory,
+        ConfigProxy $config,
+        CategoryRepository $categoryRepository
+    )
     {
         $this->ocApp = $ocApp;
         $this->l10nFactory = $l10nFactory;
+        $this->config = $config;
+        $this->categoryRepository = $categoryRepository;
     }
 
     /**
@@ -35,6 +52,9 @@ class AppRepository
     public function getVisibleApps()
     {
         $navigation = $this->ocApp->getNavigation();
+        $appCategoriesCustom = $this->config->getAppValueArray('apps-categories-custom', '[]');
+        $categoriesCustom = $this->config->getAppValueArray('categories-custom', '[]');
+        $categories = $this->categoryRepository->getOrderedCategories();
         $apps = $this->ocApp->listAllApps();
         $visibleApps = [];
 
@@ -74,6 +94,12 @@ class AppRepository
             }
         }
 
+        foreach ($visibleApps as $id => $app) {
+            if (isset($appCategoriesCustom[$id]) && (isset($categoriesCustom[$id]) || isset($categories[$id]))) {
+                $visibleApps[$id]['category'] = [$appCategoriesCustom[$id]];
+            }
+        }
+
         usort($visibleApps, function ($a, $b) {
             return ($a['name'] < $b['name']) ? -1 : 1;
         });

lib/Service/CategoryRepository.php

@@ -5,6 +5,7 @@ namespace OCA\SideMenu\Service;
 use OC\App\AppStore\Fetcher\CategoryFetcher;
 use OCA\SideMenu\AppInfo\Application;
 use OCP\IConfig;
+use OCP\IUserSession;
 use OCP\L10N\IFactory;
 
 /**
@@ -34,16 +35,23 @@ class CategoryRepository
      */
     protected $iConfig;
 
+    /**
+     * @var IUserSession
+     */
+    protected $userSession;
+
     public function __construct(
         CategoryFetcher $categoryFetcher,
         ConfigProxy $config,
         IConfig $iConfig,
-        IFactory $l10nFactory
+        IFactory $l10nFactory,
+        IUserSession $userSession
     ) {
         $this->categoryFetcher = $categoryFetcher;
         $this->l10nFactory = $l10nFactory;
         $this->config = $config;
         $this->iConfig = $iConfig;
+        $this->userSession = $userSession;
     }
 
     /**
@@ -56,8 +64,8 @@ class CategoryRepository
         $currentLanguage = substr($this->l10nFactory->findLanguage(), 0, 2);
         $type = $this->config->getAppValue('categories-order-type', 'default');
         $order = $this->config->getAppValueArray('categories-order', '[]');
-
         $categoriesLabels = $this->config->getAppValueArray('cache-categories', '[]');
+        $customCategories = $this->config->getAppValueArray('categories-custom', '[]');
 
         if (empty($categoriesLabels)) {
             $categoriesLabels = $this->categoryFetcher->get();
@@ -74,6 +82,18 @@ class CategoryRepository
         $categoriesLabels['external_links'] = $this->l10nFactory->get('external')->t('External sites');
         $categoriesLabels['other'] = '';
 
+        $user = $this->userSession->getUser();
+
+        if ($user) {
+            $lang = $this->iConfig->getUserValue($user->getUid(), 'core', 'lang');
+        } else {
+            $lang = 'en';
+        }
+
+        foreach ($customCategories as $category) {
+            $categoriesLabels[$category['id']] = $category[$lang] ?? $category['en'];
+        }
+
         asort($categoriesLabels);
 
         if ('custom' === $type) {

lib/Service/LangRepository.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace OCA\SideMenu\Service;
+
+use OCP\IDBConnection;
+
+/**
+ * class LangRepository.
+ *
+ * @author Simon Vieille <simon@deblan.fr>
+ */
+class LangRepository
+{
+    /**
+     * @var IDBConnection
+     */
+    protected $db;
+
+    public function __construct(IDBConnection $db)
+    {
+        $this->db = $db;
+    }
+
+    public function getUsedLangs(): array
+    {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select($qb->createFunction('DISTINCT configvalue'))
+            ->where('configkey="lang" and appid="core" and configvalue<>"en"')
+            ->from('preferences')
+        ;
+
+        $stmt = $qb->execute();
+
+        $langs = ['en'];
+
+        foreach ($stmt->fetchAll() as $result) {
+            $langs[] = $result['configvalue'];
+        }
+
+        return $langs;
+    }
+}

lib/Settings/Admin.php

@@ -28,6 +28,7 @@ use OCP\ILogger;
 use OCP\Settings\ISettings;
 use OCA\Theming\ThemingDefaults;
 use OCA\SideMenu\Service\Color;
+use OCA\SideMenu\Service\LangRepository;
 
 class Admin implements ISettings
 {
@@ -66,6 +67,11 @@ class Admin implements ISettings
      */
     protected $color;
 
+    /**
+     * @var LangRepository
+     */
+    protected $langRepository;
+
     public function __construct(
         IL10N $l,
         ILogger $logger,
@@ -73,7 +79,8 @@ class Admin implements ISettings
         AppRepository $appRepository,
         CategoryRepository $categoryRepository,
         ThemingDefaults $theming,
-        Color $color
+        Color $color,
+        LangRepository $langRepository
     ) {
         $this->l = $l;
         $this->logger = $logger;
@@ -82,6 +89,7 @@ class Admin implements ISettings
         $this->categoryRepository = $categoryRepository;
         $this->theming = $theming;
         $this->color = $color;
+        $this->langRepository = $langRepository;
     }
 
     /**
@@ -140,10 +148,13 @@ class Admin implements ISettings
             'target-blank-apps' => $this->config->getAppValueArray('target-blank-apps', '[]'),
             'top-menu-apps' => $this->config->getAppValueArray('top-menu-apps', '[]'),
             'default-enabled' => $this->config->getAppValue('default-enabled', '1'),
+            'apps' => $this->appRepository->getVisibleApps(),
+            'apps-categories-custom' => $this->config->getAppValueArray('apps-categories-custom', '[]'),
             'categories-order-type' => $this->config->getAppValue('categories-order-type', 'default'),
             'categories-order' => $this->config->getAppValueArray('categories-order', '[]'),
-            'apps' => $this->appRepository->getVisibleApps(),
+            'categories-custom' => $this->config->getAppValueArray('categories-custom', '[]'),
             'categories' => $this->categoryRepository->getOrderedCategories(),
+            'langs' => $this->langRepository->getUsedLangs(),
         ];
 
         return new TemplateResponse(Application::APP_ID, 'settings/admin-form', $parameters, '');