refactoring

Author: farfromrefug

dev_demo/app/examples/animating.ts

@@ -2,14 +2,14 @@ import { AnimatedImage, FinalEventData, Img } from '~/nativescript-image';
 import { writeToOutputLabel } from './appLogger';
 
 export function onFinalImageSet(args: FinalEventData) {
- const drawee = args.object as Img;
+ const imageView = args.object as Img;
  const message = '>>>>>> onFinalImageSet ';
- writeToOutputLabel(drawee, message);
+ writeToOutputLabel(imageView, message);
  const animatedImage = args.animatable as AnimatedImage;
  if (animatedImage) {
- writeToOutputLabel(drawee, '>>>>>> animatedImage: isRunning(): ' + animatedImage.isRunning());
- writeToOutputLabel(drawee, '>>>>>> animatedImage: start() ');
+ writeToOutputLabel(imageView, '>>>>>> animatedImage: isRunning(): ' + animatedImage.isRunning());
+ writeToOutputLabel(imageView, '>>>>>> animatedImage: start() ');
  animatedImage.start();
- writeToOutputLabel(drawee, '>>>>>> animatedImage: isRunning(): ' + animatedImage.isRunning());
+ writeToOutputLabel(imageView, '>>>>>> animatedImage: isRunning(): ' + animatedImage.isRunning());
  }
 }

dev_demo/app/examples/appLogger.ts

@@ -2,8 +2,8 @@ import { Img } from '~/nativescript-image';
 import { GridLayout } from 'tns-core-modules/ui/layouts/grid-layout';
 import { Label } from 'tns-core-modules/ui/label';
 
-export function writeToOutputLabel(drawee: Img, message: string) {
- const gridLayout = drawee.parent as GridLayout;
+export function writeToOutputLabel(imageView: Img, message: string) {
+ const gridLayout = imageView.parent as GridLayout;
  const label = gridLayout.getViewById('outputLabel') as Label;
  console.log(message);
  label.text += '\n' + message;

dev_demo/app/examples/cache.ts

@@ -10,41 +10,41 @@ const src = 'https://raw.githubusercontent.com/Akylas/nativescript-image/master/
 export function onCheckCache(args: EventData) {
  const button = args.object as Button;
  const gridLayout = button.parent as GridLayout;
- const drawee = gridLayout.getViewById('imageDrawee') as imageModel.Img;
+ const imageView = gridLayout.getViewById('imageView') as imageModel.Img;
  const imagePipeLine = imageModel.getImagePipeline();
  const isInCache = imagePipeLine.isInBitmapMemoryCache(src);
- writeToOutputLabel(drawee, '>>>>> Image is in the Bitmap memory cache - ' + isInCache);
+ writeToOutputLabel(imageView, '>>>>> Image is in the Bitmap memory cache - ' + isInCache);
 
  // TODO: Uncomment this after upgrading the native Image library above the currently used 0.9.0+ version and make sure its is available in the new version.
  // var isInDiskCache = imagePipeLine.isInDiskCacheSync(src);
  // var message = ">>>>> Image is in the disk cache: " + isInDiskCache;
  // console.log(message);
- // writeToOutputLabel(drawee, message);
+ // writeToOutputLabel(imageView, message);
 }
 
 export function onClearCache(args: EventData) {
  const button = args.object as Button;
  const gridLayout = button.parent as GridLayout;
- const drawee = gridLayout.getViewById('imageDrawee') as imageModel.Img;
+ const imageView = gridLayout.getViewById('imageView') as imageModel.Img;
  const imagePipeLine = imageModel.getImagePipeline();
- writeToOutputLabel(drawee, '>>>>> Clearning cache');
+ writeToOutputLabel(imageView, '>>>>> Clearning cache');
 
  imagePipeLine.clearCaches();
 }
 
 export function onSetImage(args: EventData) {
  const button = args.object as Button;
  const gridLayout = button.parent as GridLayout;
- const drawee = gridLayout.getViewById('imageDrawee') as imageModel.Img;
- drawee.src = null;
- drawee.src = src;
+ const imageView = gridLayout.getViewById('imageView') as imageModel.Img;
+ imageView.src = null;
+ imageView.src = src;
 }
 
 export function onResetImage(args: EventData) {
  const button = args.object as Button;
  const gridLayout = button.parent as GridLayout;
- const drawee = gridLayout.getViewById('imageDrawee') as imageModel.Img;
- writeToOutputLabel(drawee, ">>>>> Refreshing cache and 'src'");
+ const imageView = gridLayout.getViewById('imageView') as imageModel.Img;
+ writeToOutputLabel(imageView, ">>>>> Refreshing cache and 'src'");
 
- drawee.updateImageUri();
+ imageView.updateImageUri();
 }

dev_demo/app/examples/cache.xml

@@ -1,6 +1,6 @@
 <ScrollView>
  <StackLayout>
- <img:Img id="imageDrawee" xmlns:img="nativescript-image"
+ <img:Img id="imageView" xmlns:img="nativescript-image"
  verticalAlignment="center"
  placeholderImageUri="res://ns_logo"
  src="https://raw.githubusercontent.com/Akylas/nativescript-image/master/examples-data/breakfast1.jpg"/>

dev_demo/app/examples/events.ts

@@ -5,36 +5,36 @@ import { Label } from 'tns-core-modules/ui/label';
 import { writeToOutputLabel } from './appLogger';
 
 export function onFinalImageSet(args: FinalEventData) {
- const drawee = args.object as Img;
+ const imageView = args.object as Img;
  const message = '>>>>> onFinalImageSet ';
  console.log(message);
- writeToOutputLabel(drawee, message);
+ writeToOutputLabel(imageView, message);
 }
 
 export function onIntermediateImageSet(args: IntermediateEventData) {
- const drawee = args.object as Img;
+ const imageView = args.object as Img;
  const message = '>>>>> onIntermediateImageSet ';
  console.log(message);
- writeToOutputLabel(drawee, message);
+ writeToOutputLabel(imageView, message);
 }
 
 export function intermediateImageFailed(args: FailureEventData) {
- const drawee = args.object as Img;
+ const imageView = args.object as Img;
  const message = '>>>>> intermediateImageFailed ';
  console.log(message);
- writeToOutputLabel(drawee, message);
+ writeToOutputLabel(imageView, message);
 }
 
 export function onSubmit(args: EventData) {
- const drawee = args.object as Img;
+ const imageView = args.object as Img;
  const message = '>>>>> onSubmit ';
  console.log(message);
- writeToOutputLabel(drawee, message);
+ writeToOutputLabel(imageView, message);
 }
 
 export function onRelease(args: EventData) {
- const drawee = args.object as Img;
+ const imageView = args.object as Img;
  const message = '>>>>> onRelease ';
  console.log(message);
- writeToOutputLabel(drawee, message);
+ writeToOutputLabel(imageView, message);
 }

dev_demo/app/examples/fade.ts

@@ -6,10 +6,10 @@ import * as imageModel from '~/nativescript-image';
 export function onSetTap(args: EventData) {
  const button = args.object as Button;
  const gridLayout = button.parent as StackLayout;
- const imageDrawee = gridLayout.getViewById('imageDrawee') as imageModel.Img;
+ const imageView = gridLayout.getViewById('imageView') as imageModel.Img;
  // Fade only executes the first time the image is loaded. Cached images will not fade in - https://github.com/facebook/image/issues/2138
  const src = 'https://raw.githubusercontent.com/Akylas/nativescript-image/master/examples-data/drink1.jpg';
  const imagePipeLine = imageModel.getImagePipeline();
  imagePipeLine.evictFromCache(src);
- imageDrawee.src = imageDrawee.src ? '' : src;
+ imageView.src = imageView.src ? '' : src;
 }

dev_demo/app/examples/fade.xml

@@ -1,7 +1,7 @@
 <StackLayout >
  <Button text="set / unset" tap="onSetTap"/>
  <img:Img xmlns:img="nativescript-image" verticalAlignment="center" row="1"
- id="imageDrawee"
+ id="imageView"
 
  fadeDuration="3000"/>
 </StackLayout>

dev_demo/app/examples/failure.ts

@@ -4,7 +4,7 @@ import { Label } from 'tns-core-modules/ui/label';
 import { writeToOutputLabel } from './appLogger';
 
 export function onFailure(args: FailureEventData) {
- const drawee = args.object as Img;
+ const imageView = args.object as Img;
  const message = '>>>>> onFailureTest ' + args.error;
- writeToOutputLabel(drawee, message);
+ writeToOutputLabel(imageView, message);
 }

dev_demo/app/examples/nativecolerfilter.ts

@@ -1,13 +1,13 @@
 import { Img } from '~/nativescript-image';
 
 // export function onLoaded(args) {
-// let drawee = args.object as Image;
-// if (drawee.android) {
+// let imageView = args.object as Image;
+// if (imageView.android) {
 // const matrix: android.graphics.ColorMatrix = new android.graphics.ColorMatrix();
 // matrix.setSaturation(0);
 // const filter: android.graphics.ColorMatrixColorFilter = new android.graphics.ColorMatrixColorFilter(
 // matrix
 // );
-// drawee.android.setColorFilter(filter);
+// imageView.android.setColorFilter(filter);
 // }
 // }

dev_demo/app/examples/opacity.ts

@@ -8,29 +8,29 @@ import { writeToOutputLabel } from './appLogger';
 export function onSeOpacityTo1(args: EventData) {
  const button = args.object as Button;
  const gridLayout = button.parent as GridLayout;
- const drawee = gridLayout.getViewById('opacityDrawee') as Img;
- drawee.opacity = 1;
+ const imageView = gridLayout.getViewById('opacityDrawee') as Img;
+ imageView.opacity = 1;
 }
 
 export function onSeOpacityTo01(args: EventData) {
  const button = args.object as Button;
  const gridLayout = button.parent as GridLayout;
- const drawee = gridLayout.getViewById('opacityDrawee') as Img;
- drawee.opacity = 0.1;
+ const imageView = gridLayout.getViewById('opacityDrawee') as Img;
+ imageView.opacity = 0.1;
 }
 
 export function onSeOpacityTo05(args: EventData) {
  const button = args.object as Button;
  const gridLayout = button.parent as GridLayout;
- const drawee = gridLayout.getViewById('opacityDrawee') as Img;
- drawee.opacity = 0.5;
+ const imageView = gridLayout.getViewById('opacityDrawee') as Img;
+ imageView.opacity = 0.5;
 }
 
 export function onAnimateCss(args) {
  const button = args.object as Button;
  const gridLayout = button.parent as GridLayout;
- const drawee = gridLayout.getViewById('opacityDrawee') as Img;
- drawee.animate({
+ const imageView = gridLayout.getViewById('opacityDrawee') as Img;
+ imageView.animate({
  opacity: 1,
  duration: 200
  });