Created white itoopie SVG, exported new notification icons

art/itoopie-512.svg

@@ -15,7 +15,6 @@
    version="1.1"
    inkscape:version="0.48.4 r9939"
    sodipodi:docname="itoopie-512.svg"
-   inkscape:export-filename="/home/str4d/dev/i2p/android/i2p.android.base/res/drawable-xhdpi/ic_launcher_itoopie.png"
    inkscape:export-xdpi="16.875"
    inkscape:export-ydpi="16.875">
   <defs

art/itoopie-white-512.svg

@@ -0,0 +1,132 @@
+<?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"
+   id="svg2"
+   height="512"
+   width="512"
+   version="1.1"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="itoopie-white-512.svg"
+   inkscape:export-xdpi="8.4375"
+   inkscape:export-ydpi="8.4375">
+  <defs
+     id="defs661" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="719"
+     id="namedview659"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="137.71425"
+     inkscape:cy="184.35799"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata4321">
+    <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
+     id="g3042"
+     style="fill:#ffffff">
+    <path
+       sodipodi:nodetypes="cccccssccc"
+       style="fill:#ffffff"
+       inkscape:connector-curvature="0"
+       d="m 269.51027,463.35455 c -15.30293,7.3383 -16.75232,9.62416 -35.48219,9.7875 -18.0352,-0.48628 -44.4921,-1.71026 -52.17332,-10.84871 -14.84797,-18.35292 -17.30834,-7.98026 -17.72834,-3.83026 -1.12,11.2 -27.13,23.77 -11.32,35.35 4.63,3.39 10.55,2.65 15.96,2.65 l 34,0 c 17.51,0 35.54,1.26 53,-0.06 4.08,-0.3 6.15805,-3.88 9.99805,-3.98 0.39189,-9.24282 0.78712,-8.70426 3.7458,-29.06853 z"
+       id="path6" />
+    <path
+       style="fill:#ffffff"
+       id="path14"
+       d="m 267.11017,14.994328 c -7.7324,-0.0069 -15.54531,0.81125 -23.34375,2.5 -43.93,9.507 -76.5625,43.44275 -88.5625,85.968752 -10.53,37.33 1.895,78.49375 27.375,106.84375 6.71,7.46 14.86125,14.1025 23.28125,19.5625 3.73,2.42 9.79875,4.835 10.96875,9.625 1.32,5.42 -4.355,13.74875 -5.875,18.96875 -5.82,19.96 -16.3875,38.78 -21.1875,59 l 18,8 c 9.24,-17.53 14.7825,-38.36 21.5625,-57 2.31,-6.35 3.5625,-17.16 9.5625,-21.25 4.73,-3.22 14.515,-0.41625 19.875,0.0937 10.84,1.03 23.37,0.68125 34,-1.71875 52.22,-11.76995 89.71875,-57.84495 91.96875,-111.12495 C 387.50501,68.767016 330.074,15.050289 267.11017,14.994328 z m 51.03125,47.9375 c 44.71373,-0.143005 56.00313,72.218752 6.625,82.718752 -52.2,11.1 -68.42,-70.536252 -16,-81.656252 3.27,-0.693625 6.39408,-1.052966 9.375,-1.0625 z m -100.90625,3.625 c 45.11524,-1.123505 56.65125,74.421872 9.53125,81.687502 -7.89,1.21 -18.55,1.72125 -26,-1.46875 -40.25,-17.24 -29.94,-74.352002 12,-79.875002 1.52437,-0.200719 3.01342,-0.307508 4.46875,-0.34375 z"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 292.76642,122.46308 c 3,-3.96 5.42,-9.52 10.18,-11.66 15.75,-7.07 24.49,8.35 22.82,21.66 38.8,-11.2 14.11,-71.907002 -22,-53.850002 -4.34,2.168 -8.17,5.944 -10.96,9.85 -3.18,4.48 -5.24,9.49 -5.71,15.000002 -0.59,6.86 2.59,13.13 5.67,19 z"
+       id="path158"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 205.76642,135.46308 c -1.86,-8.13 -2.94,-15.07 3.38,-21.79 10.5,-11.16 28.74,-3.58 30.62,10.79 9.52,-9.43 5.95,-29.230002 -3.17,-37.740002 -12.58,-11.724 -31.99,-10.389 -42.89,2.76 -3.76,4.52 -5.37,9.22 -6.17,14.980002 -0.77,5.56 0.25,11.88 2.58,17 3.12,6.83 8.9,11.17 15.65,14 z"
+       id="path186"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 246.76642,258.46308 c -8.48,15.92 -15.41,36.57 -20.08,54 -1.36,5.06 -6.23,11.67 -4.89,17 3.2,12.76 17.13,22.54 28.97,25.62 22.34,5.83 48.15,7.53 70,-1.07 3.88,-1.53 9.74,-2.89 11.97,-6.74 2.07,-3.57 0.82,-8.86 1.2,-12.81 0.99,-10.2 6.53,-18.52 16.83,-21 0.01,-9.11 1.67,-18.72 8.46,-25.47 3.91,-3.89 10.2,-6.15 14.14,-1.19 9.75,12.3 -3.7,27.68 12.4,36.66 13.76,-29.42 26.34,-75.12 -15,-88.74 -5.23,-1.73 -11.36,-4.63 -17,-4.08 -10.25,1.01 -22.68,14.27 -32.42,18.73 -22.23,10.18 -50.54,14.88 -74.58,9.09 z"
+       id="path658"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 146.76642,326.46308 c 3.18,-4.17 6.58,-7.19 11,-10 -1.97,-3.92 -6.68,-6.5 -7.46,-11 -1.64,-9.41 12.19,-20.93 20.46,-21.82 4.38,-0.48 12.3,5.08 15.49,2.99 2.51,-1.64 3.42,-6.55 4.51,-9.17 3.1,-7.51 12.87,-25.96 7.97,-33.72 -5.8,-9.2 -26.8,3.73 -32.97,7.22 -13.64,7.73 -26.48,17.21 -39,26.63 -3.86,2.9 -12.34,8.01 -13.48,13 -1.24,5.43 2.89,10.17 6.2,13.83 7.67,8.5 17.17,16.64 27.28,22.04 z"
+       id="path702"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 352.76642,326.46308 1,1 -1,-1 z"
+       id="path980"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 353.80642,327.20308 c -8.51,3.44 -8.51,27.18 -1.48,32.23 3.87,2.78 17.29,-0.65 21.44,-2.32 23.49,-9.46 -4.63,-36.1 -19.96,-29.91 z"
+       id="path982"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 210.76642,353.46308 c -6.76,-9.02 -21.93,-17.44 -33,-19.53 -4.52,-0.85 -12.18,-1.71 -14.24,3.59 -2.56,6.57 3.94,13.06 9.24,15.61 11.8,5.69 25.9,4.17 38,0.33 z"
+       id="path1006"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 366.76642,373.46308 c -17.01,3.2 -27.07,2.97 -31,-16 -11.91,1.56 -23.62,7.8 -36,9.57 -4.1,0.59 -11.08,-0.98 -14.3,2.03 -5.1,4.77 -5.44,14.02 -5.74,20.4 -0.22,4.66 -2.39,9.33 -1.6,14 1.72,10.26 13.38,21.18 19.74,29 4.59,5.66 10.59,14.3 17.9,16.49 8.24,2.46 16.55,-4.65 23,-8.83 9.21,-5.99 19.98,-13.42 24.98,-23.66 2.33,-4.78 0.91,-11.82 1.04,-17 0.21,-8.7 1.98,-17.26 1.98,-26 z"
+       id="path1110"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 166.76642,372.46308 c 0,13.94 -0.51,25.95 5.22,39 4.77,10.86 10.96,21.1 18.95,30 6.92,7.7 14.83,8.96 24.83,9 17.21,0.08 33.73,-6.21 42.48,-22 11.07,-19.97 3.58,-55.02 -21.52,-61.31 -7.81,-1.95 -23.68,6.35 -31.96,8.1 -13.65,2.89 -24.79,-0.54 -38,-2.79 z"
+       id="path1138"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 374.76642,394.46308 c -0.86,6.78 1.35,18.22 -1.49,24.2 -7.25,15.25 -24.45,25.44 -38.51,33.66 -6.58,3.84 -13.19,7.73 -21,5.03 -16.77,-5.8 -20.94,-25.76 -35,-33.89 0,8.86 0.3,16.69 3.74,25 17.58,42.43 71.5,11.84 89.46,-14 7.43,-10.69 13.35,-29.47 2.8,-40 m -208,3 1,1 -1,-1 z"
+       id="path1198"
+       inkscape:connector-curvature="0" />
+    <path
+       style="fill:#ffffff"
+       d="m 164.76642,420.46308 c 2.63,10.96 11.11,20.8 17.28,30.04 2.17,3.23 4.52,8.56 8.1,10.4 4.57,2.35 11.58,2.11 16.62,2.72 15.31,1.83 33.26,2.59 48,-2.5 5.63,-1.95 11.75,-4.02 14.68,-9.66 2.98,-5.74 -0.56,-14.03 -1.68,-20 -5.56,5.92 -9.39,12.43 -16,17.54 -14.23,10.98 -43.14,17.76 -59,6.03 -12.43,-9.19 -17.42,-24.31 -28,-34.57 m 11,0 1,1 -1,-1 m 113,0 1,1 -1,-1 z"
+       id="path1222"
+       inkscape:connector-curvature="0" />
+    <path
+       id="path3026"
+       d="m 278.35292,463.71009 c -3.2194,13.63977 -2.83178,10.63387 -5.35379,28.59447 3.70248,1.1188 2.18729,3.09852 6.76729,3.15852 18.31,0.22 36.68,-2 55,-2 l 40,-1 c 4.66,-0.01 12.53,0.5 16.12,-3.03 8.06,-7.94 -1.26,-18.06 -7.12,-23.25 -2,-1.77 -6.69,-5 -6.22,-8.13 1.09974,-9.03578 -1.60893,-15.80295 -13.03557,-0.88889 -8.80009,6.59847 -11.40617,7.99716 -26.32376,13.38008 -9.52026,2.77856 -24.99871,5.64892 -35.63945,3.81206 -18.02388,-2.48398 -18.05064,-7.63298 -24.19472,-10.64624 z"
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff"
+       sodipodi:nodetypes="cccccccccccc" />
+  </g>
+</svg>

src/net/i2p/android/router/service/RouterService.java

@@ -110,15 +110,15 @@ public class RouterService extends Service {
             _receiver = new I2PReceiver(this);
             if(Util.isConnected(this)) {
                 if(restart) {
-                    _statusBar.replace(StatusBar.ICON1, "I2P is restarting");
+                    _statusBar.replace(StatusBar.ICON_STARTING, "I2P is restarting");
                 } else {
-                    _statusBar.replace(StatusBar.ICON1, "I2P is starting up");
+                    _statusBar.replace(StatusBar.ICON_STARTING, "I2P is starting up");
                 }
                 setState(State.STARTING);
                 _starterThread = new Thread(new Starter());
                 _starterThread.start();
             } else {
-                _statusBar.replace(StatusBar.ICON6, "I2P is waiting for a network connection");
+                _statusBar.replace(StatusBar.ICON_WAITING_NETWORK, "I2P is waiting for a network connection");
                 setState(State.WAITING);
                 _handler.postDelayed(new Waiter(), 10 * 1000);
             }
@@ -147,7 +147,7 @@ public class RouterService extends Service {
                         if(_state != State.WAITING) {
                             return;
                         }
-                        _statusBar.replace(StatusBar.ICON1, "Network connected, I2P is starting up");
+                        _statusBar.replace(StatusBar.ICON_STARTING, "Network connected, I2P is starting up");
                         setState(State.STARTING);
                         _starterThread = new Thread(new Starter());
                         _starterThread.start();
@@ -319,7 +319,7 @@ public class RouterService extends Service {
                 if((contexts == null) || (contexts.isEmpty())) {
                     throw new IllegalStateException("No contexts. This is usually because the router is either starting up or shutting down.");
                 }
-                _statusBar.replace(StatusBar.ICON2, "I2P is running");
+                _statusBar.replace(StatusBar.ICON_RUNNING, "I2P is running");
                 _context = (RouterContext) contexts.get(0);
                 _context.router().setKillVMOnEnd(false);
                 Job loadJob = new LoadClientsJob(_context);
@@ -379,9 +379,9 @@ public class RouterService extends Service {
         boolean haveTunnels = inCl > 0 && outCl > 0;
         if(haveTunnels != _hadTunnels) {
             if(haveTunnels) {
-                _statusBar.replace(StatusBar.ICON3, "Client tunnels are ready");
+                _statusBar.replace(StatusBar.ICON_ACTIVE, "Client tunnels are ready");
             } else {
-                _statusBar.replace(StatusBar.ICON2, "Client tunnels are down");
+                _statusBar.replace(StatusBar.ICON_RUNNING, "Client tunnels are down");
             }
             _hadTunnels = haveTunnels;
         }
@@ -447,7 +447,7 @@ public class RouterService extends Service {
                 _starterThread.interrupt();
             }
             if(_state == State.STARTING || _state == State.RUNNING) {
-                _statusBar.replace(StatusBar.ICON4, "Stopping I2P");
+                _statusBar.replace(StatusBar.ICON_STOPPING, "Stopping I2P");
                 Thread stopperThread = new Thread(new Stopper(State.MANUAL_STOPPING, State.MANUAL_STOPPED));
                 stopperThread.start();
             }
@@ -468,7 +468,7 @@ public class RouterService extends Service {
                 _starterThread.interrupt();
             }
             if(_state == State.STARTING || _state == State.RUNNING) {
-                _statusBar.replace(StatusBar.ICON4, "Stopping I2P");
+                _statusBar.replace(StatusBar.ICON_STOPPING, "Stopping I2P");
                 Thread stopperThread = new Thread(new Stopper(State.MANUAL_QUITTING, State.MANUAL_QUITTED));
                 stopperThread.start();
             } else if(_state == State.WAITING) {
@@ -489,7 +489,7 @@ public class RouterService extends Service {
                 _starterThread.interrupt();
             }
             if(_state == State.STARTING || _state == State.RUNNING) {
-                _statusBar.replace(StatusBar.ICON4, "Network disconnected, stopping I2P");
+                _statusBar.replace(StatusBar.ICON_STOPPING, "Network disconnected, stopping I2P");
                 // don't change state, let the shutdown hook do it
                 Thread stopperThread = new Thread(new Stopper(State.NETWORK_STOPPING, State.NETWORK_STOPPING));
                 stopperThread.start();
@@ -509,7 +509,7 @@ public class RouterService extends Service {
             if(!canManualStart()) {
                 return;
             }
-            _statusBar.replace(StatusBar.ICON1, "I2P is starting up");
+            _statusBar.replace(StatusBar.ICON_STARTING, "I2P is starting up");
             setState(State.STARTING);
             _starterThread = new Thread(new Starter());
             _starterThread.start();
@@ -547,7 +547,7 @@ public class RouterService extends Service {
             }
             if(_state == State.STARTING || _state == State.RUNNING) {
                 // should this be in a thread?
-                _statusBar.replace(StatusBar.ICON5, "I2P is shutting down");
+                _statusBar.replace(StatusBar.ICON_SHUTTING_DOWN, "I2P is shutting down");
                 Thread stopperThread = new Thread(new Stopper(State.STOPPING, State.STOPPED));
                 stopperThread.start();
             }
@@ -602,7 +602,7 @@ public class RouterService extends Service {
         public void run() {
             Util.i(this + " shutdown hook"
                     + " Current state is: " + _state);
-            _statusBar.replace(StatusBar.ICON5, "I2P is shutting down");
+            _statusBar.replace(StatusBar.ICON_SHUTTING_DOWN, "I2P is shutting down");
             I2PReceiver rcvr = _receiver;
             if(rcvr != null) {
                 synchronized(rcvr) {

src/net/i2p/android/router/service/StatusBar.java

@@ -17,12 +17,12 @@ class StatusBar {
 
     private static final int ID = 1337;
 
-    public static final int ICON1 = R.drawable.ic_launcher_itoopie_300;
-    public static final int ICON2 = R.drawable.ic_launcher_itoopie_330;
-    public static final int ICON3 = R.drawable.ic_launcher_itoopie;
-    public static final int ICON4 = R.drawable.ic_launcher_itoopie_120;
-    public static final int ICON5 = R.drawable.ic_launcher_itoopie_150;
-    public static final int ICON6 = R.drawable.ic_launcher_itoopie_180;
+    public static final int ICON_STARTING = R.drawable.ic_stat_router_starting;
+    public static final int ICON_RUNNING = R.drawable.ic_stat_router_running;
+    public static final int ICON_ACTIVE = R.drawable.ic_stat_router_active;
+    public static final int ICON_STOPPING = R.drawable.ic_stat_router_stopping;
+    public static final int ICON_SHUTTING_DOWN = R.drawable.ic_stat_router_shutting_down;
+    public static final int ICON_WAITING_NETWORK = R.drawable.ic_stat_router_waiting_network;
 
     StatusBar(Context cx) {
         ctx = cx;
@@ -30,7 +30,7 @@ class StatusBar {
         mgr = (NotificationManager)ctx.getSystemService(ns);
         Thread.currentThread().setUncaughtExceptionHandler(new CrashHandler(mgr));
 
-        int icon = ICON1;
+        int icon = ICON_STARTING;
         // won't be shown if replace() is called
         String text = "Starting I2P";
         long now = System.currentTimeMillis();