From 20defe6c97e6b647930aa6295068e3585023f265 Mon Sep 17 00:00:00 2001 From: dllud Date: Tue, 17 Dec 2019 00:54:51 +0000 Subject: Reorganized app icons. Added logo into title frame. --- img/andotp.png | Bin 33375 -> 0 bytes img/app-icons/andotp.png | Bin 0 -> 33375 bytes img/app-icons/bitmask.png | Bin 0 -> 39579 bytes img/app-icons/briar.png | Bin 0 -> 8998 bytes img/app-icons/conversations.png | Bin 0 -> 43688 bytes img/app-icons/dandelion.png | Bin 0 -> 30155 bytes img/app-icons/etesync.png | Bin 0 -> 47356 bytes img/app-icons/fdroid.png | Bin 0 -> 50625 bytes img/app-icons/fennec.png | Bin 0 -> 108019 bytes img/app-icons/i2p.png | Bin 0 -> 35797 bytes img/app-icons/jami.png | Bin 0 -> 57330 bytes img/app-icons/k9mail.png | Bin 0 -> 43356 bytes img/app-icons/keepassdx.png | Bin 0 -> 35823 bytes img/app-icons/movim.png | Bin 0 -> 20421 bytes img/app-icons/nextcloud.png | Bin 0 -> 41010 bytes img/app-icons/nomad.png | Bin 0 -> 8053 bytes img/app-icons/openkeychain.png | Bin 0 -> 41643 bytes img/app-icons/orbot.png | Bin 0 -> 31085 bytes img/app-icons/osmand.png | Bin 0 -> 101752 bytes img/app-icons/shaarlier.png | Bin 0 -> 31601 bytes img/app-icons/signal.png | Bin 0 -> 33668 bytes img/app-icons/silence.png | Bin 0 -> 21000 bytes img/app-icons/syncthing.png | Bin 0 -> 29755 bytes img/app-icons/thorium.png | Bin 0 -> 12231 bytes img/app-icons/tincapp.png | Bin 0 -> 27849 bytes img/app-icons/torbrowser.png | Bin 0 -> 37125 bytes img/app-icons/ttrss.png | Bin 0 -> 29587 bytes img/app-icons/tusky.png | Bin 0 -> 71995 bytes img/app-icons/wallabag.png | Bin 0 -> 18303 bytes img/app-icons/wireguard.png | Bin 0 -> 22885 bytes img/bitmask.png | Bin 39579 -> 0 bytes img/briar.png | Bin 8998 -> 0 bytes img/conversations.png | Bin 43688 -> 0 bytes img/dandelion.png | Bin 30155 -> 0 bytes img/etesync.png | Bin 47356 -> 0 bytes img/fdroid.png | Bin 50625 -> 0 bytes img/fennec.png | Bin 108019 -> 0 bytes img/i2p.png | Bin 35797 -> 0 bytes img/jami.png | Bin 57330 -> 0 bytes img/k9mail.png | Bin 43356 -> 0 bytes img/keepassdx.png | Bin 35823 -> 0 bytes img/logo.png | Bin 0 -> 43414 bytes img/logo.svg | 379 ++++++++++++++++++++++++++++++++++++++++ img/movim.png | Bin 20421 -> 0 bytes img/nextcloud.png | Bin 41010 -> 0 bytes img/nomad.png | Bin 8053 -> 0 bytes img/openkeychain.png | Bin 41643 -> 0 bytes img/orbot.png | Bin 31085 -> 0 bytes img/osmand.png | Bin 101752 -> 0 bytes img/shaarlier.png | Bin 31601 -> 0 bytes img/signal.png | Bin 33668 -> 0 bytes img/silence.png | Bin 21000 -> 0 bytes img/syncthing.png | Bin 29755 -> 0 bytes img/thorium.png | Bin 12231 -> 0 bytes img/tincapp.png | Bin 27849 -> 0 bytes img/torbrowser.png | Bin 37125 -> 0 bytes img/ttrss.png | Bin 29587 -> 0 bytes img/tusky.png | Bin 71995 -> 0 bytes img/wallabag.png | Bin 18303 -> 0 bytes img/wireguard.png | Bin 22885 -> 0 bytes logo.svg | 379 ---------------------------------------- slides.tex | 62 +++---- 62 files changed, 411 insertions(+), 409 deletions(-) delete mode 100644 img/andotp.png create mode 100644 img/app-icons/andotp.png create mode 100644 img/app-icons/bitmask.png create mode 100644 img/app-icons/briar.png create mode 100644 img/app-icons/conversations.png create mode 100644 img/app-icons/dandelion.png create mode 100644 img/app-icons/etesync.png create mode 100644 img/app-icons/fdroid.png create mode 100644 img/app-icons/fennec.png create mode 100644 img/app-icons/i2p.png create mode 100644 img/app-icons/jami.png create mode 100644 img/app-icons/k9mail.png create mode 100644 img/app-icons/keepassdx.png create mode 100644 img/app-icons/movim.png create mode 100644 img/app-icons/nextcloud.png create mode 100644 img/app-icons/nomad.png create mode 100644 img/app-icons/openkeychain.png create mode 100644 img/app-icons/orbot.png create mode 100644 img/app-icons/osmand.png create mode 100644 img/app-icons/shaarlier.png create mode 100644 img/app-icons/signal.png create mode 100644 img/app-icons/silence.png create mode 100644 img/app-icons/syncthing.png create mode 100644 img/app-icons/thorium.png create mode 100644 img/app-icons/tincapp.png create mode 100644 img/app-icons/torbrowser.png create mode 100644 img/app-icons/ttrss.png create mode 100644 img/app-icons/tusky.png create mode 100644 img/app-icons/wallabag.png create mode 100644 img/app-icons/wireguard.png delete mode 100644 img/bitmask.png delete mode 100644 img/briar.png delete mode 100644 img/conversations.png delete mode 100644 img/dandelion.png delete mode 100644 img/etesync.png delete mode 100644 img/fdroid.png delete mode 100644 img/fennec.png delete mode 100644 img/i2p.png delete mode 100644 img/jami.png delete mode 100644 img/k9mail.png delete mode 100644 img/keepassdx.png create mode 100644 img/logo.png create mode 100644 img/logo.svg delete mode 100644 img/movim.png delete mode 100644 img/nextcloud.png delete mode 100644 img/nomad.png delete mode 100644 img/openkeychain.png delete mode 100644 img/orbot.png delete mode 100644 img/osmand.png delete mode 100644 img/shaarlier.png delete mode 100644 img/signal.png delete mode 100644 img/silence.png delete mode 100644 img/syncthing.png delete mode 100644 img/thorium.png delete mode 100644 img/tincapp.png delete mode 100644 img/torbrowser.png delete mode 100644 img/ttrss.png delete mode 100644 img/tusky.png delete mode 100644 img/wallabag.png delete mode 100644 img/wireguard.png delete mode 100644 logo.svg diff --git a/img/andotp.png b/img/andotp.png deleted file mode 100644 index fece26b..0000000 Binary files a/img/andotp.png and /dev/null differ diff --git a/img/app-icons/andotp.png b/img/app-icons/andotp.png new file mode 100644 index 0000000..fece26b Binary files /dev/null and b/img/app-icons/andotp.png differ diff --git a/img/app-icons/bitmask.png b/img/app-icons/bitmask.png new file mode 100644 index 0000000..6cf4e79 Binary files /dev/null and b/img/app-icons/bitmask.png differ diff --git a/img/app-icons/briar.png b/img/app-icons/briar.png new file mode 100644 index 0000000..361cd10 Binary files /dev/null and b/img/app-icons/briar.png differ diff --git a/img/app-icons/conversations.png b/img/app-icons/conversations.png new file mode 100644 index 0000000..c606a58 Binary files /dev/null and b/img/app-icons/conversations.png differ diff --git a/img/app-icons/dandelion.png b/img/app-icons/dandelion.png new file mode 100644 index 0000000..0a8685c Binary files /dev/null and b/img/app-icons/dandelion.png differ diff --git a/img/app-icons/etesync.png b/img/app-icons/etesync.png new file mode 100644 index 0000000..d32e01d Binary files /dev/null and b/img/app-icons/etesync.png differ diff --git a/img/app-icons/fdroid.png b/img/app-icons/fdroid.png new file mode 100644 index 0000000..4e95575 Binary files /dev/null and b/img/app-icons/fdroid.png differ diff --git a/img/app-icons/fennec.png b/img/app-icons/fennec.png new file mode 100644 index 0000000..2e8236f Binary files /dev/null and b/img/app-icons/fennec.png differ diff --git a/img/app-icons/i2p.png b/img/app-icons/i2p.png new file mode 100644 index 0000000..909b7b4 Binary files /dev/null and b/img/app-icons/i2p.png differ diff --git a/img/app-icons/jami.png b/img/app-icons/jami.png new file mode 100644 index 0000000..cf292dd Binary files /dev/null and b/img/app-icons/jami.png differ diff --git a/img/app-icons/k9mail.png b/img/app-icons/k9mail.png new file mode 100644 index 0000000..fca064f Binary files /dev/null and b/img/app-icons/k9mail.png differ diff --git a/img/app-icons/keepassdx.png b/img/app-icons/keepassdx.png new file mode 100644 index 0000000..8bd59cd Binary files /dev/null and b/img/app-icons/keepassdx.png differ diff --git a/img/app-icons/movim.png b/img/app-icons/movim.png new file mode 100644 index 0000000..7f9af35 Binary files /dev/null and b/img/app-icons/movim.png differ diff --git a/img/app-icons/nextcloud.png b/img/app-icons/nextcloud.png new file mode 100644 index 0000000..460ce7a Binary files /dev/null and b/img/app-icons/nextcloud.png differ diff --git a/img/app-icons/nomad.png b/img/app-icons/nomad.png new file mode 100644 index 0000000..e8d5db9 Binary files /dev/null and b/img/app-icons/nomad.png differ diff --git a/img/app-icons/openkeychain.png b/img/app-icons/openkeychain.png new file mode 100644 index 0000000..eae17f0 Binary files /dev/null and b/img/app-icons/openkeychain.png differ diff --git a/img/app-icons/orbot.png b/img/app-icons/orbot.png new file mode 100644 index 0000000..cd5721a Binary files /dev/null and b/img/app-icons/orbot.png differ diff --git a/img/app-icons/osmand.png b/img/app-icons/osmand.png new file mode 100644 index 0000000..e579c5c Binary files /dev/null and b/img/app-icons/osmand.png differ diff --git a/img/app-icons/shaarlier.png b/img/app-icons/shaarlier.png new file mode 100644 index 0000000..e3d37a6 Binary files /dev/null and b/img/app-icons/shaarlier.png differ diff --git a/img/app-icons/signal.png b/img/app-icons/signal.png new file mode 100644 index 0000000..282f477 Binary files /dev/null and b/img/app-icons/signal.png differ diff --git a/img/app-icons/silence.png b/img/app-icons/silence.png new file mode 100644 index 0000000..cfe0b7c Binary files /dev/null and b/img/app-icons/silence.png differ diff --git a/img/app-icons/syncthing.png b/img/app-icons/syncthing.png new file mode 100644 index 0000000..5f04ded Binary files /dev/null and b/img/app-icons/syncthing.png differ diff --git a/img/app-icons/thorium.png b/img/app-icons/thorium.png new file mode 100644 index 0000000..5e34424 Binary files /dev/null and b/img/app-icons/thorium.png differ diff --git a/img/app-icons/tincapp.png b/img/app-icons/tincapp.png new file mode 100644 index 0000000..90bfd19 Binary files /dev/null and b/img/app-icons/tincapp.png differ diff --git a/img/app-icons/torbrowser.png b/img/app-icons/torbrowser.png new file mode 100644 index 0000000..19c2457 Binary files /dev/null and b/img/app-icons/torbrowser.png differ diff --git a/img/app-icons/ttrss.png b/img/app-icons/ttrss.png new file mode 100644 index 0000000..567b75e Binary files /dev/null and b/img/app-icons/ttrss.png differ diff --git a/img/app-icons/tusky.png b/img/app-icons/tusky.png new file mode 100644 index 0000000..bb5a0ed Binary files /dev/null and b/img/app-icons/tusky.png differ diff --git a/img/app-icons/wallabag.png b/img/app-icons/wallabag.png new file mode 100644 index 0000000..5813449 Binary files /dev/null and b/img/app-icons/wallabag.png differ diff --git a/img/app-icons/wireguard.png b/img/app-icons/wireguard.png new file mode 100644 index 0000000..d3ec336 Binary files /dev/null and b/img/app-icons/wireguard.png differ diff --git a/img/bitmask.png b/img/bitmask.png deleted file mode 100644 index 6cf4e79..0000000 Binary files a/img/bitmask.png and /dev/null differ diff --git a/img/briar.png b/img/briar.png deleted file mode 100644 index 361cd10..0000000 Binary files a/img/briar.png and /dev/null differ diff --git a/img/conversations.png b/img/conversations.png deleted file mode 100644 index c606a58..0000000 Binary files a/img/conversations.png and /dev/null differ diff --git a/img/dandelion.png b/img/dandelion.png deleted file mode 100644 index 0a8685c..0000000 Binary files a/img/dandelion.png and /dev/null differ diff --git a/img/etesync.png b/img/etesync.png deleted file mode 100644 index d32e01d..0000000 Binary files a/img/etesync.png and /dev/null differ diff --git a/img/fdroid.png b/img/fdroid.png deleted file mode 100644 index 4e95575..0000000 Binary files a/img/fdroid.png and /dev/null differ diff --git a/img/fennec.png b/img/fennec.png deleted file mode 100644 index 2e8236f..0000000 Binary files a/img/fennec.png and /dev/null differ diff --git a/img/i2p.png b/img/i2p.png deleted file mode 100644 index 909b7b4..0000000 Binary files a/img/i2p.png and /dev/null differ diff --git a/img/jami.png b/img/jami.png deleted file mode 100644 index cf292dd..0000000 Binary files a/img/jami.png and /dev/null differ diff --git a/img/k9mail.png b/img/k9mail.png deleted file mode 100644 index fca064f..0000000 Binary files a/img/k9mail.png and /dev/null differ diff --git a/img/keepassdx.png b/img/keepassdx.png deleted file mode 100644 index 8bd59cd..0000000 Binary files a/img/keepassdx.png and /dev/null differ diff --git a/img/logo.png b/img/logo.png new file mode 100644 index 0000000..939d7c4 Binary files /dev/null and b/img/logo.png differ diff --git a/img/logo.svg b/img/logo.svg new file mode 100644 index 0000000..4b5214e --- /dev/null +++ b/img/logo.svg @@ -0,0 +1,379 @@ + + + The Chromium mess meets Android + + + + image/svg+xml + + The Chromium mess meets Android + + + + dllud <dllud@riseup.net> + + + 2019-12-16 + + # Copyright + +Copyright © 2019 dllud <dllud@riseup.net> + +This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative Commons, PO Box 444 1866, Mountain View, CA 94042, USA. + +# Resources + +* "Chromium logo" by The Chromium Development Documentation Project and The Chromium Authors, available at: <https://commons.wikimedia.org/wiki/File:Chromium_11_Logo.svg>, licensed under: CC-BY 2.5 and BSD. +* "Android logo 2019" by Google and CMetalCore, available at: <https://commons.wikimedia.org/wiki/File:Android_logo_2019.svg>, under public domain. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/img/movim.png b/img/movim.png deleted file mode 100644 index 7f9af35..0000000 Binary files a/img/movim.png and /dev/null differ diff --git a/img/nextcloud.png b/img/nextcloud.png deleted file mode 100644 index 460ce7a..0000000 Binary files a/img/nextcloud.png and /dev/null differ diff --git a/img/nomad.png b/img/nomad.png deleted file mode 100644 index e8d5db9..0000000 Binary files a/img/nomad.png and /dev/null differ diff --git a/img/openkeychain.png b/img/openkeychain.png deleted file mode 100644 index eae17f0..0000000 Binary files a/img/openkeychain.png and /dev/null differ diff --git a/img/orbot.png b/img/orbot.png deleted file mode 100644 index cd5721a..0000000 Binary files a/img/orbot.png and /dev/null differ diff --git a/img/osmand.png b/img/osmand.png deleted file mode 100644 index e579c5c..0000000 Binary files a/img/osmand.png and /dev/null differ diff --git a/img/shaarlier.png b/img/shaarlier.png deleted file mode 100644 index e3d37a6..0000000 Binary files a/img/shaarlier.png and /dev/null differ diff --git a/img/signal.png b/img/signal.png deleted file mode 100644 index 282f477..0000000 Binary files a/img/signal.png and /dev/null differ diff --git a/img/silence.png b/img/silence.png deleted file mode 100644 index cfe0b7c..0000000 Binary files a/img/silence.png and /dev/null differ diff --git a/img/syncthing.png b/img/syncthing.png deleted file mode 100644 index 5f04ded..0000000 Binary files a/img/syncthing.png and /dev/null differ diff --git a/img/thorium.png b/img/thorium.png deleted file mode 100644 index 5e34424..0000000 Binary files a/img/thorium.png and /dev/null differ diff --git a/img/tincapp.png b/img/tincapp.png deleted file mode 100644 index 90bfd19..0000000 Binary files a/img/tincapp.png and /dev/null differ diff --git a/img/torbrowser.png b/img/torbrowser.png deleted file mode 100644 index 19c2457..0000000 Binary files a/img/torbrowser.png and /dev/null differ diff --git a/img/ttrss.png b/img/ttrss.png deleted file mode 100644 index 567b75e..0000000 Binary files a/img/ttrss.png and /dev/null differ diff --git a/img/tusky.png b/img/tusky.png deleted file mode 100644 index bb5a0ed..0000000 Binary files a/img/tusky.png and /dev/null differ diff --git a/img/wallabag.png b/img/wallabag.png deleted file mode 100644 index 5813449..0000000 Binary files a/img/wallabag.png and /dev/null differ diff --git a/img/wireguard.png b/img/wireguard.png deleted file mode 100644 index d3ec336..0000000 Binary files a/img/wireguard.png and /dev/null differ diff --git a/logo.svg b/logo.svg deleted file mode 100644 index 4b5214e..0000000 --- a/logo.svg +++ /dev/null @@ -1,379 +0,0 @@ - - - The Chromium mess meets Android - - - - image/svg+xml - - The Chromium mess meets Android - - - - dllud <dllud@riseup.net> - - - 2019-12-16 - - # Copyright - -Copyright © 2019 dllud <dllud@riseup.net> - -This work is licensed under the Creative Commons Attribution-ShareAlike 4.0 International License. To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/4.0/ or send a letter to Creative Commons, PO Box 444 1866, Mountain View, CA 94042, USA. - -# Resources - -* "Chromium logo" by The Chromium Development Documentation Project and The Chromium Authors, available at: <https://commons.wikimedia.org/wiki/File:Chromium_11_Logo.svg>, licensed under: CC-BY 2.5 and BSD. -* "Android logo 2019" by Google and CMetalCore, available at: <https://commons.wikimedia.org/wiki/File:Android_logo_2019.svg>, under public domain. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/slides.tex b/slides.tex index aa388a1..c03c9fc 100644 --- a/slides.tex +++ b/slides.tex @@ -23,7 +23,7 @@ \newcommand{\iconframe}[2] { \begin{minipage}[t]{2.5em} - \includegraphics[width=\textwidth]{#1} + \includegraphics[width=\textwidth]{img/app-icons/#1} \captionof*{figure}{#2} \end{minipage} } @@ -33,6 +33,8 @@ \author{David Ludovino \and Jeremy Rand \thanks{\footnotesize with support from Andrés D and Kurtis Hanna}} \institute[Replicant]{Replicant} \date{} +\logo{\includegraphics[scale=0.25]{img/logo.png}} +\titlegraphic{\includegraphics[width=4em]{img/logo.png}} \begin{document} @@ -83,40 +85,40 @@ public class MainActivity extends Activity { \begin{tabular}{c | c} uses WebView & does not use WebView \\ \hline - \iconframe{img/k9mail.png}{K-9 Mail} - \iconframe{img/osmand.png}{OsmAnd} - \iconframe{img/nextcloud.png}{Nextcloud} - \iconframe{img/ttrss.png}{Tiny Tiny RSS} - \iconframe{img/i2p.png}{I2P} + \iconframe{k9mail.png}{K-9 Mail} + \iconframe{osmand.png}{OsmAnd} + \iconframe{nextcloud.png}{Nextcloud} + \iconframe{ttrss.png}{Tiny Tiny RSS} + \iconframe{i2p.png}{I2P} & - \iconframe{img/orbot.png}{Orbot} - \iconframe{img/fdroid.png}{F-Droid} - \iconframe{img/andotp.png}{andOTP} - \iconframe{img/shaarlier.png}{Shaarlier} - \iconframe{img/briar.png}{Briar} + \iconframe{orbot.png}{Orbot} + \iconframe{fdroid.png}{F-Droid} + \iconframe{andotp.png}{andOTP} + \iconframe{shaarlier.png}{Shaarlier} + \iconframe{briar.png}{Briar} \\ - \iconframe{img/wallabag.png}{wallabag} - \iconframe{img/openkeychain.png}{OpenKeychain} - \iconframe{img/etesync.png}{EteSync} - \iconframe{img/syncthing.png}{Syncthing} - \iconframe{img/signal.png}{Signal} + \iconframe{wallabag.png}{wallabag} + \iconframe{openkeychain.png}{OpenKeychain} + \iconframe{etesync.png}{EteSync} + \iconframe{syncthing.png}{Syncthing} + \iconframe{signal.png}{Signal} & - \iconframe{img/conversations.png}{Conversations} - \iconframe{img/silence.png}{Silence} - \iconframe{img/tincapp.png}{Tinc App} - \iconframe{img/keepassdx.png}{KeePass DX} - \iconframe{img/jami.png}{Jami} + \iconframe{conversations.png}{Conversations} + \iconframe{silence.png}{Silence} + \iconframe{tincapp.png}{Tinc App} + \iconframe{keepassdx.png}{KeePass DX} + \iconframe{jami.png}{Jami} \\ - \iconframe{img/dandelion.png}{dandelion*} - \iconframe{img/nomad.png}{Nomad} - \iconframe{img/tusky.png}{Tusky} - \iconframe{img/movim.png}{Movim} + \iconframe{dandelion.png}{dandelion*} + \iconframe{nomad.png}{Nomad} + \iconframe{tusky.png}{Tusky} + \iconframe{movim.png}{Movim} & - \iconframe{img/bitmask.png}{Bitmask} - \iconframe{img/wireguard.png}{Wireguard} - \iconframe{img/fennec.png}{Fennec F-Droid} - \iconframe{img/torbrowser.png}{Tor Browser} - \iconframe{img/thorium.png}{Thorium} + \iconframe{bitmask.png}{Bitmask} + \iconframe{wireguard.png}{Wireguard} + \iconframe{fennec.png}{Fennec F-Droid} + \iconframe{torbrowser.png}{Tor Browser} + \iconframe{thorium.png}{Thorium} \\ \end{tabular} \end{block} -- cgit v1.2.3