net2o gui icon for Android

AndroidManifest/apps

@@ -2,7 +2,7 @@ cat <<EOF
         <!-- Our activity is a homebrewn variant of the NativeAcitivity.
              This will take care of integrating with our NDK code. -->
         <activity android:name="${APP_PACKAGE}.Gforth_n2o"
-                android:icon="@drawable/net2o"
+                android:icon="@drawable/net2o-green"
                 android:label="@string/net2o_app_name"
                 android:windowAnimationStyle="@android:style/Animation.Activity"
 		android:windowSoftInputMode="stateHidden|adjustResize"
@@ -20,4 +20,23 @@ cat <<EOF
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name="${APP_PACKAGE}.Gforth_n2o"
+                android:icon="@drawable/net2o"
+                android:label="@string/net2o_app_name"
+                android:windowAnimationStyle="@android:style/Animation.Activity"
+		android:windowSoftInputMode="stateHidden|adjustResize"
+                android:configChanges="orientation|screenSize|keyboardHidden"
+                android:theme="@android:style/Theme.NoTitleBar"
+                android:launchMode="singleTop">
+            <!-- Tell NativeActivity the name of or .so -->
+            <meta-data android:name="android.app.lib_name"
+                    android:value="gforth-fast" />
+            <meta-data android:name="android.app.startfile"
+                    android:value="net2o/startn2ogui.fs" />
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="android.intent.action.DEFAULT" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
 EOF

bin/gen-icon

+#!/bin/bash
+
+convert -resize 32x32 $1 res/drawable-ldpi/$2
+convert -resize 48x48 $1 res/drawable-mdpi/$2
+convert -resize 72x72 $1 res/drawable-hdpi/$2
+convert -resize 96x96 $1 res/drawable-xhdpi/$2
+convert -resize 144x144 $1 res/drawable-xxhdpi/$2
+convert -resize 192x192 $1 res/drawable-xxxhdpi/$2

gui.fs

 \ net2o GUI
 
-\ Copyright © 2018-2019   Bernd Paysan
+\ Copyright © 2018-2020   Bernd Paysan
 
 \ This program is free software: you can redistribute it and/or modify
 \ it under the terms of the GNU Affero General Public License as published by
@@ -200,7 +200,7 @@ glue*shrink >o 0e 1filll 0e hglue-c glue! 1glue dglue-c glue! 1glue vglue-c glue
 	!i18n l" net2o GUI" /title
 	!lit
 	\footnote cbl dark-blue net2o-version }}text /center
-	!i18n l" Copyright © 2010–2019 Bernd Paysan" }}text' /center !lit
+	!i18n l" Copyright © 2010–2020 Bernd Paysan" }}text' /center !lit
 	{{
 	    {{
 		glue*ll }}glue
@@ -1049,8 +1049,8 @@ Variable re-indent#
     keysize safe/string IF  c@ 4 and IF  swap  THEN  ELSE  drop  THEN ;
 
 : update-thumb { d: hash object -- }
-    hash avatar-frame object >o to frame# hash >rotate
-    frame# i.w 2* frame# i.h 2* tile-glue hash >swap .wh-glue!  o>
+    hash avatar-frame object >o dup $10 dump to frame# hash >rotate
+    frame# i.w frame# i.h tile-glue hash >swap .wh-glue!  o>
     [: +sync +resize ;] msgs-box .vp-needed +sync +resize ;
 
 : 40%bv ( o -- o ) >o current-font-size% 40% f* fdup to border
@@ -1284,7 +1284,8 @@ Variable gui-log[]
 		gui-log[] [: }}text /left ;] $[]map
 	    }}v box[] 25%b \regular
 	    {{
-		s" ❌" $444444FF new-color, }}text 25%b /right dup { closer }
+		{{ s" ❌" $444444FF new-color, }}text }}h 25%b
+		dup { closer } /right
 		glue*ll }}glue
 	    }}v box[]
 	}}z box[] >r

lang/de

 Gforth
 ⚪
 net2o GUI
-Copyright © 2010–2019 Bernd Paysan
+Copyright © 2010–2020 Bernd Paysan
 Falsche Passphrase
 Zum Öffnen Passphrase eingeben
 Erzeuge neue ID

lang/en

 FORTH
 ⚪
 net2o GUI
-Copyright © 2010–2019 Bernd Paysan
+Copyright © 2010–2020 Bernd Paysan
 wrong passphrase!
 Enter passphrase to unlock
 Create new ID

lang/zh

 Gforth
 ⚪
 net2o 图形用户界面
-Copyright © 2010–2019 Bernd Paysan
+版权 © 2010–2020 Bernd Paysan
 错误的密码
 输入密码以解锁
 创建新的ID

msg.fs

 \ messages                                           06aug2014py
 
-\ Copyright © 2014-2019   Bernd Paysan
+\ Copyright © 2014-2020   Bernd Paysan
 
 \ This program is free software: you can redistribute it and/or modify
 \ it under the terms of the GNU Affero General Public License as published by
@@ -1931,8 +1931,9 @@ previous
 	    pubkey $@ key>nick type ." : "
 	    ack@ .timeouts @ . <default> cr )
 	    msg-group$ $@len IF
-		msg-group-o .msg:mode dup @ msg:otr# or swap
-		[: pubkey $@ ['] left, send-avalanche ;] !wrapper
+		msg-group-o ?dup-IF  .msg:mode dup @ msg:otr# or swap
+		    [: pubkey $@ ['] left, send-avalanche ;] !wrapper
+		THEN
 	    THEN
 	    net2o:dispose-context
 	    EXIT

startn2ogui.fs

+\ Start net2o on android
+
+e? os-type s" linux-android" string-prefix? [IF] require starta.fs [THEN]
+page ." loading n2o..."
+warnings off \ no warnings please
+require n2o.fs
+page
+:noname load-rc save-net2o-cmds set-net2o-cmds n2o:gui ; is bootmessage