fix: typo on android utils, getPalleteColor to getPaletteColor (NativeScript#4687)

danielgek · Alexander Vakrilov · commit 7b364613da95 · 2017-08-24T11:55:31.000+03:00
* fix: typo on android, getPalleteColor to getPaletteColor

* fix: adress comments
diff --git a/tns-core-modules/ui/tab-view/tab-view.android.ts b/tns-core-modules/ui/tab-view/tab-view.android.ts
@@ -176,7 +176,7 @@ let defaultAccentColor: number = undefined;
 function getDefaultAccentColor(context: android.content.Context): number {
     if (defaultAccentColor === undefined) {
         //Fallback color: https://developer.android.com/samples/SlidingTabsColors/src/com.example.android.common/view/SlidingTabStrip.html
-        defaultAccentColor = ad.resources.getPalleteColor(ACCENT_COLOR, context) || 0xFF33B5E5;
+        defaultAccentColor = ad.resources.getPaletteColor(ACCENT_COLOR, context) || 0xFF33B5E5;
     }
     return defaultAccentColor;
 }
@@ -299,7 +299,7 @@ export class TabView extends TabViewBase {
             tabLayout.setSelectedIndicatorColors([accentColor]);
         }
 
-        const primaryColor = ad.resources.getPalleteColor(PRIMARY_COLOR, context);
+        const primaryColor = ad.resources.getPaletteColor(PRIMARY_COLOR, context);
         if (primaryColor) {
             tabLayout.setBackgroundColor(primaryColor);
         }
diff --git a/tns-core-modules/utils/utils.android.ts b/tns-core-modules/utils/utils.android.ts
@@ -166,8 +166,10 @@ export module ad {
             var uri = packageName + name;
             return resources.getIdentifier(uri, null, null);
         }
-
         export function getPalleteColor(name: string, context: android.content.Context): number {
+            return getPaletteColor(name, context);
+        }
+        export function getPaletteColor(name: string, context: android.content.Context): number {
             if (attrCache.has(name)) {
                 return attrCache.get(name);
             }
diff --git a/tns-core-modules/utils/utils.d.ts b/tns-core-modules/utils/utils.d.ts
@@ -176,11 +176,17 @@ export module ad {
          */
         export function getId(name: string): number;
 
+        /**
+         * [Obsolete - please use getPaletteColor] Gets a color from current theme.
+         * @param name - Name of the color
+         */
+        export function getPalleteColor();
+
         /**
          * Gets a color from the current theme.
          * @param name - Name of the color resource.
          */
-        export function getPalleteColor(name: string, context: any /* android.content.Context */): number;
+        export function getPaletteColor(name: string, context: any /* android.content.Context */): number;
     }
 }
 /**

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ let defaultAccentColor: number = undefined;`
`176`	`176`	`function getDefaultAccentColor(context: android.content.Context): number {`
`177`	`177`	`if (defaultAccentColor === undefined) {`
`178`	`178`	`//Fallback color: https://developer.android.com/samples/SlidingTabsColors/src/com.example.android.common/view/SlidingTabStrip.html`
`179`		`- defaultAccentColor = ad.resources.getPalleteColor(ACCENT_COLOR, context) \|\| 0xFF33B5E5;`
	`179`	`+ defaultAccentColor = ad.resources.getPaletteColor(ACCENT_COLOR, context) \|\| 0xFF33B5E5;`
`180`	`180`	`}`
`181`	`181`	`return defaultAccentColor;`
`182`	`182`	`}`
`@@ -299,7 +299,7 @@ export class TabView extends TabViewBase {`
`299`	`299`	`tabLayout.setSelectedIndicatorColors([accentColor]);`
`300`	`300`	`}`
`301`	`301`
`302`		`- const primaryColor = ad.resources.getPalleteColor(PRIMARY_COLOR, context);`
	`302`	`+ const primaryColor = ad.resources.getPaletteColor(PRIMARY_COLOR, context);`
`303`	`303`	`if (primaryColor) {`
`304`	`304`	`tabLayout.setBackgroundColor(primaryColor);`
`305`	`305`	`}`
Original file line number	Diff line number	Diff line change
`@@ -166,8 +166,10 @@ export module ad {`
`166`	`166`	`var uri = packageName + name;`
`167`	`167`	`return resources.getIdentifier(uri, null, null);`
`168`	`168`	`}`
`169`		`-`
`170`	`169`	`export function getPalleteColor(name: string, context: android.content.Context): number {`
	`170`	`+ return getPaletteColor(name, context);`
	`171`	`+ }`
	`172`	`+ export function getPaletteColor(name: string, context: android.content.Context): number {`
`171`	`173`	`if (attrCache.has(name)) {`
`172`	`174`	`return attrCache.get(name);`
`173`	`175`	`}`