@magic-xpa/angular 4.801.0-dev481.321 → 4.801.0-dev481.322
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -8,6 +8,10 @@ export let COLOR_FILE_NAME = new InjectionToken('colorFile', {
|
|
|
8
8
|
});
|
|
9
9
|
export const MAGIC_FG_COLOR = 1;
|
|
10
10
|
export const MAGIC_BG_COLOR = 2;
|
|
11
|
+
const SYSTEM_FG = 2;
|
|
12
|
+
const SYSTEM_BG = 4;
|
|
13
|
+
const SYSTEM_FG_AND_SYSTEM_BG = 6;
|
|
14
|
+
const TRANSPERENT_BG = 1;
|
|
11
15
|
export class MagicColorService {
|
|
12
16
|
constructor(http, colorFile1 = 'clr_rnt.eng') {
|
|
13
17
|
this.http = http;
|
|
@@ -53,27 +57,26 @@ export class MagicColorService {
|
|
|
53
57
|
this.getColorData();
|
|
54
58
|
if (this.colorsData) {
|
|
55
59
|
if (this.colorsData[colorIndex - 1]) {
|
|
56
|
-
let hex = '';
|
|
57
60
|
const grayHashCode = '00808080';
|
|
61
|
+
let hex = grayHashCode;
|
|
58
62
|
let color = this.colorsData[colorIndex - 1].split(',');
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
switch (colorType) {
|
|
64
|
-
case MAGIC_FG_COLOR:
|
|
63
|
+
let colorAtrributes = +color[3];
|
|
64
|
+
switch (colorType) {
|
|
65
|
+
case MAGIC_FG_COLOR:
|
|
66
|
+
if (colorAtrributes != SYSTEM_FG && colorAtrributes != SYSTEM_FG_AND_SYSTEM_BG)
|
|
65
67
|
hex = (color[1]);
|
|
66
|
-
|
|
67
|
-
|
|
68
|
+
break;
|
|
69
|
+
case MAGIC_BG_COLOR:
|
|
70
|
+
if (colorAtrributes != SYSTEM_BG && colorAtrributes != SYSTEM_FG_AND_SYSTEM_BG) {
|
|
71
|
+
if (colorAtrributes == TRANSPERENT_BG)
|
|
72
|
+
isTransperent = true;
|
|
68
73
|
hex = (color[2]);
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
+
}
|
|
75
|
+
break;
|
|
76
|
+
default:
|
|
77
|
+
console.log('Please enter valid color type : 1-FG, 2-BG ' + colorIndex);
|
|
78
|
+
return '';
|
|
74
79
|
}
|
|
75
|
-
else
|
|
76
|
-
hex = grayHashCode;
|
|
77
80
|
return this.hexToRgba('#' + hex, isTransperent);
|
|
78
81
|
}
|
|
79
82
|
else
|
|
@@ -93,4 +96,4 @@ MagicColorService.ɵprov = i0.ɵɵdefineInjectable({ token: MagicColorService, f
|
|
|
93
96
|
type: Inject,
|
|
94
97
|
args: [COLOR_FILE_NAME]
|
|
95
98
|
}] }]; }, null); })();
|
|
96
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
99
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"magic-color.service.js","sourceRoot":"","sources":["../../../../../../projects/angular/src/services/magic-color.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { Inject, Injectable, InjectionToken } from '@angular/core';\nimport { HttpClient } from '@angular/common/http';\n\n\nexport let COLOR_FILE_NAME = new InjectionToken<string>('colorFile', {\n  providedIn: 'root',\n  factory: () => 'clr_rnt.eng'\n});\nexport const MAGIC_FG_COLOR: number = 1;\nexport const MAGIC_BG_COLOR: number = 2;\n\n\nconst SYSTEM_FG: number = 2;\nconst SYSTEM_BG: number = 4;\nconst SYSTEM_FG_AND_SYSTEM_BG = 6 ;\nconst TRANSPERENT_BG: number = 1;\n\n@Injectable({\n  providedIn: 'root'\n})\nexport class MagicColorService {\n  public colorFileName = 'clr_rnt.eng';\n\n  public getColorFilePath() {\n    return 'assets/' + this.colorFileName;\n  }\n\n  private colorsData;\n  private fileNotFound = false;\n\n  // public static FILE_NAME;\n  constructor(private http: HttpClient, @Inject(COLOR_FILE_NAME) colorFile1: string = 'clr_rnt.eng') {\n    if (colorFile1)\n      this.colorFileName = colorFile1;\n    else\n      this.colorFileName = 'clr_rnt.eng';\n  }\n\n  private getColorData() {\n\n    if (!this.colorsData) {\n      this.http.get(this.getColorFilePath(), { responseType: 'text' }).subscribe(resp => {\n          this.colorsData = resp.replace(/\\n/g, '@').split('@');\n        },\n        error1 => {\n          console.error('File not found ' + this.colorFileName);\n          this.fileNotFound = true;\n        });\n\n    }\n\n  }\n\n  private hexToRgba(hex: any, isTransperent: boolean): any {\n    let shorthandRegex = /^#?([a-f\\d])([a-f\\d])([a-f\\d])([a-f\\d])$/i;\n    // convert it to format : aarrggbb\n    hex = hex.replace(shorthandRegex, function(m: any, r: any, g: any, b: any, a: any) {\n      return a + a + r + r + g + g + b + b;\n    });\n\n    let result = /^#?([a-f\\d]{2})([a-f\\d]{2})([a-f\\d]{2})([a-f\\d]{2})$/i.exec(hex);\n\n    let rgb = {\n      'red': parseInt(result![4], 16),\n      'green': parseInt(result![3], 16),\n      'blue': parseInt(result![2], 16),\n      'alpha': (255 - parseInt(result![1], 16)) / 255\n    };\n    if (isTransperent)\n      rgb.alpha = 0;\n\n    return 'rgba(' + rgb.red + ',' + rgb.green + ',' + rgb.blue + ',' + rgb.alpha + ')';\n  }\n\n  /**\n   * Returns the rgba value of specified color\n   * @returns : value in format rgba(128,128,128,1)\n   * @param : colorNumber -0 based index of color for which RGBA values are returned\n   * @param: colorType : 1-MAGIC_FG_COLOR, 2-MAGIC_BG_COLOR\n   */\n  public getColor(colorIndex: number, colorType: number) {\n    let isTransperent = false;\n    if (!this.colorsData && !this.fileNotFound)\n      this.getColorData();\n    if (this.colorsData) { // color exists\n      if (this.colorsData[colorIndex - 1]) {\n\n        const grayHashCode = '00808080';\n        let hex = grayHashCode;\n        let color: string[] = this.colorsData[colorIndex - 1].split(','); // get the color details\n        let colorAtrributes = +color[3];\n\n        // color[0] - name, color[1] - FG color, color[2] - BG color\n        // color[3] - attr flags (1 - transperent, 2 - system FG, 4 - system bg)\n\n\n        switch (colorType) {\n          case MAGIC_FG_COLOR:\n            if (colorAtrributes != SYSTEM_FG && colorAtrributes !=SYSTEM_FG_AND_SYSTEM_BG)\n              hex = (color[1]);\n            break;\n          case MAGIC_BG_COLOR:\n            if (colorAtrributes != SYSTEM_BG && colorAtrributes !=SYSTEM_FG_AND_SYSTEM_BG) {\n              if (colorAtrributes == TRANSPERENT_BG)\n                isTransperent = true;\n              hex = (color[2]);\n            }\n            break;\n          default:\n            console.log('Please enter valid color type : 1-FG, 2-BG ' + colorIndex);\n            return '';\n        }\n\n        return this.hexToRgba('#' + hex, isTransperent);\n      } else\n        console.log('Could not get color for number ' + colorIndex);\n    }\n\n    return '';\n  }\n}\n"]}
|
|
@@ -2305,6 +2305,10 @@ let COLOR_FILE_NAME = new InjectionToken('colorFile', {
|
|
|
2305
2305
|
});
|
|
2306
2306
|
const MAGIC_FG_COLOR = 1;
|
|
2307
2307
|
const MAGIC_BG_COLOR = 2;
|
|
2308
|
+
const SYSTEM_FG = 2;
|
|
2309
|
+
const SYSTEM_BG = 4;
|
|
2310
|
+
const SYSTEM_FG_AND_SYSTEM_BG = 6;
|
|
2311
|
+
const TRANSPERENT_BG = 1;
|
|
2308
2312
|
class MagicColorService {
|
|
2309
2313
|
constructor(http, colorFile1 = 'clr_rnt.eng') {
|
|
2310
2314
|
this.http = http;
|
|
@@ -2350,27 +2354,26 @@ class MagicColorService {
|
|
|
2350
2354
|
this.getColorData();
|
|
2351
2355
|
if (this.colorsData) {
|
|
2352
2356
|
if (this.colorsData[colorIndex - 1]) {
|
|
2353
|
-
let hex = '';
|
|
2354
2357
|
const grayHashCode = '00808080';
|
|
2358
|
+
let hex = grayHashCode;
|
|
2355
2359
|
let color = this.colorsData[colorIndex - 1].split(',');
|
|
2356
|
-
|
|
2357
|
-
|
|
2358
|
-
|
|
2359
|
-
|
|
2360
|
-
switch (colorType) {
|
|
2361
|
-
case MAGIC_FG_COLOR:
|
|
2360
|
+
let colorAtrributes = +color[3];
|
|
2361
|
+
switch (colorType) {
|
|
2362
|
+
case MAGIC_FG_COLOR:
|
|
2363
|
+
if (colorAtrributes != SYSTEM_FG && colorAtrributes != SYSTEM_FG_AND_SYSTEM_BG)
|
|
2362
2364
|
hex = (color[1]);
|
|
2363
|
-
|
|
2364
|
-
|
|
2365
|
+
break;
|
|
2366
|
+
case MAGIC_BG_COLOR:
|
|
2367
|
+
if (colorAtrributes != SYSTEM_BG && colorAtrributes != SYSTEM_FG_AND_SYSTEM_BG) {
|
|
2368
|
+
if (colorAtrributes == TRANSPERENT_BG)
|
|
2369
|
+
isTransperent = true;
|
|
2365
2370
|
hex = (color[2]);
|
|
2366
|
-
|
|
2367
|
-
|
|
2368
|
-
|
|
2369
|
-
|
|
2370
|
-
|
|
2371
|
+
}
|
|
2372
|
+
break;
|
|
2373
|
+
default:
|
|
2374
|
+
console.log('Please enter valid color type : 1-FG, 2-BG ' + colorIndex);
|
|
2375
|
+
return '';
|
|
2371
2376
|
}
|
|
2372
|
-
else
|
|
2373
|
-
hex = grayHashCode;
|
|
2374
2377
|
return this.hexToRgba('#' + hex, isTransperent);
|
|
2375
2378
|
}
|
|
2376
2379
|
else
|