Reorganized app icons. Added logo into title frame.

32 files changed, 32 insertions, 30 deletions

diff --git a/img/andotp.png b/img/app-icons/andotp.png
index fece26b..fece26b 100644
--- a/img/andotp.png
+++ b/img/app-icons/andotp.png
diff --git a/img/bitmask.png b/img/app-icons/bitmask.png
index 6cf4e79..6cf4e79 100644
--- a/img/bitmask.png
+++ b/img/app-icons/bitmask.png
diff --git a/img/briar.png b/img/app-icons/briar.png
index 361cd10..361cd10 100644
--- a/img/briar.png
+++ b/img/app-icons/briar.png
diff --git a/img/conversations.png b/img/app-icons/conversations.png
index c606a58..c606a58 100644
--- a/img/conversations.png
+++ b/img/app-icons/conversations.png
diff --git a/img/dandelion.png b/img/app-icons/dandelion.png
index 0a8685c..0a8685c 100644
--- a/img/dandelion.png
+++ b/img/app-icons/dandelion.png
diff --git a/img/etesync.png b/img/app-icons/etesync.png
index d32e01d..d32e01d 100644
--- a/img/etesync.png
+++ b/img/app-icons/etesync.png
diff --git a/img/fdroid.png b/img/app-icons/fdroid.png
index 4e95575..4e95575 100644
--- a/img/fdroid.png
+++ b/img/app-icons/fdroid.png
diff --git a/img/fennec.png b/img/app-icons/fennec.png
index 2e8236f..2e8236f 100644
--- a/img/fennec.png
+++ b/img/app-icons/fennec.png
diff --git a/img/i2p.png b/img/app-icons/i2p.png
index 909b7b4..909b7b4 100644
--- a/img/i2p.png
+++ b/img/app-icons/i2p.png
diff --git a/img/jami.png b/img/app-icons/jami.png
index cf292dd..cf292dd 100644
--- a/img/jami.png
+++ b/img/app-icons/jami.png
diff --git a/img/k9mail.png b/img/app-icons/k9mail.png
index fca064f..fca064f 100644
--- a/img/k9mail.png
+++ b/img/app-icons/k9mail.png
diff --git a/img/keepassdx.png b/img/app-icons/keepassdx.png
index 8bd59cd..8bd59cd 100644
--- a/img/keepassdx.png
+++ b/img/app-icons/keepassdx.png
diff --git a/img/movim.png b/img/app-icons/movim.png
index 7f9af35..7f9af35 100644
--- a/img/movim.png
+++ b/img/app-icons/movim.png
diff --git a/img/nextcloud.png b/img/app-icons/nextcloud.png
index 460ce7a..460ce7a 100644
--- a/img/nextcloud.png
+++ b/img/app-icons/nextcloud.png
diff --git a/img/nomad.png b/img/app-icons/nomad.png
index e8d5db9..e8d5db9 100644
--- a/img/nomad.png
+++ b/img/app-icons/nomad.png
diff --git a/img/openkeychain.png b/img/app-icons/openkeychain.png
index eae17f0..eae17f0 100644
--- a/img/openkeychain.png
+++ b/img/app-icons/openkeychain.png
diff --git a/img/orbot.png b/img/app-icons/orbot.png
index cd5721a..cd5721a 100644
--- a/img/orbot.png
+++ b/img/app-icons/orbot.png
diff --git a/img/osmand.png b/img/app-icons/osmand.png
index e579c5c..e579c5c 100644
--- a/img/osmand.png
+++ b/img/app-icons/osmand.png
diff --git a/img/shaarlier.png b/img/app-icons/shaarlier.png
index e3d37a6..e3d37a6 100644
--- a/img/shaarlier.png
+++ b/img/app-icons/shaarlier.png
diff --git a/img/signal.png b/img/app-icons/signal.png
index 282f477..282f477 100644
--- a/img/signal.png
+++ b/img/app-icons/signal.png
diff --git a/img/silence.png b/img/app-icons/silence.png
index cfe0b7c..cfe0b7c 100644
--- a/img/silence.png
+++ b/img/app-icons/silence.png
diff --git a/img/syncthing.png b/img/app-icons/syncthing.png
index 5f04ded..5f04ded 100644
--- a/img/syncthing.png
+++ b/img/app-icons/syncthing.png
diff --git a/img/thorium.png b/img/app-icons/thorium.png
index 5e34424..5e34424 100644
--- a/img/thorium.png
+++ b/img/app-icons/thorium.png
diff --git a/img/tincapp.png b/img/app-icons/tincapp.png
index 90bfd19..90bfd19 100644
--- a/img/tincapp.png
+++ b/img/app-icons/tincapp.png
diff --git a/img/torbrowser.png b/img/app-icons/torbrowser.png
index 19c2457..19c2457 100644
--- a/img/torbrowser.png
+++ b/img/app-icons/torbrowser.png
diff --git a/img/ttrss.png b/img/app-icons/ttrss.png
index 567b75e..567b75e 100644
--- a/img/ttrss.png
+++ b/img/app-icons/ttrss.png
diff --git a/img/tusky.png b/img/app-icons/tusky.png
index bb5a0ed..bb5a0ed 100644
--- a/img/tusky.png
+++ b/img/app-icons/tusky.png
diff --git a/img/wallabag.png b/img/app-icons/wallabag.png
index 5813449..5813449 100644
--- a/img/wallabag.png
+++ b/img/app-icons/wallabag.png
diff --git a/img/wireguard.png b/img/app-icons/wireguard.png
index d3ec336..d3ec336 100644
--- a/img/wireguard.png
+++ b/img/app-icons/wireguard.png
diff --git a/img/logo.png b/img/logo.png
new file mode 100644
index 0000000..939d7c4
--- /dev/null
+++ b/img/logo.png
diff --git a/logo.svg b/img/logo.svg
index 4b5214e..4b5214e 100644
--- a/logo.svg
+++ b/img/logo.svg
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}