xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Render themes: SVG resources on iOS, improves #69

Browse Source
This commit is contained in:
Emux
2016-07-19 14:24:37 +03:00
parent 4c5de7453d
commit 21ea5a7842
9 changed files with 126 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vtm-ios/src/org/oscim/ios/backend/IosBitmap.java
View File

@@ -123,10 +123,11 @@ public class IosBitmap implements Bitmap {
}
/**
* protected constructor for create IosBitmap from IosSvgBitmap
* Protected constructor for create IosBitmap from IosSvgBitmap.
*
* @param image
*/
protected IosBitmap(UIImage image){
protected IosBitmap(UIImage image) {
CGImage cgiIimage = image.getCGImage();
this.width = (int) cgiIimage.getWidth();
this.height = (int) cgiIimage.getHeight();
@@ -138,7 +139,6 @@ public class IosBitmap implements Bitmap {
// can dispose helper images for release memory
image.dispose();
cgiIimage.dispose();
}

2
vtm-ios/src/org/oscim/ios/backend/IosGraphics.java
View File

@@ -66,7 +66,7 @@ public class IosGraphics extends CanvasAdapter {
try {
return new IosSvgBitmap(inputStream);
} catch (IOException e) {
log.error("decodeSvgImpl", e);
log.error("decodeSvgBitmapImpl", e);
return null;
}
}

65
vtm-ios/src/org/oscim/ios/backend/IosSvgBitmap.java
View File

@@ -1,5 +1,6 @@
/*
* Copyright 2016 Longri
* Copyright 2016 devemux86
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
@@ -14,34 +15,43 @@
*/
package org.oscim.ios.backend;
import org.oscim.backend.CanvasAdapter;
import org.oscim.utils.IOUtils;
import org.robovm.apple.coregraphics.CGRect;
import org.robovm.apple.coregraphics.CGSize;
import org.robovm.apple.uikit.UIImage;
import svg.SVGRenderer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
/**
* Created by Longri on 17.07.16.
*/
import svg.SVGRenderer;
public class IosSvgBitmap extends IosBitmap {
private static final Logger log = LoggerFactory.getLogger(IosSvgBitmap.class);
private static final float DEFAULT_SIZE = 400f;
/**
* Constructor<br>
* @param inputStream
* @throws IOException
*/
public IosSvgBitmap(InputStream inputStream) throws IOException {
super(getUIImage(inputStream));
private static String getStringFromInputStream(InputStream is) {
StringBuilder sb = new StringBuilder();
BufferedReader br = null;
String line;
try {
br = new BufferedReader(new InputStreamReader(is));
while ((line = br.readLine()) != null) {
sb.append(line);
}
} catch (IOException e) {
log.error(e.getMessage(), e);
} finally {
IOUtils.closeQuietly(br);
}
return sb.toString();
}
//get UIImage from SVG file
private static UIImage getUIImage(InputStream inputStream) {
String svg = getStringFromInputStream(inputStream);
SVGRenderer renderer = new SVGRenderer(svg);
@@ -56,32 +66,7 @@ public class IosSvgBitmap extends IosBitmap {
return renderer.asImageWithSize(new CGSize(bitmapWidth, bitmapHeight), 1);
}
// convert InputStream to String
private static String getStringFromInputStream(InputStream is) {
BufferedReader br = null;
StringBuilder sb = new StringBuilder();
String line;
try {
br = new BufferedReader(new InputStreamReader(is));
while ((line = br.readLine()) != null) {
sb.append(line);
}
} catch (IOException e) {
e.printStackTrace();
} finally {
if (br != null) {
try {
br.close();
} catch (IOException e) {
e.printStackTrace();
}
}
}
return sb.toString();
public IosSvgBitmap(InputStream inputStream) throws IOException {
super(getUIImage(inputStream));
}
}

6
vtm-ios/src/svg/GHRenderable.java
View File

@@ -4,12 +4,10 @@ import org.robovm.apple.coregraphics.CGAffineTransform;
import org.robovm.apple.foundation.NSObjectProtocol;
import org.robovm.objc.annotation.Property;
public interface GHRenderable extends NSObjectProtocol{
public interface GHRenderable extends NSObjectProtocol {
@Property(selector = "transform")
public CGAffineTransform getTransform();
@Property(selector = "hidden")
public boolean isHidden();
}

5
vtm-ios/src/svg/SVGContext.java
View File

@@ -4,11 +4,10 @@ import org.robovm.apple.foundation.NSObject;
import org.robovm.apple.uikit.UIColor;
import org.robovm.objc.annotation.Method;
public interface SVGContext {
public interface SVGContext {
@Method(selector = "colorForSVGColorString:")
public UIColor colorForSVGColorString(String svgColorString);
@Method(selector = "objectAtURL:")
public NSObject objectAtURL(String aLocation);
public NSObject objectAtURL(String aLocation);
}

39
vtm-ios/src/svg/SVGParser.java
View File

@@ -10,22 +10,39 @@ import org.robovm.rt.bro.annotation.Library;
import org.robovm.rt.bro.annotation.Pointer;
import org.robovm.rt.bro.ptr.Ptr;
@Library(Library.INTERNAL)
@Library(Library.INTERNAL)
@NativeClass("SVGParser")
public class SVGParser extends NSObject {
public static class SVGParserPtr extends Ptr<SVGParser, SVGParserPtr> {}
static { ObjCRuntime.bind(SVGParser.class); }/*</bind>*/
public static class SVGParserPtr extends Ptr<SVGParser, SVGParserPtr> {
}
static {
ObjCRuntime.bind(SVGParser.class);
}/*</bind>*/
public SVGParser() {
}
;
protected SVGParser(long handle) {
super(handle);
}
protected SVGParser(SkipInit skipInit) {
super(skipInit);
}
public SVGParser(String utf8String) {
super((SkipInit) null);
initObject(init(utf8String));
}
public SVGParser() {};
protected SVGParser(long handle) { super(handle); }
protected SVGParser(SkipInit skipInit) { super(skipInit); }
public SVGParser(String utf8String) { super((SkipInit) null); initObject(init(utf8String)); }
@Method(selector = "initWithString:")
protected native @Pointer long init(String utf8String);
protected native
@Pointer
long init(String utf8String);
@Property(selector = "parserError")
public native NSError getParserError();
}

51
vtm-ios/src/svg/SVGRenderer.java
View File

@@ -16,37 +16,56 @@ import org.robovm.rt.bro.annotation.MachineSizedFloat;
import org.robovm.rt.bro.annotation.Pointer;
import org.robovm.rt.bro.ptr.Ptr;
@Library(Library.INTERNAL)
@Library(Library.INTERNAL)
@NativeClass("SVGRenderer")
public class SVGRenderer extends SVGParser implements SVGContext, GHRenderable {
public static class SVGRendererPtr extends Ptr<SVGRenderer, SVGRendererPtr> {}
static { ObjCRuntime.bind(SVGRenderer.class); }/*</bind>*/
public static class SVGRendererPtr extends Ptr<SVGRenderer, SVGRendererPtr> {
}
public SVGRenderer() {};
protected SVGRenderer(long handle) { super(handle); }
protected SVGRenderer(SkipInit skipInit) { super(skipInit); }
static {
ObjCRuntime.bind(SVGRenderer.class);
}/*</bind>*/
public SVGRenderer() {
}
;
protected SVGRenderer(long handle) {
super(handle);
}
protected SVGRenderer(SkipInit skipInit) {
super(skipInit);
}
public SVGRenderer(String utf8String) {
super((SkipInit) null);
initObject(init(utf8String));
}
public SVGRenderer(String utf8String) { super((SkipInit) null); initObject(init(utf8String)); }
@Method(selector = "initWithString:")
protected native @Pointer long init(String utf8String);
protected native
@Pointer
long init(String utf8String);
@Property(selector = "viewRect")
public native @ByVal CGRect getViewRect();
public native
@ByVal
CGRect getViewRect();
@Method(selector = "colorForSVGColorString:")
public native UIColor colorForSVGColorString(String svgColorString);
@Method(selector = "objectAtURL:")
public native NSObject objectAtURL(String aLocation);
public native NSObject objectAtURL(String aLocation);
@Property(selector = "transform")
public native CGAffineTransform getTransform();
@Property(selector = "hidden")
public native boolean isHidden();
@Method(selector = "asImageWithSize:andScale:")
public native UIImage asImageWithSize(@ByVal CGSize maximumSize, @MachineSizedFloat double scale);
}