calculator: have a different icon and app name for the scientific variant

Signed-off-by: Alexis Laferrière <alexis.laf@xymus.net>

diff --git a/examples/calculator/Makefile b/examples/calculator/Makefile
index 6d2c9f4..517400d 100644 (file)
--- a/examples/calculator/Makefile
+++ b/examples/calculator/Makefile
@@ -28,6 +28,10 @@ android/res/drawable-hdpi/icon.png: art/icon.svg ../../contrib/inkscape_tools/bi
        mkdir -p android/res
        ../../contrib/inkscape_tools/bin/svg_to_icons art/icon.svg --android --out android/res/
 
+src/scientific/android/res/drawable-hdpi/icon.png: art/icon_sci.svg ../../contrib/inkscape_tools/bin/svg_to_icons
+       mkdir -p src/scientific/android/res
+       ../../contrib/inkscape_tools/bin/svg_to_icons art/icon-sci.svg --android --out src/scientific/android/res/
+
 ../../contrib/inkscape_tools/bin/svg_to_icons:
        make -C ../../contrib/inkscape_tools/
 
@@ -45,6 +49,10 @@ ios/AppIcon.appiconset/Contents.json: art/icon-ios.svg
        mkdir -p ios
        ../../contrib/inkscape_tools/bin/svg_to_icons art/icon-ios.svg --ios --out ios/AppIcon.appiconset/
 
+src/scientific/ios/AppIcon.appiconset/Contents.json: art/icon-ios.svg
+       mkdir -p ios
+       ../../contrib/inkscape_tools/bin/svg_to_icons art/icon-ios-sci.svg --ios --out src/scientific/ios/AppIcon.appiconset/
+
 # ---
 # Tests
 

diff --git a/examples/calculator/art/icon-ios-sci.svg b/examples/calculator/art/icon-ios-sci.svg
new file mode 100644 (file)
index 0000000..4ff6c5c
--- /dev/null
+++ b/examples/calculator/art/icon-ios-sci.svg
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="icon-ios-sci.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="388.94406"
+     inkscape:cy="238.25989"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1724"
+     inkscape:window-height="1103"
+     inkscape:window-x="242"
+     inkscape:window-y="23"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-540.36218)">
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:190.84666443px;line-height:125%;font-family:Sathu;-inkscape-font-specification:Sathu;letter-spacing:0px;word-spacing:0px;fill:#008bff;fill-opacity:1;stroke:none"
+       x="285.77982"
+       y="961.64594"
+       id="text3014"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3016"
+         x="285.77982"
+         y="961.64594">x²</tspan></text>
+    <g
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:269.1137085px;line-height:125%;font-family:'Droid Sans';-inkscape-font-specification:'Droid Sans';letter-spacing:0px;word-spacing:0px;fill:#008bff;fill-opacity:1;stroke:none"
+       id="text3013"
+       transform="translate(4,-4)">
+      <path
+         d="m 77.43458,894.9284 0,-19.57907 121.41654,0 0,19.57907 -121.41654,0 m 0,53.87531 0,-19.71048 121.41654,0 0,19.71048 -121.41654,0"
+         style="fill:#008bff;fill-opacity:1"
+         id="path2999"
+         inkscape:connector-curvature="0" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:183.57151794px;line-height:125%;font-family:Sathu;-inkscape-font-specification:Sathu;letter-spacing:0px;word-spacing:0px;fill:#008bff;fill-opacity:1;stroke:none"
+       x="269.98895"
+       y="720.69153"
+       id="text2994"
+       sodipodi:linespacing="125%"
+       transform="scale(0.99205729,1.0080063)"><tspan
+         sodipodi:role="line"
+         id="tspan2996"
+         x="269.98895"
+         y="720.69153">√</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:190.84666443000000413px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#008bff;fill-opacity:1;stroke:none;font-family:Sathu;-inkscape-font-specification:Sathu;"
+       x="67.883858"
+       y="734.41699"
+       id="text2998"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3000"
+         x="67.883858"
+         y="734.41699">π</tspan></text>
+  </g>
+</svg>

diff --git a/examples/calculator/art/icon-sci.svg b/examples/calculator/art/icon-sci.svg
new file mode 100644 (file)
index 0000000..187bb2d
--- /dev/null
+++ b/examples/calculator/art/icon-sci.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="icon_sci.svg">
+  <defs
+     id="defs4" />
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4"
+     inkscape:cx="164.13268"
+     inkscape:cy="278.8294"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:window-width="1598"
+     inkscape:window-height="1316"
+     inkscape:window-x="2649"
+     inkscape:window-y="84"
+     inkscape:window-maximized="0" />
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-540.36218)">
+    <rect
+       style="fill:#4d4d4d;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect2987"
+       width="500"
+       height="500"
+       x="5.9999847"
+       y="546.36218"
+       rx="64"
+       ry="64" />
+    <rect
+       ry="48"
+       rx="48"
+       y="569.2193"
+       x="32.42857"
+       height="211.42856"
+       width="211.42856"
+       id="rect2989"
+       style="fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none" />
+    <rect
+       style="fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect2991"
+       width="211.42856"
+       height="211.42856"
+       x="268.14285"
+       y="569.2193"
+       rx="48"
+       ry="48" />
+    <rect
+       style="fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none"
+       id="rect2993"
+       width="211.42856"
+       height="211.42856"
+       x="32.42857"
+       y="806.36218"
+       rx="48"
+       ry="48" />
+    <rect
+       ry="48"
+       rx="48"
+       y="806.36218"
+       x="268.14285"
+       height="211.42856"
+       width="211.42856"
+       id="rect2995"
+       style="fill:#cccccc;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:5;stroke-miterlimit:4;stroke-dasharray:none" />
+    <g
+       style="font-size:269.1137085px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       id="text3013">
+      <path
+         d="m 77.43458,894.9284 0,-19.57907 121.41654,0 0,19.57907 -121.41654,0 m 0,53.87531 0,-19.71048 121.41654,0 0,19.71048 -121.41654,0"
+         id="path2999"
+         style="" />
+    </g>
+    <text
+       xml:space="preserve"
+       style="font-size:190.84666443px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="318.1875"
+       y="744.69647"
+       id="text2994"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan2996"
+         x="318.1875"
+         y="744.69647">√</tspan></text>
+    <text
+       xml:space="preserve"
+       style="font-size:190.84666443px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="72.978729"
+       y="725.84735"
+       id="text2998"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3000"
+         x="72.978729"
+         y="725.84735">π</tspan></text>
+    <flowRoot
+       xml:space="preserve"
+       id="flowRoot3002"
+       style="fill:black;stroke:none;stroke-opacity:1;stroke-width:1px;stroke-linejoin:miter;stroke-linecap:butt;fill-opacity:1;font-family:New Shape;font-style:normal;font-weight:normal;font-size:16px;line-height:125%;letter-spacing:0px;word-spacing:0px;-inkscape-font-specification:New Shape;font-stretch:normal;font-variant:normal"><flowRegion
+         id="flowRegion3004"><rect
+           id="rect3006"
+           width="104.28571"
+           height="282.85715"
+           x="-225"
+           y="-62.285713" /></flowRegion><flowPara
+         id="flowPara3008"></flowPara></flowRoot>    <text
+       xml:space="preserve"
+       style="font-size:190.84666443px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Droid Sans;-inkscape-font-specification:Droid Sans"
+       x="303.01755"
+       y="973.79059"
+       id="text3014"
+       sodipodi:linespacing="125%"><tspan
+         sodipodi:role="line"
+         id="tspan3016"
+         x="303.01755"
+         y="973.79059">x²</tspan></text>
+  </g>
+</svg>

diff --git a/examples/calculator/src/scientific/android/.gitignore b/examples/calculator/src/scientific/android/.gitignore
new file mode 100644 (file)
index 0000000..72e8ffc
--- /dev/null
+++ b/examples/calculator/src/scientific/android/.gitignore
@@ -0,0 +1 @@
+*

diff --git a/examples/calculator/src/scientific/ios/.gitignore b/examples/calculator/src/scientific/ios/.gitignore
new file mode 100644 (file)
index 0000000..72e8ffc
--- /dev/null
+++ b/examples/calculator/src/scientific/ios/.gitignore
@@ -0,0 +1 @@
+*

diff --git a/examples/calculator/src/scientific/scientific.nit b/examples/calculator/src/scientific/scientific.nit
index 033585f..0faf4ab 100644 (file)
--- a/examples/calculator/src/scientific/scientific.nit
+++ b/examples/calculator/src/scientific/scientific.nit
@@ -13,7 +13,11 @@
 # limitations under the License.
 
 # Extends the portable calculator app with scientific operations
-module scientific
+module scientific is
+       app_name "app.nit Calc Sci"
+       app_namespace "org.nitlanguage.scientific_calculator"
+       app_files
+end
 
 import calculator