Skip to content

New navigation list #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
provokateurin merged 5 commits into from
Nov 26, 2024
Merged

New navigation list #37

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
96fc617
feat: new navigation list, splitted (standard/installed), use routes …
smarinier Nov 7, 2024
34f5acd
feat: use always_enabled, icon_url and @media dark theme
smarinier Nov 12, 2024
6d86293
feat: use getAppIcon
smarinier Nov 12, 2024
1234b52
feat: routes and icons
smarinier Nov 26, 2024
ce009c5
feat: ocp is NC29 min now, psalm warnings
smarinier Nov 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: use getAppIcon 
Signed-off-by: Sebastien Marinier <[email protected]>
  • Loading branch information
@smarinier
smarinier committed Nov 12, 2024
commit 6d862931a2405631d6024cb247d5fa46b8665a49
2 changes: 1 addition & 1 deletion appinfo/info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<repository>https://github.com/nextcloud/ocs_api_viewer.git</repository>
<screenshot>https://raw.githubusercontent.com/nextcloud/ocs_api_viewer/main/docs/screenshot.png</screenshot>
<dependencies>
<nextcloud min-version="26" max-version="30"/>
<nextcloud min-version="29" max-version="30"/>
</dependencies>
<navigations>
<navigation>
Expand Down
19 changes: 3 additions & 16 deletions lib/Service/AppsService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ public function findSupported(): array {
'version' => $appInfo['version'],
'always_enabled' => in_array($app, $always),
];
$preview = $this->getPreview($app, $baseDir);
if ($preview !== null) {
$apiInfo['icon_url'] = $preview;
$iconUrl = $this->appManager->getAppIcon($app);
if ($iconUrl !== null) {
$apiInfo['icon_url'] = $iconUrl;
}
$apis[] = $apiInfo;
}
Expand Down Expand Up @@ -129,17 +129,4 @@ public function getSpec(string $app): string {

return json_encode($data);
}

private function getPreview(string $app, string $appPath) : ?string {
$appIcon = $appPath . '/img/' . $app . '.svg';
if (file_exists($appIcon)) {
return $this->url->imagePath($app, $app . '.svg');
} else {
$appIcon = $appPath . '/img/app.svg';
if (file_exists($appIcon)) {
return $this->url->imagePath($app, 'app.svg');
}
}
return null;
}
}