Browse Source

Icons for android app

Bob Mottram 3 years ago
parent
commit
95d11130de
67 changed files with 16 additions and 40 deletions
  1. 2
    0
      Makefile
  2. BIN
      img/android-app/akaunting.png
  3. BIN
      img/android-app/bludit.png
  4. BIN
      img/android-app/conversations.png
  5. BIN
      img/android-app/dlna.png
  6. BIN
      img/android-app/dokuwiki.png
  7. BIN
      img/android-app/edith.png
  8. BIN
      img/android-app/etherpad.png
  9. BIN
      img/android-app/fedwiki.png
  10. BIN
      img/android-app/friendica.png
  11. BIN
      img/android-app/gnusocial.png
  12. BIN
      img/android-app/gogs.png
  13. BIN
      img/android-app/htmly.png
  14. BIN
      img/android-app/hubzilla.png
  15. BIN
      img/android-app/irc.png
  16. BIN
      img/android-app/kanboard.png
  17. BIN
      img/android-app/koel.png
  18. BIN
      img/android-app/lychee.png
  19. BIN
      img/android-app/mailpile.png
  20. BIN
      img/android-app/matrix.png
  21. BIN
      img/android-app/mediagoblin.png
  22. BIN
      img/android-app/movim.png
  23. BIN
      img/android-app/mumble.png
  24. BIN
      img/android-app/nextcloud.png
  25. BIN
      img/android-app/peertube.png
  26. BIN
      img/android-app/postactiv.png
  27. BIN
      img/android-app/privatebin.png
  28. BIN
      img/android-app/rocketchat.png
  29. BIN
      img/android-app/searx.png
  30. BIN
      img/android-app/syncthing.png
  31. BIN
      img/android-app/tahoelafs.png
  32. BIN
      img/android-app/turtl.png
  33. 0
    1
      src/freedombone-app-akaunting
  34. 0
    1
      src/freedombone-app-bludit
  35. 0
    1
      src/freedombone-app-dlna
  36. 0
    1
      src/freedombone-app-dokuwiki
  37. 0
    1
      src/freedombone-app-edith
  38. 0
    1
      src/freedombone-app-etherpad
  39. 0
    1
      src/freedombone-app-fedwiki
  40. 0
    1
      src/freedombone-app-friendica
  41. 0
    1
      src/freedombone-app-gnusocial
  42. 0
    1
      src/freedombone-app-gogs
  43. 0
    1
      src/freedombone-app-htmly
  44. 0
    1
      src/freedombone-app-hubzilla
  45. 0
    1
      src/freedombone-app-icecast
  46. 0
    1
      src/freedombone-app-irc
  47. 0
    1
      src/freedombone-app-jitsi
  48. 0
    1
      src/freedombone-app-kanboard
  49. 0
    1
      src/freedombone-app-koel
  50. 0
    1
      src/freedombone-app-lychee
  51. 0
    1
      src/freedombone-app-mailpile
  52. 0
    1
      src/freedombone-app-matrix
  53. 1
    2
      src/freedombone-app-mediagoblin
  54. 0
    1
      src/freedombone-app-movim
  55. 0
    1
      src/freedombone-app-mumble
  56. 0
    1
      src/freedombone-app-nextcloud
  57. 0
    1
      src/freedombone-app-peertube
  58. 0
    1
      src/freedombone-app-pleroma
  59. 0
    1
      src/freedombone-app-postactiv
  60. 0
    1
      src/freedombone-app-privatebin
  61. 0
    1
      src/freedombone-app-rocketchat
  62. 0
    1
      src/freedombone-app-syncthing
  63. 0
    1
      src/freedombone-app-turtl
  64. 0
    1
      src/freedombone-app-xmpp
  65. 0
    1
      src/freedombone-syncthing
  66. 0
    1
      src/freedombone-template
  67. 13
    5
      src/freedombone-utils-android

+ 2
- 0
Makefile View File

@@ -20,6 +20,7 @@ install:
20 20
 	mkdir -p ${DESTDIR}${PREFIX}/bin
21 21
 	mkdir -p ${DESTDIR}/usr/share/${APP}/base
22 22
 	mkdir -p ${DESTDIR}/usr/share/${APP}/apps
23
+	mkdir -p ${DESTDIR}/usr/share/${APP}/android-app
23 24
 	mkdir -p ${DESTDIR}/usr/share/${APP}/utils
24 25
 	mkdir -p ${DESTDIR}/usr/share/${APP}/avatars
25 26
 	mkdir -p ${DESTDIR}/etc/${APP}
@@ -46,6 +47,7 @@ install:
46 47
 	cp man/*.1.gz ${DESTDIR}${PREFIX}/share/man/man1
47 48
 	cp man/${APP}-backup-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/backup.1.gz
48 49
 	cp man/${APP}-restore-local.1.gz ${DESTDIR}${PREFIX}/share/man/man1/restore.1.gz
50
+	cp img/android-app/*.png ${DESTDIR}/usr/share/${APP}/android-app
49 51
 	chown -R root: /usr/share/${APP}
50 52
 	chmod -R +r /usr/share/${APP}
51 53
 #	bash -c "./translate install"

BIN
img/android-app/akaunting.png View File


BIN
img/android-app/bludit.png View File


BIN
img/android-app/conversations.png View File


BIN
img/android-app/dlna.png View File


BIN
img/android-app/dokuwiki.png View File


BIN
img/android-app/edith.png View File


BIN
img/android-app/etherpad.png View File


BIN
img/android-app/fedwiki.png View File


BIN
img/android-app/friendica.png View File


BIN
img/android-app/gnusocial.png View File


BIN
img/android-app/gogs.png View File


BIN
img/android-app/htmly.png View File


BIN
img/android-app/hubzilla.png View File


BIN
img/android-app/irc.png View File


BIN
img/android-app/kanboard.png View File


BIN
img/android-app/koel.png View File


BIN
img/android-app/lychee.png View File


BIN
img/android-app/mailpile.png View File


BIN
img/android-app/matrix.png View File


BIN
img/android-app/mediagoblin.png View File


BIN
img/android-app/movim.png View File


BIN
img/android-app/mumble.png View File


BIN
img/android-app/nextcloud.png View File


BIN
img/android-app/peertube.png View File


BIN
img/android-app/postactiv.png View File


BIN
img/android-app/privatebin.png View File


BIN
img/android-app/rocketchat.png View File


BIN
img/android-app/searx.png View File


BIN
img/android-app/syncthing.png View File


BIN
img/android-app/tahoelafs.png View File


BIN
img/android-app/turtl.png View File


+ 0
- 1
src/freedombone-app-akaunting View File

@@ -42,7 +42,6 @@ AKAUNTING_BACKGROUND_IMAGE_URL=
42 42
 
43 43
 AKAUNTING_SHORT_DESCRIPTION=$'Personal accounting'
44 44
 AKAUNTING_DESCRIPTION=$'Personal or small business accounting'
45
-AKAUNTING_ICON_URL=
46 45
 AKAUNTING_MOBILE_APP_URL=
47 46
 
48 47
 akaunting_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-bludit View File

@@ -37,7 +37,6 @@ BLUDIT_COMMIT='0e27e31a84421b3e6bd000a77bc89c2dff3c446a'
37 37
 
38 38
 BLUDIT_SHORT_DESCRIPTION=$'Bludit Blog'
39 39
 BLUDIT_DESCRIPTION=$'Simple Markdown blogging'
40
-BLUDIT_ICON_URL=
41 40
 BLUDIT_MOBILE_APP_URL=
42 41
 
43 42
 bludit_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-dlna View File

@@ -33,7 +33,6 @@ SHOW_ON_ABOUT=0
33 33
 
34 34
 DLNA_SHORT_DESCRIPTION=$'DLNA media'
35 35
 DLNA_DESCRIPTION=$'DLNA media'
36
-DLNA_ICON_URL=
37 36
 DLNA_MOBILE_APP_URL=
38 37
 
39 38
 dlna_variables=(SYSTEM_TYPE

+ 0
- 1
src/freedombone-app-dokuwiki View File

@@ -42,7 +42,6 @@ DOKUWIKI_COMMIT='be15c01c0b982cf1a75b5af031bf077143c63f39'
42 42
 
43 43
 DOKUWIKI_SHORT_DESCRIPTION=$'Dokuwiki'
44 44
 DOKUWIKI_DESCRIPTION=$'Dokuwiki databaseless wiki'
45
-DOKUWIKI_ICON_URL=
46 45
 DOKUWIKI_MOBILE_APP_URL=
47 46
 
48 47
 dokuwiki_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-edith View File

@@ -40,7 +40,6 @@ EDITH_LOGIN_TEXT=$"Edith login"
40 40
 
41 41
 EDITH_SHORT_DESCRIPTION=$'Edith Notes'
42 42
 EDITH_DESCRIPTION=$'Extremely simple note taking'
43
-EDITH_ICON_URL=
44 43
 EDITH_MOBILE_APP_URL=
45 44
 
46 45
 edith_variables=(MY_USERNAME

+ 0
- 1
src/freedombone-app-etherpad View File

@@ -44,7 +44,6 @@ ETHERPAD_WELCOME_MESSAGE=$"Welcome to ${ETHERPAD_TITLE}!\\n\\nThis pad text is s
44 44
 
45 45
 ETHERPAD_SHORT_DESCRIPTION=$'Etherpad'
46 46
 ETHERPAD_DESCRIPTION=$'Etherpad'
47
-ETHERPAD_ICON_URL=
48 47
 ETHERPAD_MOBILE_APP_URL=
49 48
 
50 49
 etherpad_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-fedwiki View File

@@ -44,7 +44,6 @@ FEDWIKI_COOKIE=
44 44
 
45 45
 FEDWIKI_SHORT_DESCRIPTION=$'FedWiki'
46 46
 FEDWIKI_DESCRIPTION=$'Federated Wiki'
47
-FEDWIKI_ICON_URL=
48 47
 FEDWIKI_MOBILE_APP_URL=
49 48
 
50 49
 fedwiki_variables=(FEDWIKI_DOMAIN_NAME

+ 0
- 1
src/freedombone-app-friendica View File

@@ -42,7 +42,6 @@ FRIENDICA_ADDONS_COMMIT='7cb9dbdda7f227462895c07be3c968405561d40e'
42 42
 
43 43
 FRIENDICA_SHORT_DESCRIPTION=$'Friendica'
44 44
 FRIENDICA_DESCRIPTION=$'Friendica federated social network'
45
-FRIENDICA_ICON_URL=
46 45
 FRIENDICA_MOBILE_APP_URL=
47 46
 
48 47
 friendica_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-gnusocial View File

@@ -48,7 +48,6 @@ GNUSOCIAL_EXPIRE_MONTHS=3
48 48
 
49 49
 GNUSOCIAL_SHORT_DESCRIPTION=$'GNU Social'
50 50
 GNUSOCIAL_DESCRIPTION=$'GNU Social federated microblogging'
51
-GNUSOCIAL_ICON_URL=
52 51
 GNUSOCIAL_MOBILE_APP_URL='https://f-droid.org/packages/org.mariotaku.twidere/'
53 52
 
54 53
 gnusocial_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-gogs View File

@@ -43,7 +43,6 @@ GOGS_PORT=3145
43 43
 
44 44
 GOGS_SHORT_DESCRIPTION=$'Gogs'
45 45
 GOGS_DESCRIPTION=$'Gogs git repo management'
46
-GOGS_ICON_URL=
47 46
 GOGS_MOBILE_APP_URL=
48 47
 
49 48
 gogs_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-htmly View File

@@ -41,7 +41,6 @@ HTMLY_SUBTITLE="Another ${PROJECT_NAME} blog"
41 41
 
42 42
 HTMLY_SHORT_DESCRIPTION=$'HTMLy'
43 43
 HTMLY_DESCRIPTION=$'HTMLy databaseless blogging'
44
-HTMLY_ICON_URL=
45 44
 HTMLY_MOBILE_APP_URL=
46 45
 
47 46
 htmly_variables=(HTMLY_REPO

+ 0
- 1
src/freedombone-app-hubzilla View File

@@ -43,7 +43,6 @@ HUBZILLA_ADMIN_PASSWORD=
43 43
 
44 44
 HUBZILLA_SHORT_DESCRIPTION=$'Hubzilla'
45 45
 HUBZILLA_DESCRIPTION=$'Hubzilla'
46
-HUBZILLA_ICON_URL=
47 46
 HUBZILLA_MOBILE_APP_URL=
48 47
 
49 48
 hubzilla_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-icecast View File

@@ -46,7 +46,6 @@ ICECAST_LOGIN_TEXT=$"Icecast login"
46 46
 
47 47
 ICECAST_SHORT_DESCRIPTION=$'Icecast'
48 48
 ICECAST_DESCRIPTION=$'Icecast'
49
-ICECAST_ICON_URL=
50 49
 ICECAST_MOBILE_APP_URL=
51 50
 
52 51
 icecast_variables=(MY_USERNAME

+ 0
- 1
src/freedombone-app-irc View File

@@ -43,7 +43,6 @@ IRC_BUFFER_LENGTH=300
43 43
 
44 44
 IRC_SHORT_DESCRIPTION=$'IRC'
45 45
 IRC_DESCRIPTION=$'IRC'
46
-IRC_ICON_URL=
47 46
 IRC_MOBILE_APP_URL='https://f-droid.org/packages/org.yaaic'
48 47
 
49 48
 irc_variables=(MY_USERNAME

+ 0
- 1
src/freedombone-app-jitsi View File

@@ -46,7 +46,6 @@ JITSI_ONION_HOSTNAME=
46 46
 
47 47
 JITSI_SHORT_DESCRIPTION=$'Jitsi'
48 48
 JITSI_DESCRIPTION=$'Jitsi'
49
-JITSI_ICON_URL=
50 49
 JITSI_MOBILE_APP_URL=
51 50
 
52 51
 jitsi_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-kanboard View File

@@ -40,7 +40,6 @@ KANBOARD_ADMIN_PASSWORD=
40 40
 
41 41
 KANBOARD_SHORT_DESCRIPTION=$'Kanboard'
42 42
 KANBOARD_DESCRIPTION=$'Kanboard kanban'
43
-KANBOARD_ICON_URL=
44 43
 KANBOARD_MOBILE_APP_URL=
45 44
 
46 45
 kanboard_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-koel View File

@@ -42,7 +42,6 @@ KOEL_ADMIN_PASSWORD=
42 42
 
43 43
 KOEL_SHORT_DESCRIPTION=$'Koel music'
44 44
 KOEL_DESCRIPTION=$'Koel music player'
45
-KOEL_ICON_URL=
46 45
 KOEL_MOBILE_APP_URL=
47 46
 
48 47
 koel_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-lychee View File

@@ -39,7 +39,6 @@ LYCHEE_COMMIT='27f207dcbac8488629ffc3b5a9cac78ae123bee9'
39 39
 
40 40
 LYCHEE_SHORT_DESCRIPTION=$'Lychee photos'
41 41
 LYCHEE_DESCRIPTION=$'Lychee photos'
42
-LYCHEE_ICON_URL=
43 42
 LYCHEE_MOBILE_APP_URL=
44 43
 
45 44
 lychee_variables=(LYCHEE_REPO

+ 0
- 1
src/freedombone-app-mailpile View File

@@ -40,7 +40,6 @@ MAILPILE_PORT=33411
40 40
 
41 41
 MAILPILE_SHORT_DESCRIPTION=$'Mailpile'
42 42
 MAILPILE_DESCRIPTION=$'Mailpile email client'
43
-MAILPILE_ICON_URL=
44 43
 MAILPILE_MOBILE_APP_URL=
45 44
 
46 45
 mailpile_variables=(MAILPILE_REPO

+ 0
- 1
src/freedombone-app-matrix View File

@@ -55,7 +55,6 @@ MATRIX_EXPIRE_MONTHS=1
55 55
 
56 56
 MATRIX_SHORT_DESCRIPTION=$'Matrix chat'
57 57
 MATRIX_DESCRIPTION=$'Matrix chat'
58
-MATRIX_ICON_URL=
59 58
 MATRIX_MOBILE_APP_URL='https://f-droid.org/packages/im.vector.alpha'
60 59
 
61 60
 matrix_variables=(ONION_ONLY

+ 1
- 2
src/freedombone-app-mediagoblin View File

@@ -35,14 +35,13 @@ MEDIAGOBLIN_DOMAIN_NAME=
35 35
 MEDIAGOBLIN_ADMIN_PASSWORD=
36 36
 MEDIAGOBLIN_CODE=
37 37
 MEDIAGOBLIN_ONION_PORT=8108
38
-MEDIAGOBLIN_REPO="http://git.savannah.gnu.org/r/mediagoblin.git"
38
+MEDIAGOBLIN_REPO="https://git.savannah.gnu.org/git/mediagoblin.git"
39 39
 MEDIAGOBLIN_COMMIT='c4d3293dfa4076719e60fe9e052add07426f9a9a'
40 40
 MEDIAGOBLIN_BASE_DIR=/var/www/mediagoblin.local/htdocs
41 41
 MEDIAGOBLIN_PORT=6543
42 42
 
43 43
 MEDIAGOBLIN_SHORT_DESCRIPTION=$'Mediagoblin'
44 44
 MEDIAGOBLIN_DESCRIPTION=$'Mediagoblin'
45
-MEDIAGOBLIN_ICON_URL=
46 45
 MEDIAGOBLIN_MOBILE_APP_URL=
47 46
 
48 47
 mediagoblin_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-movim View File

@@ -41,7 +41,6 @@ MOVIM_DAEMON_PORT=8880
41 41
 
42 42
 MOVIM_SHORT_DESCRIPTION=$'Movim'
43 43
 MOVIM_DESCRIPTION=$'Movim'
44
-MOVIM_ICON_URL=
45 44
 MOVIM_MOBILE_APP_URL='https://f-droid.org/packages/com.movim.movim'
46 45
 
47 46
 movim_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-mumble View File

@@ -42,7 +42,6 @@ MUMBLE_CONFIG_FILE="mumble-server.ini"
42 42
 
43 43
 MUMBLE_SHORT_DESCRIPTION=$'Mumble'
44 44
 MUMBLE_DESCRIPTION=$'Mumble'
45
-MUMBLE_ICON_URL=
46 45
 MUMBLE_MOBILE_APP_URL='https://f-droid.org/packages/com.morlunk.mumbleclient'
47 46
 
48 47
 mumble_variables=(MY_USERNAME

+ 0
- 1
src/freedombone-app-nextcloud View File

@@ -44,7 +44,6 @@ NEXTCLOUD_SERVER_SIDE_ENCRYPTION=1
44 44
 
45 45
 NEXTCLOUD_SHORT_DESCRIPTION=$'NextCloud'
46 46
 NEXTCLOUD_DESCRIPTION=$'NextCloud'
47
-NEXTCLOUD_ICON_URL=
48 47
 NEXTCLOUD_MOBILE_APP_URL='https://f-droid.org/packages/com.nextcloud.client'
49 48
 
50 49
 nextcloud_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-peertube View File

@@ -46,7 +46,6 @@ PEERTUBE_DIR=/etc/peertube
46 46
 
47 47
 PEERTUBE_SHORT_DESCRIPTION=$'PeerTube'
48 48
 PEERTUBE_DESCRIPTION=$'PeerTube'
49
-PEERTUBE_ICON_URL=
50 49
 PEERTUBE_MOBILE_APP_URL=
51 50
 
52 51
 peertube_variables=(PEERTUBE_DOMAIN_NAME

+ 0
- 1
src/freedombone-app-pleroma View File

@@ -53,7 +53,6 @@ blocking_script_file=/usr/bin/pleroma-blocking
53 53
 
54 54
 PLEROMA_SHORT_DESCRIPTION=$'Pleroma'
55 55
 PLEROMA_DESCRIPTION=$'Pleroma federated microblogging'
56
-PLEROMA_ICON_URL=
57 56
 PLEROMA_MOBILE_APP_URL='https://f-droid.org/packages/com.keylesspalace.tusky'
58 57
 
59 58
 pleroma_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-postactiv View File

@@ -47,7 +47,6 @@ POSTACTIV_EXPIRE_MONTHS=3
47 47
 
48 48
 POSTACTIV_SHORT_DESCRIPTION=$'PostActiv'
49 49
 POSTACTIV_DESCRIPTION=$'PostActiv federated microblogging'
50
-POSTACTIV_ICON_URL=
51 50
 POSTACTIV_MOBILE_APP_URL='https://f-droid.org/packages/org.mariotaku.twidere/'
52 51
 
53 52
 postactiv_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-privatebin View File

@@ -40,7 +40,6 @@ PRIVATEBIN_ADMIN_PASSWORD=
40 40
 
41 41
 PRIVATEBIN_SHORT_DESCRIPTION=$'PrivateBin'
42 42
 PRIVATEBIN_DESCRIPTION=$'PrivateBin zero knowledge pastebin'
43
-PRIVATEBIN_ICON_URL=
44 43
 PRIVATEBIN_MOBILE_APP_URL=
45 44
 
46 45
 privatebin_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-rocketchat View File

@@ -38,7 +38,6 @@ ROCKETCHAT_PORT_INTERNAL=3000
38 38
 
39 39
 ROCKETCHAT_SHORT_DESCRIPTION=$'Rocketchat'
40 40
 ROCKETCHAT_DESCRIPTION=$'Rocketchat'
41
-ROCKETCHAT_ICON_URL=
42 41
 ROCKETCHAT_MOBILE_APP_URL=
43 42
 
44 43
 rocketchat_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-syncthing View File

@@ -42,7 +42,6 @@ SYNCTHING_USER_IDS_FILE='.syncthingids'
42 42
 
43 43
 SYNCTHING_SHORT_DESCRIPTION=$'Syncthing'
44 44
 SYNCTHING_DESCRIPTION=$'Syncthing file synchronization'
45
-SYNCTHING_ICON_URL=
46 45
 SYNCTHING_MOBILE_APP_URL='https://f-droid.org/packages/com.nutomic.syncthingandroid'
47 46
 
48 47
 syncthing_variables=(SYNCTHING_ID

+ 0
- 1
src/freedombone-app-turtl View File

@@ -50,7 +50,6 @@ turtl_users_file=$TURTL_BASE_DIR/api/controllers/users.lisp
50 50
 
51 51
 TURTL_SHORT_DESCRIPTION=$'Turtl'
52 52
 TURTL_DESCRIPTION=$'Turtl notes'
53
-TURTL_ICON_URL=
54 53
 TURTL_MOBILE_APP_URL=
55 54
 
56 55
 turtl_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-app-xmpp View File

@@ -55,7 +55,6 @@ xmpp_encryption_warning=$"For security reasons, OMEMO or PGP encryption is requi
55 55
 
56 56
 XMPP_SHORT_DESCRIPTION=$'XMPP chat'
57 57
 XMPP_DESCRIPTION=$'XMPP chat'
58
-XMPP_ICON_URL=
59 58
 XMPP_MOBILE_APP_URL='https://f-droid.org/packages/eu.siacs.conversations'
60 59
 
61 60
 xmpp_variables=(ONION_ONLY

+ 0
- 1
src/freedombone-syncthing View File

@@ -57,7 +57,6 @@ TEMP_IDS_FILE=/root/.synthingids
57 57
 
58 58
 SYNCTHING_SHORT_DESCRIPTION=$'File Synchronization'
59 59
 SYNCTHING_DESCRIPTION=$'File Synchronization'
60
-SYNCTHING_ICON_URL=
61 60
 SYNCTHING_MOBILE_APP_URL='https://f-droid.org/packages/com.nutomic.syncthingandroid'
62 61
 
63 62
 function remove_user_syncthing {

+ 0
- 1
src/freedombone-template View File

@@ -283,7 +283,6 @@ echo ''
283 283
 echo $'# These parameters are used by the FreedomBox mobile app'
284 284
 echo "${app_name_upper}_SHORT_DESCRIPTION="
285 285
 echo "${app_name_upper}_DESCRIPTION="
286
-echo "${app_name_upper}_ICON_URL="
287 286
 echo "${app_name_upper}_MOBILE_APP_URL="
288 287
 echo ''
289 288
 echo "${app_name}_variables=(ONION_ONLY"

+ 13
- 5
src/freedombone-utils-android View File

@@ -37,6 +37,9 @@ function android_update_apps {
37 37
     if [ ! -d "/var/www/${local_hostname}/htdocs/plinth/api" ]; then
38 38
         mkdir -p "/var/www/${local_hostname}/htdocs/plinth/api"
39 39
     fi
40
+    if [ ! -d "/var/www/${local_hostname}/htdocs/icons" ]; then
41
+        mkdir -p "/var/www/${local_hostname}/htdocs/icons"
42
+    fi
40 43
 
41 44
     echo '{' > "$plinth_api"
42 45
     echo '  "shortcuts": [' >> "$plinth_api"
@@ -50,10 +53,17 @@ function android_update_apps {
50 53
             app_name=${APPS_INSTALLED_NAMES[$app_index]}
51 54
             app_filename="/usr/share/${PROJECT_NAME}/apps/${PROJECT_NAME}-app-${app_name}"
52 55
             if [ -f "$app_filename" ]; then
56
+                # get the icon for the app
57
+                icon_filename="/usr/share/${PROJECT_NAME}/android-app/${app_name}.png"
58
+                if [ -f "$icon_filename" ]; then
59
+                    cp "$icon_filename" "/var/www/${local_hostname}/htdocs/icons/${app_name}.png"
60
+                else
61
+                    icon_filename=
62
+                fi
63
+
53 64
                 app_name_upper=$(echo "$app_name" | awk '{print toupper($0)}')
54 65
                 SHORT_DESCRIPTION=
55 66
                 DESCRIPTION=
56
-                ICON_URL=
57 67
                 MOBILE_APP_URL=
58 68
 
59 69
                 if ! grep -q "${app_name_upper}_SHORT_DESCRIPTION=" "$app_filename"; then
@@ -67,9 +77,6 @@ function android_update_apps {
67 77
                 if grep -q "${app_name_upper}_DESCRIPTION=" "$app_filename"; then
68 78
                     DESCRIPTION="$(grep "${app_name_upper}_DESCRIPTION=" "$app_filename" | head -n 1 | sed 's|\$||g' | sed "s|'||g" | sed 's|\"||g' | awk -F '=' '{print $2}')"
69 79
                 fi
70
-                if grep -q "${app_name_upper}_ICON_URL=" "$app_filename"; then
71
-                    ICON_URL="$(grep "${app_name_upper}_ICON_URL=" "$app_filename" | head -n 1 | sed 's|\$||g' | sed 's|\$||g' | sed "s|'||g" | sed 's|\"||g' | awk -F '=' '{print $2}')"
72
-                fi
73 80
                 if grep -q "${app_name_upper}_MOBILE_APP_URL=" "$app_filename"; then
74 81
                     MOBILE_APP_URL="$(grep "${app_name_upper}_MOBILE_APP_URL=" "$app_filename" | head -n 1 | sed 's|\$||g' | sed 's|\$||g' | sed "s|'||g" | sed 's|\"||g' | awk -F '=' '{print $2}')"
75 82
                 fi
@@ -82,7 +89,7 @@ function android_update_apps {
82 89
                   echo "      \"name\": \"${app_name}\",";
83 90
                   echo "      \"short_description\": \"$SHORT_DESCRIPTION\",";
84 91
                   echo "      \"description\": \"$DESCRIPTION\",";
85
-                  echo "      \"icon_url\": \"$ICON_URL\",";
92
+                  echo "      \"icon_url\": \"/icons/${app_name}.png\",";
86 93
                   echo "      \"clients\": ["; } >> "$plinth_api"
87 94
 
88 95
                 read_config_param "${app_name_upper}_DOMAIN_NAME"
@@ -143,6 +150,7 @@ function android_update_apps {
143 150
       echo '}'; } >> "$plinth_api"
144 151
 
145 152
     chown -R www-data:www-data "/var/www/${local_hostname}/htdocs/plinth"
153
+    chown -R www-data:www-data "/var/www/${local_hostname}/htdocs/icons"
146 154
 }
147 155
 
148 156
 # NOTE: deliberately no exit 0