From 81c5b76bc33b22674a96257421e5067b1d309897 Mon Sep 17 00:00:00 2001
From: vakrilov <alexander.vakrilov@telerik.com>
Date: Tue, 10 Mar 2015 18:08:17 +0200
Subject: [PATCH] Resource prefix v.01

---
 apps/tests/pages/page14.xml | 14 +++++++----
 ui/image/image-common.ts    | 48 ++++++++++++++++++++++++-------------
 2 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/apps/tests/pages/page14.xml b/apps/tests/pages/page14.xml
index 0ec418851..eef476546 100644
--- a/apps/tests/pages/page14.xml
+++ b/apps/tests/pages/page14.xml
@@ -1,8 +1,12 @@
 <Page>
   <StackLayout>
-    <Button horizontalAlignment="left" verticalAlignment="top" margin="10 0 10 20" text="top, left" />
-    <Button horizontalAlignment="center" verticalAlignment="center" text="center, center" />
-    <Button horizontalAlignment="right" verticalAlignment="bottom" margin="0 30" text="bottom, right" />
-    <Button horizontalAlignment="stretch" verticalAlignment="stretch" margin="20" text="stretch, stretch" />
+    <Label text="resource:" />
+    <Image url="res://icon" stretch="none" horizontalAlignment="left"/>
+    
+    <Label text="url:" />
+    <Image url="http://www.google.com/images/errors/logo_sm_2.png" stretch="none" horizontalAlignment="left"/>
+    
+    <Label text="app file:" />
+    <Image  url="~/app/logo.png" stretch="none" horizontalAlignment="left" />
   </StackLayout>
-</Page>
\ No newline at end of file
+</Page>
diff --git a/ui/image/image-common.ts b/ui/image/image-common.ts
index b47b7f9e0..1aad14885 100644
--- a/ui/image/image-common.ts
+++ b/ui/image/image-common.ts
@@ -13,34 +13,50 @@ var IMAGE = "Image";
 var ISLOADING = "isLoading";
 var STRETCH = "stretch";
 
+var RESOURCE_PREFIX = "res://";
+
+function isResource(value: string): boolean {
+    return value.indexOf(RESOURCE_PREFIX) === 0;
+}
+
+function isUrl(value: string): boolean {
+    return value.indexOf("http://") === 0 || value.indexOf("https://") === 0;
+}
+
+function isAppFile(value: string): boolean {
+    return value.indexOf("~/") === 0;
+}
+
 function isValidUrl(url: string): boolean {
     var value = url ? url.trim() : "";
-    return value !== "" && (value.indexOf("~/") === 0 || value.indexOf("http://") === 0 || value.indexOf("https://") === 0);
+    return value !== "" && (isResource(value) || isAppFile(value) || isUrl(value));
 }
 
 function onUrlPropertyChanged(data: dependencyObservable.PropertyChangeData) {
     var image = <Image>data.object;
-    var value = data.newValue;
+    var value: string = data.newValue;
 
     if (isValidUrl(value)) {
+        value = value.trim();
         image.source = null;
         image["_url"] = value;
 
-        if (value !== "") {
+        image._setValue(Image.isLoadingProperty, true);
 
-            image._setValue(Image.isLoadingProperty, true);
-
-            if (value.trim().indexOf("~/") === 0) {
-                image.source = imageSource.fromFile(value.trim());
-                image._setValue(Image.isLoadingProperty, false);
-            } else {
-                imageSource.fromUrl(value).then((r) => {
-                    if (image["_url"] === value) {
-                        image.source = r;
-                        image._setValue(Image.isLoadingProperty, false);
-                    }
-                });
-            }
+        if (isResource(value)) {
+            image.source = imageSource.fromResource(value.substr(RESOURCE_PREFIX.length));
+            image._setValue(Image.isLoadingProperty, false);
+        }
+        else if (isAppFile(value)) {
+            image.source = imageSource.fromFile(value);
+            image._setValue(Image.isLoadingProperty, false);
+        } else {
+            imageSource.fromUrl(value).then((r) => {
+                if (image["_url"] === value) {
+                    image.source = r;
+                    image._setValue(Image.isLoadingProperty, false);
+                }
+            });
         }
     }
 }