From dc1296a9abfeeb714f321454dde32389a0f40c7e Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 13 Jun 2022 11:26:20 +0200
Subject: [PATCH] Better icon names

---
 client/src/app/core/menu/menu.service.ts                  | 2 +-
 client/src/app/menu/menu.component.html                   | 4 ++--
 .../src/app/shared/shared-forms/input-text.component.html | 4 ++--
 .../src/app/shared/shared-forms/input-text.component.ts   | 8 +-------
 .../src/app/shared/shared-icons/global-icon.component.ts  | 5 ++---
 .../shared-instance/instance-statistics.component.html    | 2 +-
 client/src/assets/images/feather/recently-added.svg       | 1 -
 7 files changed, 9 insertions(+), 17 deletions(-)
 delete mode 100644 client/src/assets/images/feather/recently-added.svg

diff --git a/client/src/app/core/menu/menu.service.ts b/client/src/app/core/menu/menu.service.ts
index f0dc4fcaa..81837db7e 100644
--- a/client/src/app/core/menu/menu.service.ts
+++ b/client/src/app/core/menu/menu.service.ts
@@ -132,7 +132,7 @@ export class MenuService {
         path: '/videos/trending'
       },
       {
-        icon: 'recently-added' as 'recently-added',
+        icon: 'add' as 'add',
         label: $localize`Recently added videos`,
         shortLabel: $localize`Recently added`,
         path: '/videos/recently-added'
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index 3f00cac04..66ccb9870 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -50,8 +50,8 @@
                 fragment="video-sensitive-content-policy" #settingsSensitiveContentPolicy
                 (click)="onActiveLinkScrollToAnchor(settingsSensitiveContentPolicy)"
               >
-                <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy === 'display'" iconName="sensitive" aria-hidden="true"></my-global-icon>
-                <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy !== 'display'" iconName="unsensitive" aria-hidden="true"></my-global-icon>
+                <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy === 'display'" iconName="eye-open" aria-hidden="true"></my-global-icon>
+                <my-global-icon class="hover-display-toggle" [hidden]="user.nsfwPolicy !== 'display'" iconName="eye-close" aria-hidden="true"></my-global-icon>
                 <span i18n>Sensitive:</span>
                 <span class="ms-auto muted">{{ nsfwPolicy }}</span>
               </a>
diff --git a/client/src/app/shared/shared-forms/input-text.component.html b/client/src/app/shared/shared-forms/input-text.component.html
index 669b5f32e..f890c4f02 100644
--- a/client/src/app/shared/shared-forms/input-text.component.html
+++ b/client/src/app/shared/shared-forms/input-text.component.html
@@ -6,8 +6,8 @@
   />
 
   <button *ngIf="withToggle" (click)="toggle()" type="button" class="btn btn-outline-secondary" [title]="toggleTitle">
-    <my-global-icon *ngIf="show" iconName="sensitive"></my-global-icon>
-    <my-global-icon *ngIf="!show" iconName="unsensitive"></my-global-icon>
+    <my-global-icon *ngIf="show" iconName="eye-open"></my-global-icon>
+    <my-global-icon *ngIf="!show" iconName="eye-close"></my-global-icon>
   </button>
 
   <button
diff --git a/client/src/app/shared/shared-forms/input-text.component.ts b/client/src/app/shared/shared-forms/input-text.component.ts
index d9722e6c6..1e1da6771 100644
--- a/client/src/app/shared/shared-forms/input-text.component.ts
+++ b/client/src/app/shared/shared-forms/input-text.component.ts
@@ -1,7 +1,7 @@
 import { Component, forwardRef, Input } from '@angular/core'
 import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'
 import { Notifier } from '@app/core'
-import { GlobalIconName } from '../shared-icons'
+
 
 @Component({
   selector: 'my-input-text',
@@ -48,12 +48,6 @@ export class InputTextComponent implements ControlValueAccessor {
     this.notifier.success($localize`Copied`)
   }
 
-  getEyeIcon (): GlobalIconName {
-    if (this.show) return 'sensitive'
-
-    return 'unsensitive'
-  }
-
   propagateChange = (_: any) => { /* empty */ }
 
   writeValue (value: string) {
diff --git a/client/src/app/shared/shared-icons/global-icon.component.ts b/client/src/app/shared/shared-icons/global-icon.component.ts
index 8b864fd5f..55eb45a75 100644
--- a/client/src/app/shared/shared-icons/global-icon.component.ts
+++ b/client/src/app/shared/shared-icons/global-icon.component.ts
@@ -29,7 +29,6 @@ const icons = {
   alert: require('!!raw-loader?!../../../assets/images/feather/alert.svg').default,
   globe: require('!!raw-loader?!../../../assets/images/feather/globe.svg').default,
   home: require('!!raw-loader?!../../../assets/images/feather/home.svg').default,
-  'recently-added': require('!!raw-loader?!../../../assets/images/feather/recently-added.svg').default,
   trending: require('!!raw-loader?!../../../assets/images/feather/trending.svg').default,
   search: require('!!raw-loader?!../../../assets/images/feather/search.svg').default,
   upload: require('!!raw-loader?!../../../assets/images/feather/upload.svg').default,
@@ -64,8 +63,8 @@ const icons = {
   film: require('!!raw-loader?!../../../assets/images/feather/film.svg').default,
   edit: require('!!raw-loader?!../../../assets/images/feather/edit-2.svg').default,
   'external-link': require('!!raw-loader?!../../../assets/images/feather/external-link.svg').default,
-  sensitive: require('!!raw-loader?!../../../assets/images/feather/eye.svg').default,
-  unsensitive: require('!!raw-loader?!../../../assets/images/feather/eye-off.svg').default,
+  'eye-open': require('!!raw-loader?!../../../assets/images/feather/eye.svg').default,
+  'eye-close': require('!!raw-loader?!../../../assets/images/feather/eye-off.svg').default,
   refresh: require('!!raw-loader?!../../../assets/images/feather/refresh-cw.svg').default,
   command: require('!!raw-loader?!../../../assets/images/feather/command.svg').default,
   go: require('!!raw-loader?!../../../assets/images/feather/arrow-up-right.svg').default,
diff --git a/client/src/app/shared/shared-instance/instance-statistics.component.html b/client/src/app/shared/shared-instance/instance-statistics.component.html
index 960520680..68b209990 100644
--- a/client/src/app/shared/shared-instance/instance-statistics.component.html
+++ b/client/src/app/shared/shared-instance/instance-statistics.component.html
@@ -30,7 +30,7 @@
           <p class="stat-value">{{ serverStats.totalLocalVideoViews | number }}</p>
           <p class="stat-label" i18n>views</p>
         </div>
-        <my-global-icon iconName="sensitive"></my-global-icon>
+        <my-global-icon iconName="eye-open"></my-global-icon>
       </div>
     </div>
 
diff --git a/client/src/assets/images/feather/recently-added.svg b/client/src/assets/images/feather/recently-added.svg
deleted file mode 100644
index 4291ff052..000000000
--- a/client/src/assets/images/feather/recently-added.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-plus-circle"><circle cx="12" cy="12" r="10"></circle><line x1="12" y1="8" x2="12" y2="16"></line><line x1="8" y1="12" x2="16" y2="12"></line></svg>
\ No newline at end of file
-- 
2.41.0