What's underneath WebView + simplification of graphics insertion.

3 files changed, 59 insertions, 34 deletions

diff --git a/img/chromium.png b/img/chromium.png
new file mode 100644
index 0000000..06d0af9
--- /dev/null
+++ b/img/chromium.png
diff --git a/img/webkit.png b/img/webkit.png
new file mode 100644
index 0000000..48ae48c
--- /dev/null
+++ b/img/webkit.png
diff --git a/slides.tex b/slides.tex
index c03c9fc..6c8455e 100644
--- a/slides.tex
+++ b/slides.tex
@@ -14,6 +14,8 @@
 \usepackage[font=tiny,skip=0pt]{caption}
 \usepackage{array}
 
+\graphicspath{{img/}}
+
 % Use symbols instead of numerals for footnotes.
 \renewcommand{\thefootnote}{\fnsymbol{footnote}}
 % Reset footnote counter every section.
@@ -23,7 +25,7 @@
 
 \newcommand{\iconframe}[2] {
   \begin{minipage}[t]{2.5em}
-    \includegraphics[width=\textwidth]{img/app-icons/#1}
+    \includegraphics[width=\textwidth]{app-icons/#1}
     \captionof*{figure}{#2}
   \end{minipage}
 }
@@ -33,8 +35,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}}
+\logo{\includegraphics[scale=0.25]{logo}}
+\titlegraphic{\includegraphics[width=4em]{logo}}
 
 \begin{document}
 
@@ -69,7 +71,7 @@ public class MainActivity extends Activity {
       \end{lstlisting}
     \end{column}
     \begin{column}{0.3\textwidth}
-      \includegraphics[width=\textwidth]{img/webview-sample.png}
+      \includegraphics[width=\textwidth]{webview-sample}
     \end{column}
   \end{columns}
 \end{frame}
@@ -85,45 +87,58 @@ public class MainActivity extends Activity {
     \begin{tabular}{c | c}
       uses WebView & does not use WebView \\
       \hline
-      \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{k9mail}{K-9 Mail}
+      \iconframe{osmand}{OsmAnd}
+      \iconframe{nextcloud}{Nextcloud}
+      \iconframe{ttrss}{Tiny Tiny RSS}
+      \iconframe{i2p}{I2P}
       &
-      \iconframe{orbot.png}{Orbot}
-      \iconframe{fdroid.png}{F-Droid}
-      \iconframe{andotp.png}{andOTP}
-      \iconframe{shaarlier.png}{Shaarlier}
-      \iconframe{briar.png}{Briar}
+      \iconframe{orbot}{Orbot}
+      \iconframe{fdroid}{F-Droid}
+      \iconframe{andotp}{andOTP}
+      \iconframe{shaarlier}{Shaarlier}
+      \iconframe{briar}{Briar}
       \\
-      \iconframe{wallabag.png}{wallabag}
-      \iconframe{openkeychain.png}{OpenKeychain}
-      \iconframe{etesync.png}{EteSync}
-      \iconframe{syncthing.png}{Syncthing}
-      \iconframe{signal.png}{Signal}
+      \iconframe{wallabag}{wallabag}
+      \iconframe{openkeychain}{OpenKeychain}
+      \iconframe{etesync}{EteSync}
+      \iconframe{syncthing}{Syncthing}
+      \iconframe{signal}{Signal}
       &
-      \iconframe{conversations.png}{Conversations}
-      \iconframe{silence.png}{Silence}
-      \iconframe{tincapp.png}{Tinc App}
-      \iconframe{keepassdx.png}{KeePass DX}
-      \iconframe{jami.png}{Jami}
+      \iconframe{conversations}{Conversations}
+      \iconframe{silence}{Silence}
+      \iconframe{tincapp}{Tinc App}
+      \iconframe{keepassdx}{KeePass DX}
+      \iconframe{jami}{Jami}
       \\
-      \iconframe{dandelion.png}{dandelion*}
-      \iconframe{nomad.png}{Nomad}
-      \iconframe{tusky.png}{Tusky}
-      \iconframe{movim.png}{Movim}
+      \iconframe{dandelion}{dandelion*}
+      \iconframe{nomad}{Nomad}
+      \iconframe{tusky}{Tusky}
+      \iconframe{movim}{Movim}
       &
-      \iconframe{bitmask.png}{Bitmask}
-      \iconframe{wireguard.png}{Wireguard}
-      \iconframe{fennec.png}{Fennec F-Droid}
-      \iconframe{torbrowser.png}{Tor Browser}
-      \iconframe{thorium.png}{Thorium}
+      \iconframe{bitmask}{Bitmask}
+      \iconframe{wireguard}{Wireguard}
+      \iconframe{fennec}{Fennec F-Droid}
+      \iconframe{torbrowser}{Tor Browser}
+      \iconframe{thorium}{Thorium}
       \\
     \end{tabular}
   \end{block}
 \end{frame}
 
+\subsection{What's underneath it?}
+\begin{frame}
+  \frametitle{What is underneath WebView?}
+  \includegraphics[width=3em]{webkit} WebKit until Android 4.3 Jelly Bean (API 18).\\
+  \vspace{3\baselineskip}
+  \includegraphics[width=3em]{chromium} Chromium from Android 4.4 KitKat (API 19) onwards.
+\end{frame}
+
+\section{What's the matter with Chromium?}
+\begin{frame}
+  \frametitle{What's the matter with Chromium?}
+\end{frame}
+
 \section{Feedback?}
 \begin{frame}
   \frametitle{Feedback?}
@@ -155,7 +170,6 @@ public class MainActivity extends Activity {
     EteSync logo & \url{https://github.com/etesync/android} & GPLv3 \\
     Syncthing logo & \url{https://github.com/syncthing/syncthing-android} & MPLv2 \\
     Briar logo & \url{https://code.briarproject.org/briar/briar} & GPLv3 \\
-    Conversations logo & \url{https://github.com/siacs/Conversations} & GPLv3 \\
   \end{tabular}
 \end{frame}
 
@@ -164,6 +178,7 @@ public class MainActivity extends Activity {
   \begin{tabular}{>{\scriptsize}l | >{\scriptsize}l | >{\scriptsize}l}
     item & source & license \\
     \hline
+    Conversations logo & \url{https://github.com/siacs/Conversations} & GPLv3 \\
     Signal logo & \url{https://github.com/signalapp/Signal-Android} & GPLv3 \\
     Silence logo & \url{https://git.silence.dev/Silence/Silence-Android} & GPLv3 \\
     Tinc App logo & \url{https://github.com/pacien/tincapp} & GPLv3 \\
@@ -177,7 +192,17 @@ public class MainActivity extends Activity {
     WireGuard logo & \url{https://git.zx2c4.com/wireguard-android} & Apache-2.0 \\
     Fennec F-Droid logo & \url{https://hg.mozilla.org/releases/mozilla-esr68} & MPL-2.0 \\
     Tor Browser logo & \url{https://gitweb.torproject.org/tor-browser.git} & MPL-2.0 \\
+  \end{tabular}
+\end{frame}
+
+\begin{frame}
+  \frametitle{Licenses (II)}
+  \begin{tabular}{>{\scriptsize}l | >{\scriptsize}l | >{\scriptsize}l}
+    item & source & license \\
+    \hline
     Thorium logo & \url{https://github.com/sschueller/peertube-android} & AGPLv3 \\
+    WebKit logo & \url{https://en.wikipedia.org/wiki/File:WebKit_logo_(2015).svg} & non-free (fair use) \\
+    Chromium logo & \url{https://commons.wikimedia.org/wiki/File:Chromium_11_Logo.svg} & CC-BY 2.5 \\
     everything else & this slideshow & CC BY-SA 4.0
   \end{tabular}
 \end{frame}