merged latest version from https://github.com/firexel/emojicon/

but only seems to work with lollipop, so switch back to the old pictures
Fixes FS#38 - Issues with URLs with multiple dots in file name
2015-08-12 21:43:04 +02:00 · 2015-08-12 19:20:24 +02:00 · 2015-08-12 18:28:56 +02:00 · 2015-08-11 22:19:48 +02:00 · 2015-08-11 17:35:53 +02:00 · 2015-06-19 23:12:24 +02:00
1841 changed files with 20994 additions and 41590 deletions
--- a/.github/CONTRIBUTING.md
+++ b/.github/CONTRIBUTING.md
@ -1,11 +0,0 @@
-### Reporting Bugs and getting help
-
-The issue tracker on Github is for bug reports only. It is not a general support forum.
-
-**A bug is everything you can reproduce. ie *if I do this that happens but something else should happen instead*.**
-
-Please search the issue tracker (including closed issues). Your bug might be a server bug that has already been addressed.
-
-Please fill in the template when creating new issues and provide information about your device and your server. The [adb logcat](https://wiki.cyanogenmod.org/w/Doc:_debugging_with_logcat) can be omitted if you can reproduce the bug under every condition. (ie *click button X and the application crashes*) But the adb logcat is required if the bug happens only under certain conditions or involves network problem (Server not found, messages not arriving) 
-
-**If you are seeking help or are unable to reproduce the exact problem please join our MUC at conversations@conference.siacs.eu**
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@ -1,30 +0,0 @@
-#### General information
-
-* **Version:** eg 1.12.2
-* **Device:** eg Google Nexus 5
-* **Android Version:** eg Android 6.0 Stock or Android 5.1 Cyanogenmod
-* **Server name:** eg conversations.im, jabber.at or self hosted
-* **Server software:** ejabberd 16.04 or prosody 0.10 (if known)
-* **Installed server modules:** eg Stream Managment, CSI, MAM
-* **Conversations source:** eg PlayStore, PlayStore Beta Channel, F-Droid, self build (latest HEAD)
-
-
-#### Steps to reproduce
-
-1. …
-2. …
-
-
-#### Expected result
-
-What is the expected output? What do you see instead?
-
-
-#### Debug output
-
-Please post the output of adb logcat. The log should begin with the start of Conversations and include all the
-steps it takes to reproduce the problem.
-
-````
-adb logcat -s conversations
-````
--- a/.gitignore
+++ b/.gitignore
@ -2,13 +2,9 @@
 *.swp
 .settings

-src/playstore/res/values/gcm.xml
-
 # https://github.com/github/gitignore/blob/master/Gradle.gitignore
 .gradle/
 build/
-captures/
-gradle.properties
 # Ignore Gradle GUI config
 gradle-app.setting

--- a/.travis.yml
+++ b/.travis.yml
@ -1,16 +1,10 @@
 language: android
-jdk:
-  - oraclejdk8
 android:
  components:
    - platform-tools
    - tools
-    - build-tools-25.0.2
-    - android-25
+    - build-tools-22.0.1
+    - build-tools-21.1.2
+    - build-tools-19.1.0
+    - android-22
    - extra-android-m2repository
-    - extra-google-m2repository
-    - extra-google-google_play_services
-  licenses:
-    - '.+'
-script:
-    - ./gradlew assembleFreeRelease
--- a/0001-Added-possibility-to-also-use-pictures-as-smilies.patch
+++ b/0001-Added-possibility-to-also-use-pictures-as-smilies.patch
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,302 +1,5 @@
 ###Changelog

-####Version 1.15.5
-* show nick as bold text when mentioned in conference
-* bug fixes
-
-####Version 1.15.4
-* bug fixes
-
-####Version 1.15.3
-* show offline contacts in MUC as grayed-out
-* don't transcode gifs. add overlay indication to gifs
-* bug fixes
-
-####Version 1.15.2
-* bug fixes
-
-####Version 1.15.1
-* support for POSH (RFC7711)
-* support for quoting messages (via select text)
-* verified messages show shield icon. unverified messages show lock
-
-####Version 1.15.0
-* New [Blind Trust Before Verification](https://gultsch.de/trust.html) mode
-* Easily share Barcode and XMPP uri from Account details
-* Automatically deactivate own devices after 7 day of inactivity
-* Improvements fo doze/push mode
-* bug fixes
-
-####Version 1.14.9
-* warn in account details when data saver is enabled
-* automatically enable foreground service after detecting frequent restarts
-* bug fixes
-
-####Version 1.14.8
-* bug fixes
-
-####Version 1.14.7
-* error message accessible via context menu for failed messages
-* don't include pgp signature in anonymous mucs
-* bug fixes
-
-####Version 1.14.6
-* make error notification dismissable
-* bug fixes
-
-
-####Version 1.14.5
-* expert setting to delete OMEMO identities
-* bug fixes
-
-####Version 1.14.4
-* bug fixes
-
-####Version 1.14.3
-* XEP-0377: Spam Reporting
-* fix rare start up crashes
-
-####Version 1.14.2
-* support ANONYMOUS SASL
-* bug fixes
-
-####Version 1.14.1
-* Press lock icon to see why OMEMO is deactivated
-* bug fixes
-
-####Version 1.14.0
-* Improvments for N
-* Quick Reply to Notifications on N
-* Don't download avatars and files when data saver is on
-* bug fixes
-
-####Version 1.13.9
-* bug fixes
-
-####Version 1.13.8
-* show identities instead of resources in selection dialog
-* allow TLS direct connect when port is set to 5223
-* bug fixes
-
-####Version 1.13.7
-* bug fixes
-
-####Version 1.13.6
-* thumbnails for videos
-* bug fixes
-
-####Version 1.13.5
-* bug fixes
-
-####Version 1.13.4
-* support jingle ft:4
-* show contact as DND if one resource is
-* bug fixes
-
-####Version 1.13.3
-* bug fixes
-
-####Version 1.13.2
-* new PGP decryption logic
-* bug fixes
-
-####Version 1.13.1
-* changed some colors in dark theme
-* fixed fall-back message for OMEMO
-
-####Version 1.13.0
-* configurable dark theme
-* opt-in to share Last User Interaction
-
-####Version 1.12.9
-* make grace period configurable
-
-####Version 1.12.8
-* more bug fixes :-(
-
-####Version 1.12.7
-* bug fixes
-
-####Version 1.12.6
-* bug fixes
-
-####Version 1.12.5
-* new create conference dialog
-* show first unread message on top
-* show geo uri as links
-* circumvent long message DOS
-
-####Version 1.12.4
-* show offline members in conference (needs server support)
-* various bug fixes
-
-####Version 1.12.3
-* make omemo default when all resources support it
-* show presence of other resources as template
-* start typing in StartConversationsActivity to search
-* various bug fixes and improvements
-
-####Version 1.12.2
-* fixed pgp presence signing
-
-####Version 1.12.1
-* small bug fixes
-
-####Version 1.12.0
-* new welcome screen that makes it easier to register account
-* expert setting to modify presence
-
-####Version 1.11.7
-* Share xmpp uri from conference details
-* add setting to allow quick sharing
-* various bug fixes
-
-####Version 1.11.6
-* added preference to disable notification light
-* various bug fixes
-
-####Version 1.11.5
-* check file ownership to not accidentally share private files
-
-####Version 1.11.4
-* fixed a bug where contacts are shown as offline
-* improved broken PEP detection
-
-####Version 1.11.3
-* check maximum file size when using HTTP Upload
-* properly calculate caps hash
-
-####Version 1.11.2
-* only add image files to media scanner
-* allow to delete files
-* various bug fixes
-
-####Version 1.11.1
-* fixed some bugs when sharing files with Conversations
-
-####Version 1.11.0
-* OMEMO encrypted conferences
-
-####Version 1.10.1
-* made message correction opt-in
-* various bug fixes
-
-####Version 1.10.0
-* Support for XEP-0357: Push Notifications
-* Support for XEP-0308: Last Message Correction
-* introduced build flavors to make dependence on play-services optional
-
-####Version 1.9.4
-* prevent cleared Conversations from reloading history with MAM
-* various MAM fixes
-
-####Version 1.9.3
-* expert setting that enables host and port configuration
-* expert setting opt-out of bookmark autojoin handling
-* offer to rejoin a conference after server sent unavailable
-* internal rewrites
-
-####Version 1.9.2
-* prevent startup crash on Sailfish OS
-* minor bug fixes
-
-####Version 1.9.1
-* minor bug fixes incl. a workaround for nimbuzz.com
-
-####Version 1.9.0
-* Per conference notification settings
-* Let user decide whether to compress pictures
-* Support for XEP-0368
-* Ask user to exclude Conversations from battery optimizations
-
-####Version 1.8.4
-* prompt to trust own OMEMO devices
-* fixed rotation issues in avatar publication
-* invite non-contact JIDs to conferences
-
-####Version 1.8.3
-* brought text selection back
-
-####Version 1.8.2
-* fixed stuck at 'connecting...' bug
-* make message box behave correctly with multiple links
-
-####Version 1.8.1
-* enabled direct share on Android 6.0
-* ask for permissions on Android 6.0
-* notify on MAM catchup messages
-* bug fixes
-
-####Version 1.8.0
-* TOR/ORBOT support in advanced settings
-* show vcard avatars of participants in a conference
-
-####Version 1.7.3
-* fixed PGP encrypted file transfer
-* fixed repeating messages in slack conferences
-
-####Version 1.7.2
-* decode PGP messages in background
-
-
-####Versrion 1.7.1
-* performance improvements when opening a conversation
-
-####Version 1.7.0
-* CAPTCHA support
-* SASL EXTERNAL (client certifiates)
-* fetching MUC history via MAM
-* redownload deleted files from HTTP hosts
-* Expert setting to automatically set presence
-* bug fixes
-
-####Version 1.6.11
-* tab completion for MUC nicks
-* history export
-* bug fixes
-
-####Version 1.6.10
-* fixed facebook login
-* fixed bug with ejabberd mam
-* use official HTTP File Upload namespace
-
-####Version 1.6.9
-* basic keyboard support
-
-####Version 1.6.8
-* reworked 'enter is send' setting
-* reworked DNS server discovery on lolipop devices
-* various bug fixes
-
-####Version 1.6.7
-* bug fixes
-
-####Version 1.6.6
-* best 1.6 release yet
-
-####Version 1.6.5
-* more OMEMO fixes
-
-####Version 1.6.4
-* setting to enable white chat bubbles
-* limit OMEMO key publish attempts to work around broken PEP
-* various bug fixes
-
-####Version 1.6.3
-* bug fixes
-
-####Version 1.6.2
-* fixed issues with connection time out when server does not support ping
-
-####Version 1.6.1
-* fixed crashes
-
-####Version 1.6.0
-* new multi-end-to-multi-end encryption method
-* redesigned chat bubbles
-* show unexpected encryption changes as red chat bubbles
-* always notify in private/non-anonymous conferences
-
 ####Version 1.5.1
 * fixed rare crashes
 * improved otr support
@ -313,7 +16,7 @@

 ####Version 1.4.0
 * send button turns into quick action button to offer faster access to take photo, send location or record audio
-* visually separate merged messages
+* visually seperate merged messages
 * faster reconnects of failed accounts after network switches 
 * r/o vcard avatars for contacts
 * various bug fixes
@ -406,7 +109,7 @@
 * Download HTTP images
 * Show avatars in MUC tiles
 * Disabled SSLv3
-* Performance improvements
+* Performance improvments
 * bug fixes

 ####Version 0.7.3
@ -455,7 +158,7 @@
 ####Version 0.4
 * OTR file encryption
 * keep OTR messages and files on device until both parties or online at the same time
-* XEP-0333. Mark whether the other party has read your messages
+* XEP-0333. Mark wether the other party has read your messages
 * Delayed messages are now tagged properly
 * Share images from the Gallery
 * Infinit history scrolling
--- a/ManualBuildForFdroid.md
+++ b/ManualBuildForFdroid.md
@ -0,0 +1,10 @@
+### Build with Android Studio
+1. Adjust build.gradle
+	a. increment versionCode
+	b. enter new versionName
+2. Generate APK
+	a. (menu) Build -> Generate Signed APK
+	b. choose Key store path (AndroidKeystore.jks) -> choose key alias (android-key) -> Next -> Finish
+3. Upload APK to VM with installed FDroid into folder /var/www/fdroid/repo (Repo Folder)
+4. Run fdroid update --create-metadata in directory /var/www/fdroid
+5. Rsync Repo Folder to public F-Droid Repo
--- a/README.md
+++ b/README.md
@ -2,7 +2,7 @@

 Conversations: the very last word in instant messaging

-[![Google Play](https://conversations.im/images/en-play-badge.png)](https://play.google.com/store/apps/details?id=eu.siacs.conversations&referrer=utm_source%3Dgithub) [![Amazon App Store](https://images-na.ssl-images-amazon.com/images/G/01/AmazonMobileApps/amazon-apps-store-us-black.png)](http://www.amazon.com/dp/B00WD35AAC/)
+[![Google Play](http://developer.android.com/images/brand/en_generic_rgb_wo_60.png)](https://play.google.com/store/apps/details?id=eu.siacs.conversations) [![Amazon App Store](https://images-na.ssl-images-amazon.com/images/G/01/AmazonMobileApps/amazon-apps-store-us-black.png)](http://www.amazon.com/dp/B00WD35AAC/)

 ![screenshots](https://raw.githubusercontent.com/siacs/Conversations/master/screenshots.png)

@ -16,9 +16,9 @@ Conversations: the very last word in instant messaging

 ## Features

-* End-to-end encryption with [OMEMO](http://conversations.im/omemo/), [OTR](https://otr.cypherpunks.ca/), or [OpenPGP](http://openpgp.org/about/)
+* End-to-end encryption with either [OTR](https://otr.cypherpunks.ca/) or [OpenPGP](http://www.openpgp.org/about_openpgp/)
 * Send and receive images as well as other kind of files
-* Share your location via an external [plug-in](https://play.google.com/store/apps/details?id=eu.siacs.conversations.sharelocation&referrer=utm_source%3Dgithub)
+* Share your location via an external [plug-in](https://play.google.com/store/apps/details?id=eu.siacs.conversations.sharelocation)
 * Indication when your contact has read your message
 * Intuitive UI that follows Android Design guidelines
 * Pictures / Avatars for your Contacts
@ -39,25 +39,26 @@ support these extensions; therefore to get the most out of Conversations you
 should consider either switching to an XMPP server that does or — even better —
 run your own XMPP server for you and your friends. These XEP's are:

-* [XEP-0065: SOCKS5 Bytestreams](http://xmpp.org/extensions/xep-0065.html) (or mod_proxy65). Will be used to transfer
+* XEP-0065: SOCKS5 Bytestreams (or mod_proxy65). Will be used to transfer
  files if both parties are behind a firewall (NAT).
-* [XEP-0163: Personal Eventing Protocol](http://xmpp.org/extensions/xep-0163.html) for avatars and OMEMO.
-* [XEP-0191: Blocking command](http://xmpp.org/extensions/xep-0191.html) lets you blacklist spammers or block contacts
+* XEP-0163: Personal Eventing Protocol for avatars
+* XEP-0191: Blocking command lets you blacklist spammers or block contacts
  without removing them from your roster.
-* [XEP-0198: Stream Management](http://xmpp.org/extensions/xep-0198.html) allows XMPP to survive small network outages and
+* XEP-0198: Stream Management allows XMPP to survive small network outages and
  changes of the underlying TCP connection.
-* [XEP-0280: Message Carbons](http://xmpp.org/extensions/xep-0280.html) which automatically syncs the messages you send to
+* XEP-0280: Message Carbons which automatically syncs the messages you send to
  your desktop client and thus allows you to switch seamlessly from your mobile
  client to your desktop client and back within one conversation.
-* [XEP-0237: Roster Versioning](http://xmpp.org/extensions/xep-0237.html) mainly to save bandwidth on poor mobile connections
-* [XEP-0313: Message Archive Management](http://xmpp.org/extensions/xep-0313.html) synchronize message history with the
+* XEP-0237: Roster Versioning mainly to save bandwidth on poor mobile connections
+* XEP-0313: Message Archive Management synchronize message history with the
  server. Catch up with messages that were sent while Conversations was
  offline.
-* [XEP-0352: Client State Indication](http://xmpp.org/extensions/xep-0352.html) lets the server know whether or not
+* XEP-0352: Client State Indication lets the server know whether or not
  Conversations is in the background. Allows the server to save bandwidth by
  withholding unimportant packages.
-* [XEP-0363: HTTP File Upload](http://xmpp.org/extensions/xep-0363.html) allows you to share files in conferences
-  and with offline contacts.
+* XEP-xxxx: HttpUpload allows you to share files in conferences and with offline
+  contacts. Requires an [additional component](https://github.com/siacs/HttpUploadComponent)
+  on your server.

 ## Team

@ -80,7 +81,6 @@ run your own XMPP server for you and your friends. These XEP's are:
 #### Logo
 * [Ilia Rostovtsev](https://github.com/qooob) (Progress)
 * [Diego Turtulici](http://efesto.eigenlab.org/~diesys) (Original)
-* [fiaxh](https://github.com/fiaxh) (OMEMO)

 #### Translations
 Translations are managed on [Transifex](https://www.transifex.com/projects/p/conversations/)
@ -92,12 +92,12 @@ Translations are managed on [Transifex](https://www.transifex.com/projects/p/con
 #### How do I install Conversations?

 Conversations is entirely open source and licensed under GPLv3. So if you are a
-software developer you can check out the sources from GitHub and use Gradle to
+software developer you can check out the sources from GitHub and use ant to
 build your apk file.

 The more convenient way — which not only gives you automatic updates but also
 supports the further development of Conversations — is to buy the App in the
-Google [Play Store](https://play.google.com/store/apps/details?id=eu.siacs.conversations&referrer=utm_source%3Dgithub).
+Google [Play Store](https://play.google.com/store/apps/details?id=eu.siacs.conversations).

 Buying the App from the Play Store will also give you access to our [beta test](#beta).

@ -118,48 +118,20 @@ My Bitcoin Address is: `1NxSU1YxYzJVDpX1rcESAA3NJki7kRgeeu`
 [![Flattr this!](http://api.flattr.com/button/flattr-badge-large.png)](https://flattr.com/submit/auto?user_id=inputmice&url=http%3A%2F%2Fconversations.siacs.eu&title=Conversations&tags=github&category=software)

 #### How do I create an account?
-XMPP, like email, is a federated protocol, which means that there is not one company you can create an *official XMPP account* with. Instead there are hundreds, or even thousands, of providers out there. One of those providers is our very own [conversations.im](https://account.conversations.im). If you don’t like to use *conversations.im* use a web search engine of your choice to find another provider. Or maybe your university has one. Or you can run your own. Or ask a friend to run one. Once you've found one, you can use Conversations to create an account. Just select *register new account* on server within the create account dialog.

-##### Domain hosting
-Using your own domain not only gives you a more recognizable Jabber ID, it also gives you the flexibility to migrate your account between different XMPP providers. This is a good compromise between the responsibilities of having to operate your own server and the downsides of being dependent on a single provider.
-
-Learn more about [conversations.im Jabber/XMPP domain hosting](https://account.conversations.im/domain/). 
-
-##### Running your own
-If you already have a server somewhere and are willing and able to put the necessary work in, one alternative-in the spirit of federation-is to run your own. We recommend either [Prosody](https://prosody.im/) or [ejabberd](https://www.ejabberd.im/). Both of which have their own strengths. Ejabberd is slightly more mature nowadays but Prosody is arguably easier to set up.
-
-For Prosody you need a couple of so called [community modules](https://modules.prosody.im/) most of which are maintained by the same people that develop Prosody.
-
-If you pick ejabberd make sure you use the latest version. Linux Distributions might bundle some very old versions of it.
+XMPP, like email, is a federated protocol which means that there is not one
+company you can create an 'official XMPP account' with. Instead there are
+hundreds, or even thousands, of provider out there. To find one use a web search
+engine of your choice. Or maybe your university has one. Or you can run your
+own. Or ask a friend to run one. Once you've found one, you can use
+Conversations to create an account. Just select 'register new account on server'
+within the create account dialog.

 #### Where can I set up a custom hostname / port
 Conversations will automatically look up the SRV records for your domain name
 which can point to any hostname port combination. If your server doesn’t provide
 those please contact your admin and have them read
-[this](http://prosody.im/doc/dns#srv_records). If your server operator is unwilling
-to fix this you can enable advanced server settings in the expert settings of
-Conversations.
-
-#### I get 'Incompatible Server'
-
-As regular user you should be picking a different server. The server you selected
-is probably insecure and/or very old.
-
-If you are a server administrator you should make sure that your server provides
-STARTTLS. XMPP over TLS (on a different port) is not sufficient.
-
-On rare occasions this error message might also be caused by a server not providing
-a login (SASL) mechanism that Conversations is able to handle. Conversations supports
-SCRAM-SHA1, PLAIN, EXTERNAL (client certs) and DIGEST-MD5.
-
-#### How do XEP-0357: Push Notifications work?
-You need to be running the Play Store version of Conversations and your server needs to support push notifications.¹ Because *Google Cloud Notifications (GCM)* are tied with an API key to a specific app your server can not initiate the push message directly. Instead your server will send the push notification to the Conversations App server (operated by us) which then acts as a proxy and initiates the push message for you. The push message sent from our App server through GCM doesn’t contain any personal information. It is just an empty message which will wake up your device and tell Conversations to reconnect to your server. The information send from your server to our App server depends on the configuration of your server but can be limited to your account name. (In any case the Conversations App server won't redirect any information through GCM even if your server sends this information.)
-
-In summary Google will never get hold of any personal information besides that *something* happened. (Which doesn’t even have to be a message but can be some automated event as well.) We - as the operator of the App server - will just get hold of your account name (without being able to tie this to your specific device).
-
-If you don’t want this simply pick a server which does not offer Push Notifications or build Conversations yourself without support for push notifications. (This is available via a gradle build flavor.) Non-play store source of Conversations like the Amazon App store will also offer a version without push notifications. Conversations will just work as before and maintain its own TCP connection in the background.
-
- ¹ Your server only needs to support the server side of [XEP-0357: Push Notifications](http://xmpp.org/extensions/xep-0357.html). If you use the Play Store version you do **not** need to run your own app server. The server modules are called *mod_cloud_notify* on Prosody and *mod_push* on ejabberd.
+[this](http://prosody.im/doc/dns#srv_records)

 #### Conversations doesn't work for me. Where can I get help?

@ -201,12 +173,6 @@ connection again. When the client fails to do so because the network
 connectivity is out for longer than that all messages sent to that client will
 be returned to the sender resulting in a delivery failed.

-Instead of returning a message to the sender both ejabberd and prosody have the
-ability to store messages in offline storage when the disconnecting client is
-the only client. In prosody this is available via an extra module called
-```mod_smacks_offline```. In ejabberd this is available via some configuration
-settings.
-
 Other less common reasons are that the message you sent didn't meet some
 criteria enforced by the server (too large, too many). Another reason could be
 that the recipient is offline and the server doesn't provide offline storage.
@ -247,11 +213,6 @@ Making these status and priority optional isn't a solution either because
 Conversations is trying to get rid of old behaviours and set an example for
 other clients.

-#### How do I backup / move Conversations to a new device?
-On the one hand Conversations supports Message Archive Management to keep a server side history of your messages so when migrating to a new device that device can display your entire history. However that does not work if you enable OMEMO due to its forward secrecy. (Read [The State of Mobile XMPP in 2016](https://gultsch.de/xmpp_2016.html) especially the section on encryption.)
-
-If you migrate to a new device and would still like to keep your history please use a third party backup tool like [oandbackup](https://github.com/jensstein/oandbackup) or ```adb backup``` from your computer.  It is important that your deactivate your account before backup and activate it only after a successful restore. Otherwise OMEMO might not work afterwards. 
-
 #### Conversations is missing a certain feature

 I'm open for new feature suggestions. You can use the [issue tracker][issues] on
@ -274,11 +235,11 @@ I am available for hire. Contact me via XMPP: `inputmice@siacs.eu`

 ### Security

-#### Why are there three end-to-end encryption methods and which one should I choose?
+#### Why are there two end-to-end encryption methods and which one should I choose?

-* OTR is a legacy encryption method. It works out of the box with most contacts as long as they are online.
-* OMEMO works even when a contact is offline, and works with multiple devices. It also allows asynchronous file-transfer when the server has [HTTP File Upload](http://xmpp.org/extensions/xep-0363.html). However, OMEMO is not as widely supported as OTR and is currently implemented only by Conversations and Gajim. OMEMO should be preferred over OTR for contacts who use Conversations.
-* OpenPGP (XEP-0027) is a very old encryption method that has some advantages over OTR but should only be used by experts who know what they are doing.
+In most cases OTR should be the encryption method of choice. It works out of the
+box with most contacts as long as they are online. However PGP can, in some
+cases, (message carbons to multiple clients) be more flexible.

 #### How do I use OpenPGP

@ -297,36 +258,14 @@ To use OpenPGP you have to install the open source app
 [OpenKeychain](http://www.openkeychain.org) and then long press on the account in
 manage accounts and choose renew PGP announcement from the contextual menu.

-#### OMEMO is grayed out. What do I do?
-OMEMO has two requirements: Your server and the server of your contact need to support PEP. Both of you can verify that individually by opening your account details and selecting ```Server info``` from the menu. The appearing table should list PEP as available. The second requirement is mutual presence subscription. You can verify that by opening the contact details and see if both check boxes *Send presence updates* and *Receive presence updates* are checked.
-
 #### How does the encryption for conferences work?

-For conferences only OMEMO and OpenPGP are supported as encryption method. (OTR
-does not work with multiple participants).
-
-##### OMEMO
-
-OMEMO encryption works only in private (members only) conferences that are non-anonymous.
-You need to have presence subscription with every member of the conference.
-You can verify that by going into the conference details, long press every member and start
-a conversation with them. (Or select 'contact details' if they are already in your contact
-list)
-
-The owner of a conference can make a public conference private by going into the conference
-details and hit the settings button (the one with the gears) and select both *private* and
-*members only*.
-
-If OMEMO is grayed out long pressing the lock icon will reveal some quick hints on why OMEMO
-is disabled.
-
-##### OpenPGP
-
-Every participant has to announce their OpenPGP key (see answer above).
-If you would like to send encrypted messages to a conference you have to make
-sure that you have every participant's public key in your OpenKeychain.
-Right now there is no check in Conversations to ensure that.
-You have to take care of that yourself. Go to the conference details and
+For conferences the only supported encryption method is OpenPGP (OTR does not
+work with multiple participants). Every participant has to announce their
+OpenPGP key (see answer above). If you would like to send encrypted messages to
+a conference you have to make sure that you have every participant's public key
+in your OpenKeychain. Right now there is no check in Conversations to ensure
+that. You have to take care of that yourself. Go to the conference details and
 touch every key id (The hexadecimal number below a contact). This will send you
 to OpenKeychain which will assist you on adding the key.  This works best in
 very small conferences with contacts you are already using OpenPGP with. This
@ -334,23 +273,6 @@ feature is regarded experimental. Conversations is the only client that uses
 XEP-0027 with conferences. (The XEP neither specifically allows nor disallows
 this.)

-#### Why is Conversations not end-to-end encrypted by default
-We briefly had OMEMO as the default E2EE but it turned out to be a usability nightmare and thus we reverted that. You can find more information in [the commit message](https://github.com/siacs/Conversations/commit/035d0c79572d5981c53d1bff7f30b484c6542f17) of that change.
-
-Quick reminder that Conversations **always** uses TLS to connect to your server. It won‘t even connect to a server without TLS.
-
-#### What is Blind Trust Before Verification / why are messages marked with a red lock?
-
-Read more about the concept on https://gultsch.de/trust.html
-
-### What clients do I use on other platforms
-There are XMPP Clients available for all major platforms.
-####Windows / Linux
-For your desktop computer we recommend that you use [Gajim](https://gajim.org). You need to install the plugins `OMEMO`, `HTTP Upload` and `URL image preview` to get the best compatibility with Conversations. Plugins can be installed from within the app.
-####iOS
-Unfortunately we don‘t have a recommendation for iPhones right now. There are two clients available [ChatSecure](https://chatsecure.org/) and [Monal](https://monal.im/). Both with their own pros and cons.
-
-
 ### Development

 <a name="beta"></a>
@ -363,18 +285,16 @@ to sign up for the beta test.

 #### How do I build Conversations

-Make sure to have ANDROID_HOME point to your Android SDK. Use the Android SDK Manager to install missing dependencies.
+Make sure to have ANDROID_HOME point to your Android SDK

    git clone https://github.com/siacs/Conversations.git
    cd Conversations
-    ./gradlew assembleFreeDebug
-
-There are two build flavors available. *free* and *playstore*. Unless you know what you are doing you only need *free*.
+    ./gradlew build


 [![Build Status](https://travis-ci.org/siacs/Conversations.svg?branch=development)](https://travis-ci.org/siacs/Conversations)

-#### How do I update/add external libraries?
+### How do I update/add external libraries?

 If the library you want to update is in Maven Central or JCenter (or has its own
 Maven repo), add it or update its version in `build.gradle`. If the library is
@ -397,27 +317,16 @@ To add a new dependency to the `libs/` directory (replacing "name", "branch" and

 If something goes wrong Conversations usually exposes very little information in
 the UI (other than the fact that something didn't work). However with adb
-(android debug bridge) you can squeeze some more information out of Conversations.
+(android debug bridge) you squeeze some more information out of Conversations.
 These information are especially useful if you are experiencing trouble with
 your connection or with file transfer.

-To use adb you have to connect your mobile phone to your computer with an USB cable
-and install `adb`. Most Linux systems have prebuilt packages for that tool. On
-Debian/Ubuntu for example it is called `android-tools-adb`.
-
-Furthermore you might have to enable 'USB debugging' in the Developer options of your
-phone. After that you can just execute the following on your computer:
-
    adb -d logcat -v time -s conversations

-If need be there are also some Apps on the PlayStore that can be used to show the logcat
-directly on your rooted phone. (Search for logcat). However in regards to further processing
-(for example to create an issue here on Github) it is more convenient to just use your PC.
-
 #### I found a bug

 Please report it to our [issue tracker][issues]. If your app crashes please
-provide a stack trace. If you are experiencing misbehavior please provide
+provide a stack trace. If you are experiencing misbehaviour please provide
 detailed steps to reproduce. Always mention whether you are running the latest
 Play Store version or the current HEAD. If you are having problems connecting to
 your XMPP server your file transfer doesn’t work as expected please always
--- a/10
+++ b/10
@ -0,0 +1,10 @@
+settings:
+- cleanup and structure
+- remove/fix "enter is send" and "show enter key"
+code:
+- check parseTimestamp
+- change crash reports
+- notification with emojicon textview
+general:
+- add comments to code of XEPs
+- add comments in general
--- a/art/conversations_baloon.svg
+++ b/art/conversations_baloon.svg
@ -0,0 +1,390 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="512"
+   height="512"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="conversations_baloon.svg"
+   inkscape:export-filename="/home/diesys/diesys/grafica/conversation/conversation_bubble.png"
+   inkscape:export-xdpi="100"
+   inkscape:export-ydpi="100">
+  <defs
+     id="defs4">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3874">
+      <stop
+         style="stop-color:#00a000;stop-opacity:1;"
+         offset="0"
+         id="stop3876" />
+      <stop
+         style="stop-color:#00a000;stop-opacity:0;"
+         offset="1"
+         id="stop3878" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3913">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop3915" />
+      <stop
+         style="stop-color:#ffffff;stop-opacity:0;"
+         offset="1"
+         id="stop3917" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient3818">
+      <stop
+         style="stop-color:#669900;stop-opacity:1"
+         offset="0"
+         id="stop3820" />
+      <stop
+         style="stop-color:#99cc00;stop-opacity:1"
+         offset="1"
+         id="stop3822" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818"
+       id="radialGradient3824"
+       cx="212.07048"
+       cy="1045.9178"
+       fx="212.07048"
+       fy="1045.9178"
+       r="238.57143"
+       gradientTransform="matrix(1.9491621,-0.90817722,0.65829208,1.4128498,-879.63121,-248.98648)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3913"
+       id="radialGradient3919"
+       cx="362.98563"
+       cy="379.77524"
+       fx="362.98563"
+       fy="379.77524"
+       r="139.95312"
+       gradientTransform="matrix(1.3800477,1.0445431,-1.3325077,1.7605059,339.09383,-577.83938)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       gradientUnits="userSpaceOnUse"
+       y2="-155.75885"
+       x2="114.59022"
+       y1="35.545681"
+       x1="114.55434"
+       id="linearGradient3794"
+       xlink:href="#linearGradient3788"
+       inkscape:collect="always" />
+    <linearGradient
+       id="linearGradient3788">
+      <stop
+         id="stop3790"
+         offset="0"
+         style="stop-color:#1eed00;stop-opacity:1;" />
+      <stop
+         id="stop3792"
+         offset="1"
+         style="stop-color:#abff28;stop-opacity:1;" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3821">
+      <stop
+         style="stop-color:#ff283d;stop-opacity:1;"
+         offset="0"
+         id="stop3823" />
+      <stop
+         style="stop-color:#ff28ae;stop-opacity:1;"
+         offset="1"
+         id="stop3825" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient4543">
+      <stop
+         style="stop-color:#2e45bf;stop-opacity:1;"
+         offset="0"
+         id="stop4545" />
+      <stop
+         style="stop-color:#28a7ff;stop-opacity:1;"
+         offset="1"
+         id="stop4547" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4098">
+      <stop
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0"
+         id="stop4100" />
+      <stop
+         style="stop-color:#e6e6e6;stop-opacity:1"
+         offset="1"
+         id="stop4102" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4098"
+       id="linearGradient3833"
+       x1="273.81851"
+       y1="764.74677"
+       x2="304.14023"
+       y2="936.47272"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4098"
+       id="linearGradient3853"
+       gradientUnits="userSpaceOnUse"
+       x1="273.81851"
+       y1="764.74677"
+       x2="304.14023"
+       y2="936.47272" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818"
+       id="radialGradient3863"
+       cx="262.33273"
+       cy="945.23846"
+       fx="262.33273"
+       fy="945.23846"
+       r="185.49754"
+       gradientTransform="matrix(1.2253203,-0.54206726,0.43090148,0.97403458,-466.4135,170.11831)"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818"
+       id="radialGradient3866"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2253203,-0.54206726,0.43090148,0.97403458,-466.4135,170.11831)"
+       cx="262.33273"
+       cy="945.23846"
+       fx="262.33273"
+       fy="945.23846"
+       r="185.49754" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3913"
+       id="radialGradient3873"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.3800477,1.0445431,-1.3325077,1.7605059,339.09383,-577.83938)"
+       cx="321.75275"
+       cy="386.38751"
+       fx="321.75275"
+       fy="386.38751"
+       r="139.95312" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3818"
+       id="radialGradient3880"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.2253203,-0.54206726,0.43090148,0.97403458,-466.4135,-370.24387)"
+       cx="262.33273"
+       cy="945.23846"
+       fx="262.33273"
+       fy="945.23846"
+       r="185.49754" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3913"
+       id="radialGradient3883"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.4430075,-0.63865195,0.50745433,1.1475866,-594.40824,44.803037)"
+       cx="262.33273"
+       cy="945.23846"
+       fx="262.33273"
+       fy="945.23846"
+       r="185.49754" />
+    <filter
+       inkscape:collect="always"
+       id="filter3895">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.0013623"
+         id="feGaussianBlur3897" />
+    </filter>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3874"
+       id="radialGradient3881"
+       cx="150.35715"
+       cy="236.28571"
+       fx="150.35715"
+       fy="236.28571"
+       r="26.887305"
+       gradientTransform="matrix(1,0,0,0.98671703,0,3.1385771)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1.4142136"
+     inkscape:cx="385.13513"
+     inkscape:cy="237.84331"
+     inkscape:document-units="px"
+     inkscape:current-layer="layer4"
+     showgrid="false"
+     inkscape:window-width="2560"
+     inkscape:window-height="1020"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:snap-to-guides="true"
+     inkscape:snap-grids="false"
+     inkscape:object-paths="true"
+     inkscape:object-nodes="false"
+     inkscape:snap-nodes="false">
+    <sodipodi:guide
+       orientation="1,0"
+       position="0,534.28571"
+       id="guide3004" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="394.28571,511.42857"
+       id="guide3006" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="511.42857,320"
+       id="guide3008" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="401.42857,0"
+       id="guide3010" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="17.142857,258.57143"
+       id="guide3012" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="327.14286,494.28571"
+       id="guide3014" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="324.28571,17.142857"
+       id="guide3016" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="494.28571,237.14286"
+       id="guide3018" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="255.71429,302.85714"
+       id="guide3022" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="660,-315"
+       id="guide3904" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="554.28571,475.71429"
+       id="guide3931" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="581.42857,244.28571"
+       id="guide3933" />
+  </sodipodi:namedview>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(0,-540.36218)"
+     style="display:inline">
+    <path
+       d="m 253.34375,605.78125 c -107.90463,0 -195.9375,85.86121 -195.9375,191.84375 0,105.98253 88.02779,191.90625 195.9375,191.90625 33.55862,0 59.4324,-6.89467 88.96875,-17.625 l 93.8125,37.81255 A 12.359798,12.359798 0 0 0 452.75,995.28125 L 427.34375,892.59375 C 443.67389,863.93074 449.25,831.2919 449.25,797.625 449.25,691.64506 361.24842,605.78125 253.34375,605.78125 z"
+       id="path3885"
+       style="opacity:0.6;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter3895)"
+       inkscape:original="M 253.34375 618.125 C 151.96941 618.125 69.75 698.4746 69.75 797.625 C 69.75 896.77539 151.96941 977.1875 253.34375 977.1875 C 287.00054 977.1875 311.5728 970.27778 342.65625 958.71875 L 440.75 998.25 L 414.1875 890.8125 C 431.0772 863.65332 436.90625 831.73711 436.90625 797.625 C 436.90625 698.4746 354.71813 618.125 253.34375 618.125 z "
+       inkscape:radius="12.358562"
+       sodipodi:type="inkscape:offset"
+       transform="matrix(1.1776575,0,0,1.1781783,-45.132882,-150.91395)" />
+    <path
+       sodipodi:type="inkscape:offset"
+       inkscape:radius="12.358562"
+       inkscape:original="M 253.34375 618.125 C 151.96941 618.125 69.75 698.4746 69.75 797.625 C 69.75 896.77539 151.96941 977.1875 253.34375 977.1875 C 287.00054 977.1875 311.5728 970.27778 342.65625 958.71875 L 440.75 998.25 L 414.1875 890.8125 C 431.0772 863.65332 436.90625 831.73711 436.90625 797.625 C 436.90625 698.4746 354.71813 618.125 253.34375 618.125 z "
+       style="fill:#00a000;fill-opacity:1;stroke:none"
+       id="path3868"
+       d="m 253.34375,605.78125 c -107.90463,0 -195.9375,85.86121 -195.9375,191.84375 0,105.98253 88.02779,191.90625 195.9375,191.90625 33.55862,0 59.4324,-6.89467 88.96875,-17.625 l 93.8125,37.81255 A 12.359798,12.359798 0 0 0 452.75,995.28125 L 427.34375,892.59375 C 443.67389,863.93074 449.25,831.2919 449.25,797.625 449.25,691.64506 361.24842,605.78125 253.34375,605.78125 z"
+       transform="matrix(1.1776575,0,0,1.1781783,-45.132882,-155.6267)" />
+    <path
+       style="opacity:0.19211821;fill:url(#radialGradient3883);fill-opacity:1;stroke:none"
+       d="m 442.08605,700.89397 c -129.66422,0 -234.75863,103.19621 -234.75863,230.48113 0,26.84957 4.6841,52.62718 13.28548,76.5811 10.65333,1.4828 21.54531,2.2461 32.60637,2.2461 39.52053,0 69.99101,-8.1231 104.7747,-20.7651 l 110.479,44.5494 a 14.555607,14.562048 0 0 0 19.57853,-17.0097 L 458.13167,895.99293 c 19.23127,-33.77016 25.79804,-72.22452 25.79804,-111.89014 0,-28.84573 -5.53074,-56.41202 -15.60395,-81.77294 -8.61503,-0.94041 -17.37147,-1.43588 -26.23971,-1.43588 z"
+       id="path3878"
+       inkscape:connector-curvature="0" />
+    <path
+       sodipodi:nodetypes="ccsssscc"
+       inkscape:connector-curvature="0"
+       id="path3845"
+       d="M 478.64112,1025.218 447.36049,898.60749 c 19.89028,-31.99834 26.74288,-69.57172 26.74288,-109.76189 0,-116.81686 -96.79943,-211.48385 -216.18374,-211.48385 -119.38425,0 -216.183656,94.66699 -216.183656,211.48385 0,116.81685 96.799406,211.5536 216.183656,211.5536 39.63617,0 68.58847,-8.14219 105.19417,-21.76075 z"
+       style="opacity:0;fill:none;stroke:#000000;stroke-width:23.55835724;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:94.23343197, 94.23343197;stroke-dashoffset:0" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path3855"
+       d="m 253.18246,561.05889 c -5.38379,-0.002 -10.7413,0.0871 -12.77023,0.22089 -16.80965,1.10727 -29.68729,3.05317 -44.38296,6.77453 -5.64799,1.43026 -9.96811,2.69833 -15.19914,4.41816 -3.34052,1.09828 -8.41764,2.85364 -8.68521,3.01909 -0.082,0.0507 3.32705,9.32907 7.98597,21.79631 0.0466,0.12496 0.17057,0.13832 0.33123,0.0736 1.11322,-0.44815 6.45699,-2.29745 8.94283,-3.09273 21.39718,-6.84518 43.95735,-10.19531 66.31683,-9.86723 3.14874,0.0461 7.13319,0.15915 8.83245,0.25775 1.69921,0.0987 3.12161,0.15378 3.16493,0.11037 0.0685,-0.0684 1.53237,-23.21444 1.47209,-23.26905 -0.0122,-0.0117 -1.41064,-0.10943 -3.12817,-0.22089 -2.0869,-0.13546 -7.49683,-0.21852 -12.88062,-0.22088 z m 110.81021,28.16581 c -0.10125,0.10911 -11.15095,20.28455 -11.15095,20.36043 0,0.0184 0.50701,0.31641 1.14084,0.66267 8.38104,4.57856 17.56037,10.63803 25.90897,17.04889 3.23527,2.48434 6.34578,5.02146 9.23674,7.54561 4.2123,3.67784 8.41256,7.68117 12.42754,11.81905 6.38417,6.5796 12.29989,13.4994 17.05071,19.99177 0.65274,0.89212 0.79099,1.01157 1.03047,0.84681 1.13402,-0.7802 18.39736,-13.76959 18.40089,-13.84358 0.005,-0.1 -3.33561,-4.52525 -4.74744,-6.29593 -5.64395,-7.07831 -10.59769,-12.59166 -17.26005,-19.25582 -8.26499,-8.26722 -16.14264,-15.121 -25.02569,-21.71453 -2.5667,-1.90515 -5.21733,-3.78858 -7.9855,-5.6781 -6.60132,-4.50598 -18.71149,-11.82683 -19.02653,-11.48727 z m -274.762206,39.94759 -2.428914,2.57732 c -21.579098,22.69359 -38.068397,49.23025 -48.467963,78.05431 -0.50904,1.41091 -0.957247,2.67589 -0.993643,2.83498 -0.04781,0.20904 2.956962,1.31003 10.78292,3.93954 5.956638,2.00143 10.92488,3.63791 11.040538,3.64502 0.115645,0.007 0.916879,-1.94564 1.803285,-4.34458 9.098432,-24.62317 23.187184,-47.25662 41.659643,-66.93523 l 3.05453,-3.27681 -8.206806,-8.24726 z m 388.222146,115.167 -9.89972,1.91451 c -5.44839,1.06994 -10.56998,2.07187 -11.40857,2.20908 -1.04711,0.17137 -1.54564,0.35016 -1.54564,0.55228 0,0.16187 0.23325,1.63204 0.51522,3.2768 2.70275,15.76547 3.28356,34.63258 1.69287,55.26394 -0.7281,9.44363 -2.34823,21.04449 -3.90099,28.01857 -0.23345,1.0486 -0.37949,1.97667 -0.33118,2.02499 0.0483,0.0483 5.12585,1.1561 11.29809,2.46683 6.17232,1.31067 11.30751,2.37915 11.3718,2.39315 0.0641,0.014 0.45734,-1.73307 0.88322,-3.90272 3.35867,-17.11028 4.82653,-33.18977 4.85786,-53.27572 0.0219,-14.08945 -0.79161,-24.35571 -2.87056,-36.96537 z m -427.268845,64.06345 -0.772838,0.11039 c -0.421858,0.0612 -5.59823,0.67716 -11.482161,1.36226 -5.883927,0.68512 -10.759171,1.30169 -10.819725,1.36228 -0.141991,0.142 0.252313,2.91986 1.140854,8.32086 4.869392,29.59836 15.038358,56.25732 31.539139,82.61977 0.450701,0.72005 0.931445,1.27763 1.06725,1.25182 0.361709,-0.0685 19.423106,-12.2036 19.431349,-12.3709 0.0036,-0.0779 -0.796734,-1.40341 -1.766487,-2.94542 -4.266677,-6.78447 -9.935035,-17.45299 -13.064635,-24.5945 -7.52905,-17.18062 -12.488823,-34.71382 -15.051936,-53.27567 z M 462.40066,926.44149 c -0.46898,0.009 -22.08567,5.38002 -22.2283,5.52269 -0.098,0.0981 22.04129,90.06142 22.37549,91.01382 0.40286,1.1482 3.73284,10.5298 13.56323,8.9156 10.95786,-2.3434 9.8458,-14.6677 8.99628,-14.4751 -0.11284,0.025 -5.02627,-20.61508 -11.18774,-45.58033 -8.79763,-35.64656 -11.26829,-45.40142 -11.51896,-45.39668 z M 143.91794,953.1714 c -0.40943,0.0131 -1.21588,1.3276 -6.29312,9.64634 -3.31435,5.43031 -6.03549,9.92123 -6.03549,9.9777 0,0.13674 3.42858,2.19027 7.06593,4.27089 22.35182,12.78549 47.08561,21.82095 72.42596,26.43487 3.59043,0.654 5.67261,1.0064 11.04051,1.804 0.69401,0.1031 1.36954,0.2073 1.50889,0.2212 0.31484,0.031 0.24386,0.6279 1.87691,-11.45018 0.75094,-5.5542 1.40492,-10.43428 1.47207,-10.86126 0.11781,-0.74877 0.0863,-0.77677 -0.58887,-0.88362 -0.38487,-0.0607 -2.68651,-0.4127 -5.11543,-0.77322 -22.30454,-3.3101 -45.25895,-10.90321 -65.32317,-21.57538 -3.55401,-1.89038 -10.16752,-5.64292 -11.85018,-6.73769 -0.0531,-0.0345 -0.12551,-0.0755 -0.18401,-0.0737 z m 214.22322,9.09404 c -1.98095,0.13013 -4.60205,1.01767 -10.4517,3.12954 -11.29964,4.0795 -24.13159,8.26507 -29.91986,9.75681 -0.83741,0.21582 -1.5445,0.50692 -1.54566,0.62592 -0.002,0.21503 5.72469,22.22722 5.81468,22.34847 0.0552,0.075 6.34708,-1.70267 10.2677,-2.90858 5.09669,-1.5677 13.67295,-4.44246 19.79936,-6.62722 l 6.07232,-2.17225 22.30187,8.98356 c 18.14341,7.31671 22.30098,8.95081 22.41231,8.68881 0.9061,-2.1322 8.61707,-21.32757 8.57483,-21.35419 -0.38803,-0.24492 -49.13929,-19.77601 -49.90327,-19.99221 -1.25781,-0.35596 -2.23399,-0.55669 -3.42258,-0.47866 z"
+       style="opacity:0.5;fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:5.88958931;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       sodipodi:nodetypes="ccssccssscccccccssssscccsssscccscsssccccccssssssssssccccscssccsscccsscsscsssssccsccsscsscsccscccccssc" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer4"
+     inkscape:label="Dots">
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.928;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3047"
+       sodipodi:cx="173.57143"
+       sodipodi:cy="241.28571"
+       sodipodi:rx="26.428572"
+       sodipodi:ry="20"
+       d="m 200,241.28571 a 26.428572,20 0 1 1 -52.85715,0 26.428572,20 0 1 1 52.85715,0 z"
+       transform="matrix(0.94594594,0,0,1.25,-18.332045,-54.607132)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.928;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3047-1"
+       sodipodi:cx="173.57143"
+       sodipodi:cy="241.28571"
+       sodipodi:rx="26.428572"
+       sodipodi:ry="20"
+       d="m 200,241.28571 a 26.428572,20 0 1 1 -52.85715,0 26.428572,20 0 1 1 52.85715,0 z"
+       transform="matrix(0.94594594,0,0,1.25,91.38502,-54.607132)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.928;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3047-1-8"
+       sodipodi:cx="173.57143"
+       sodipodi:cy="241.28571"
+       sodipodi:rx="26.428572"
+       sodipodi:ry="20"
+       d="m 200,241.28571 a 26.428572,20 0 1 1 -52.85715,0 26.428572,20 0 1 1 52.85715,0 z"
+       transform="matrix(0.94594594,0,0,1.25,201.38502,-54.607132)" />
+  </g>
+</svg>
--- a/art/ic_launcher.svg
+++ b/art/ic_launcher.svg
@ -1,427 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="57mm"
-   height="57mm"
-   viewBox="0 0 201.96849 201.96849"
-   id="svg4211"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="conversations_baloon.svg">
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     showgrid="false"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0"
-     showguides="false"
-     inkscape:zoom="2.2196812"
-     inkscape:cx="39.109276"
-     inkscape:cy="132.27753"
-     inkscape:window-width="1600"
-     inkscape:window-height="836"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="layer8" />
-  <defs
-     id="defs4213">
-    <linearGradient
-       osb:paint="solid"
-       id="linearGradient5393">
-      <stop
-         id="stop5395"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-    </linearGradient>
-    <clipPath
-       id="clipPath4831"
-       clipPathUnits="userSpaceOnUse">
-      <circle
-         style="display:inline;opacity:1;fill:#a00e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="circle4833"
-         cx="883.16943"
-         cy="677.19611"
-         r="229.80969" />
-    </clipPath>
-    <clipPath
-       id="clipPath4859"
-       clipPathUnits="userSpaceOnUse">
-      <circle
-         style="display:inline;opacity:1;fill:#a00e00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-         id="circle4861"
-         cx="883.16943"
-         cy="677.19611"
-         r="229.80969" />
-    </clipPath>
-    <clipPath
-       id="clipPath5624"
-       clipPathUnits="userSpaceOnUse">
-      <g
-         style="display:inline"
-         id="g5626"
-         transform="matrix(0.3835576,0,0,0.3835576,-250.60108,-156.11014)">
-        <path
-           sodipodi:nodetypes="ccsssc"
-           inkscape:connector-curvature="0"
-           id="path5628"
-           d="m 1120.8042,772.36056 -118.0025,103.66316 118.5792,46.01918 c 8.4859,3.29325 19.6524,7.94481 27.2622,0.71376 7.3868,-7.01907 5.6502,-14.13839 3.0935,-24.54095 z"
-           style="display:inline;fill:#4caf50;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <circle
-           transform="matrix(1.0878566,0,0,1.0878566,-57.401992,-79.686482)"
-           clip-path="url(#clipPath4859)"
-           r="229.80969"
-           cy="677.19611"
-           cx="883.16943"
-           id="circle5630"
-           style="display:inline;opacity:1;fill:#4caf50;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      </g>
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath10653">
-      <g
-         style="display:inline"
-         id="g10655"
-         transform="matrix(0.3835576,0,0,0.3835576,-250.60108,-156.11015)"
-         inkscape:export-xdpi="100"
-         inkscape:export-ydpi="100">
-        <path
-           sodipodi:nodetypes="ccsssc"
-           inkscape:connector-curvature="0"
-           id="path10657"
-           d="m 1120.8042,772.36056 -118.0025,103.66316 118.5792,46.01918 c 8.4859,3.29325 19.6524,7.94481 27.2622,0.71376 7.3868,-7.01907 5.6502,-14.13839 3.0935,-24.54095 z"
-           style="display:inline;fill:#4caf50;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-        <circle
-           transform="matrix(1.0878566,0,0,1.0878566,-57.401992,-79.686482)"
-           clip-path="url(#clipPath4859)"
-           r="229.80969"
-           cy="677.19611"
-           cx="883.16943"
-           id="circle10659"
-           style="display:inline;opacity:1;fill:#4caf50;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-      </g>
-    </clipPath>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3913"
-       id="radialGradient3883"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.68662089,-0.30388739,0.24146012,0.54605188,-300.74233,-264.46964)"
-       cx="262.33273"
-       cy="945.23846"
-       fx="262.33273"
-       fy="945.23846"
-       r="185.49754" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3913">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3915" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop3917" />
-    </linearGradient>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5315">
-      <g
-         inkscape:export-ydpi="100"
-         inkscape:export-xdpi="100"
-         transform="matrix(0.3835576,0,0,0.3835576,-246.60108,-156.11013)"
-         id="g5317"
-         style="display:inline;fill:#00a000;fill-opacity:1">
-        <path
-           style="display:inline;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-           d="m 1120.8042,772.36056 -118.0025,103.66316 118.5792,46.01918 c 8.4859,3.29325 19.6524,7.94481 27.2622,0.71376 7.3868,-7.01907 5.6502,-14.13839 3.0935,-24.54095 z"
-           id="path5319"
-           inkscape:connector-curvature="0"
-           sodipodi:nodetypes="ccsssc" />
-        <circle
-           style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-           id="circle5321"
-           cx="883.16943"
-           cy="677.19611"
-           r="229.80969"
-           clip-path="url(#clipPath4859)"
-           transform="matrix(1.0878566,0,0,1.0878566,-57.401992,-79.686482)" />
-      </g>
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6882">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6884"
-         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6886">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6888"
-         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6890">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6892"
-         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6894">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6896"
-         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6898">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6900"
-         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6902">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6904"
-         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6906">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6908"
-         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </clipPath>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath6910">
-      <path
-         inkscape:connector-curvature="0"
-         id="path6912"
-         d="M 99.88867,-2.3837657e-4 A 95.889392,95.889392 0 0 0 4,95.888436 95.889392,95.889392 0 0 0 99.88867,191.77906 95.889392,95.889392 0 0 0 142.59375,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.7793,95.888466 95.889392,95.889392 0 0 0 99.88867,-2.0837657e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </clipPath>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter5640"
-       x="-0.012227737"
-       width="1.0244555"
-       y="-0.011780591"
-       height="1.0235612">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.9782166"
-         id="feGaussianBlur5642" />
-    </filter>
-    <clipPath
-       clipPathUnits="userSpaceOnUse"
-       id="clipPath5745">
-      <path
-         inkscape:connector-curvature="0"
-         id="path5747"
-         d="M 99.908581,-2.3831968e-4 A 95.889392,95.889392 0 0 0 4.0199102,95.888436 95.889392,95.889392 0 0 0 99.908581,191.77906 95.889392,95.889392 0 0 0 142.61366,181.70093 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 L 183.8285,142.24002 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 195.79921,95.888466 95.889392,95.889392 0 0 0 99.908581,-2.0831968e-4 Z"
-         style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    </clipPath>
-  </defs>
-  <metadata
-     id="metadata4216">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="shaddow"
-     transform="translate(-4,2.6816164)"
-     style="display:inline">
-    <path
-       inkscape:connector-curvature="0"
-       id="path6914"
-       d="M 104.88867,0.06226191 A 95.889392,95.889392 0 0 0 8.9999996,95.950936 95.889392,95.889392 0 0 0 104.88867,191.84156 95.889392,95.889392 0 0 0 147.59375,181.76343 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 l -11.34766,-46.16797 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 200.7793,95.950966 95.889392,95.889392 0 0 0 104.88867,0.06229191 Z"
-       style="display:inline;opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;filter:url(#filter5640)" />
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="bubble"
-     id="layer4"
-     inkscape:groupmode="layer"
-     transform="translate(-4,2.6816348)">
-    <path
-       style="display:inline;opacity:1;fill:#00a000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       d="M 104.88867,-1.9377566 A 95.889392,95.889392 0 0 0 8.9999996,93.950918 95.889392,95.889392 0 0 0 104.88867,189.84154 95.889392,95.889392 0 0 0 147.59375,179.76341 l 0.12695,0.0137 40.79297,15.83204 c 3.25479,1.26313 7.53628,3.04697 10.45508,0.27343 2.83326,-2.69222 2.16811,-5.42213 1.1875,-9.41211 L 188.80859,140.3025 a 95.889392,95.889392 0 0 1 -0.002,0.002 l 0,-0.008 0.002,0.006 A 95.889392,95.889392 0 0 0 200.7793,93.950948 95.889392,95.889392 0 0 0 104.88867,-1.9377266 Z"
-       id="circle6661"
-       inkscape:connector-curvature="0" />
-    <text
-       xml:space="preserve"
-       style="font-style:normal;font-weight:normal;font-size:125px;line-height:1000%;font-family:Sans;letter-spacing:-10.89000034px;word-spacing:5px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       x="85.862968"
-       y="-55.271603"
-       id="text6634"
-       sodipodi:linespacing="1000%"><tspan
-         sodipodi:role="line"
-         id="tspan6636"
-         x="85.862968"
-         y="-55.271603" /></text>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer8"
-     inkscape:label="dotted line"
-     style="display:inline"
-     transform="translate(-4,2.6816164)">
-    <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       clip-path="url(#clipPath6910)"
-       d="m 145.16406,11.183594 -5.13232,9.649402 c -0.77924,1.465076 -0.65974,2.41396 0.66876,3.18097 9.66686,5.488467 18.12303,12.874168 24.86104,21.711122 1.05534,1.616079 2.08054,1.713076 3.67763,0.571565 L 178.04883,40 C 169.45271,27.990203 158.19857,18.128379 145.16406,11.183594 Z"
-       id="path7364"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csccscc"
-       transform="translate(4.9999996,-1.9374999)" />
-    <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       clip-path="url(#clipPath6906)"
-       d="m 193.80469,75.615234 -9.62713,2.062751 c -2.66266,0.570512 -3.40763,1.172953 -2.90593,3.917433 0.85823,4.714633 1.30424,9.497137 1.33189,14.293254 -0.028,5.578758 -0.62194,11.137108 -1.77093,16.589918 -0.86591,3.23162 0.13682,3.77092 3.16149,4.58138 l 8.98639,2.30136 c 1.98177,-7.66828 3.00584,-15.55255 3.04883,-23.472658 -0.0187,-6.817681 -0.76446,-13.613926 -2.22461,-20.273438 z"
-       id="path7366"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csccccccc"
-       transform="translate(4.9999996,-1.9374999)" />
-    <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       clip-path="url(#clipPath6902)"
-       d="m 14.264281,102.76512 -10.2076406,0.87943 c 1.2093798,14.83154 5.8540346,29.17808 13.5664056,41.90429 l 8.544301,-5.23239 c 2.394983,-1.46665 1.895406,-3.37834 0.986202,-5.04513 -5.118253,-9.40257 -8.359018,-19.71635 -9.536202,-30.36553 0,-2.09418 -1.881577,-2.26744 -3.353066,-2.14067 z"
-       id="path7372"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccsccs"
-       transform="translate(4.9999996,-1.9374999)" />
-    <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       clip-path="url(#clipPath6898)"
-       d="m 51.504371,166.60235 -5.82273,8.50898 c 12.710503,8.71282 27.333669,14.23394 42.630859,16.0957 l 1.220329,-9.90843 c 0.355066,-2.88295 -1.085712,-3.52946 -3.332252,-3.90256 -10.402329,-1.73697 -20.373956,-5.45322 -29.373754,-10.94516 -1.647505,-1.06744 -3.639993,-2.30718 -5.322452,0.15147 z"
-       id="path7370"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sccsccs"
-       transform="translate(4.9999996,-1.9374999)" />
-    <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       clip-path="url(#clipPath6894)"
-       d="M 32.208984,27.683594 C 21.779177,38.079001 13.883707,50.736882 9.1347656,64.675781 L 19.33617,68.090365 c 1.658147,0.55501 2.832564,-0.120955 3.374272,-1.591979 3.777598,-10.021698 9.470788,-19.210103 16.759132,-27.052307 1.561136,-1.561136 1.567283,-2.960058 0.447507,-4.076606 z"
-       id="path7374"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccsccsc"
-       transform="translate(4.9999996,-1.9374999)" />
-    <path
-       style="opacity:1;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       clip-path="url(#clipPath6890)"
-       d="M 99.888672,-0.25 C 87.701045,-0.2239408 75.630114,2.1252837 64.322266,6.671875 l 3.530435,8.74898 c 1.063314,2.635062 1.616754,3.526314 4.973913,2.352259 8.692057,-3.031338 17.839027,-4.588849 27.062058,-4.599286 5.555828,0 6.486278,0.350026 6.780788,-3.4460223 l 0.74851,-9.64772758 C 104.9135,-0.12857239 102.40179,-0.23868346 99.888672,-0.25 Z"
-       id="path7376"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccsccscc"
-       transform="translate(4.9999996,-1.9374999)" />
-    <path
-       style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       clip-path="url(#clipPath6886)"
-       d="m 138.72416,168.48439 c -4.17634,2.25458 -8.55959,4.09055 -13.0504,5.63418 -1.00363,0.34498 -1.20742,1.18222 -0.8682,2.27372 l 3.44056,11.0706 c 4.92985,-1.53124 9.72799,-3.45808 14.34766,-5.76172 l 0.12695,0.0137 14.0293,5.44532 4.12174,-10.20577 c 0.7548,-1.86894 -0.0184,-2.7016 -1.59462,-3.31324 l -14.72114,-5.71251 c -1.86679,-0.7244 -3.68834,-0.60144 -5.83185,0.55572 z"
-       id="path5005"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssccccsssc"
-       transform="translate(4.9999996,-1.9374999)" />
-    <path
-       style="display:inline;fill:#80d080;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       clip-path="url(#clipPath6882)"
-       d="m 186.53125,152.80469 -10.6386,2.70888 c -0.78879,0.20085 -1.67397,1.02386 -1.35494,2.33801 l 9.75918,40.15428 c 8.56713,5.97538 15.30408,3.06731 11.01563,-9.47266 z"
-       id="path5071"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="cssccc"
-       transform="translate(4.9999996,-1.9374999)" />
-  </g>
-  <g
-     style="display:inline"
-     inkscape:label="dots"
-     id="layer2"
-     inkscape:groupmode="layer"
-     transform="translate(-4,2.6816348)">
-    <g
-       inkscape:export-ydpi="100"
-       inkscape:export-xdpi="100"
-       style="fill:#f5f5f5;fill-opacity:1"
-       transform="matrix(0.3835576,0,0,0.3835576,-248.17635,-138.86977)"
-       id="g5126">
-      <circle
-         r="27.299093"
-         style="opacity:1;fill:#f5f5f5;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         id="path3047-4"
-         cx="799.11273"
-         cy="609.86285" />
-      <circle
-         r="27.299093"
-         style="opacity:1;fill:#f5f5f5;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         id="path3047-1-2"
-         cx="918.91962"
-         cy="609.86285" />
-      <circle
-         r="27.299093"
-         style="opacity:1;fill:#f5f5f5;fill-opacity:1;fill-rule:evenodd;stroke:none"
-         id="path3047-1-8-6"
-         cx="1039.0352"
-         cy="609.86285" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="light"
-     style="display:inline"
-     transform="translate(-4,2.6816164)">
-    <path
-       style="display:inline;opacity:0.19211821;fill:url(#radialGradient3883);fill-opacity:1;stroke:none"
-       d="m 192.44891,47.715674 c -61.69765,0 -111.704333,49.103472 -111.704333,109.668976 0,12.77573 2.228815,25.0414 6.321575,36.4393 5.069139,0.70557 10.251828,1.06876 15.514978,1.06876 18.80489,0 30.91434,7.28449 47.46533,1.26909 l 54.00234,6.06606 c 5.24363,2.11897 11.63381,1.37954 10.27166,-4.11162 l -14.23663,-57.56735 c 9.15073,-16.06873 12.27539,-34.36633 12.27539,-53.240271 0,-13.72556 -2.63167,-26.842322 -7.42478,-38.909717 -4.09925,-0.447474 -8.2658,-0.683228 -12.48553,-0.683228 z"
-       id="path3878"
-       inkscape:connector-curvature="0"
-       clip-path="url(#clipPath5745)"
-       transform="translate(4.9800894,-1.9374999)"
-       sodipodi:nodetypes="sscsccccscs" />
-  </g>
-</svg>
--- a/art/ic_notifications_none_white80.svg
+++ b/art/ic_notifications_none_white80.svg
@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_notifications_none_white80.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1543"
-     inkscape:window-height="1093"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.9 2 2 2zm6-6v-5c0-3.07-1.63-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.64 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2zm-2 1H8v-6c0-2.48 1.51-4.5 4-4.5s4 2.02 4 4.5v6z"
-     id="path4"
-     style="fill:#ffffff;fill-opacity:1;opacity:0.8" />
-</svg>
--- a/art/ic_notifications_off_white80.svg
+++ b/art/ic_notifications_off_white80.svg
@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_notifications_off_white80.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1244"
-     inkscape:window-height="936"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M20 18.69L7.84 6.14 5.27 3.49 4 4.76l2.8 2.8v.01c-.52.99-.8 2.16-.8 3.42v5l-2 2v1h13.73l2 2L21 19.72l-1-1.03zM12 22c1.11 0 2-.89 2-2h-4c0 1.11.89 2 2 2zm6-7.32V11c0-3.08-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68c-.15.03-.29.08-.42.12-.1.03-.2.07-.3.11h-.01c-.01 0-.01 0-.02.01-.23.09-.46.2-.68.31 0 0-.01 0-.01.01L18 14.68z"
-     id="path4"
-     style="fill:#ffffff;fill-opacity:1;opacity:0.8" />
-</svg>
--- a/art/ic_notifications_paused_white80.svg
+++ b/art/ic_notifications_paused_white80.svg
@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_notifications_paused_white80.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1375"
-     inkscape:window-height="999"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.89 2 2 2zm6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.63 5.36 6 7.93 6 11v5l-2 2v1h16v-1l-2-2zm-3.5-6.2l-2.8 3.4h2.8V15h-5v-1.8l2.8-3.4H9.5V8h5v1.8z"
-     id="path4"
-     style="fill:#ffffff;fill-opacity:1;opacity:0.8" />
-</svg>
--- a/art/ic_notifications_white80.svg
+++ b/art/ic_notifications_white80.svg
@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg32"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_notifications_white80.svg">
-  <metadata
-     id="metadata40">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs38" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1471"
-     inkscape:window-height="985"
-     id="namedview36"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="12"
-     inkscape:cy="12"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg32" />
-  <path
-     d="M12 22c1.1 0 2-.9 2-2h-4c0 1.1.89 2 2 2zm6-6v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-.83-.67-1.5-1.5-1.5s-1.5.67-1.5 1.5v.68C7.63 5.36 6 7.92 6 11v5l-2 2v1h16v-1l-2-2z"
-     id="path34"
-     style="fill:#ffffff;fill-opacity:1;opacity:0.8" />
-</svg>
--- a/art/ic_send_cancel_offline_white.svg
+++ b/art/ic_send_cancel_offline_white.svg
@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_send_cancel_offline_white.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1080"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="-36.305085"
-     inkscape:cy="23.898305"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M24 4C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm10 27.17L31.17 34 24 26.83 16.83 34 14 31.17 21.17 24 14 16.83 16.83 14 24 21.17 31.17 14 34 16.83 26.83 24 34 31.17z"
-     id="path4"
-     style="fill:#ffffff;fill-opacity:0.627451" />
-</svg>
--- a/art/ic_send_location_offline_white.svg
+++ b/art/ic_send_location_offline_white.svg
@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_send_location_offline_white.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="956"
-     inkscape:window-height="1056"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="-36.305085"
-     inkscape:cy="23.898305"
-     inkscape:window-x="2880"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M24 4c-7.73 0-14 6.27-14 14 0 10.5 14 26 14 26s14-15.5 14-26c0-7.73-6.27-14-14-14zm0 19c-2.76 0-5-2.24-5-5s2.24-5 5-5 5 2.24 5 5-2.24 5-5 5z"
-     id="path4"
-     style="fill:#ffffff;fill-opacity:0.627451" />
-</svg>
--- a/art/ic_send_photo_offline_white.svg
+++ b/art/ic_send_photo_offline_white.svg
@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_send_photo_offline_white.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="956"
-     inkscape:window-height="567"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="10.5688"
-     inkscape:cy="23.898305"
-     inkscape:window-x="960"
-     inkscape:window-y="609"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <circle
-     cx="24"
-     cy="24"
-     r="6.4"
-     id="circle4"
-     style="fill:#ffffff;fill-opacity:0.627451" />
-  <path
-     d="M18 4l-3.66 4H8c-2.21 0-4 1.79-4 4v24c0 2.21 1.79 4 4 4h32c2.21 0 4-1.79 4-4V12c0-2.21-1.79-4-4-4h-6.34L30 4H18zm6 30c-5.52 0-10-4.48-10-10s4.48-10 10-10 10 4.48 10 10-4.48 10-10 10z"
-     id="path6"
-     style="fill:#ffffff;fill-opacity:0.627451" />
-</svg>
--- a/art/ic_send_picture_offline_white.svg
+++ b/art/ic_send_picture_offline_white.svg
@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_send_picture_offline_white.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="2560"
-     inkscape:window-height="1392"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="-21.864407"
-     inkscape:cy="23.898305"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M42 38V10c0-2.21-1.79-4-4-4H10c-2.21 0-4 1.79-4 4v28c0 2.21 1.79 4 4 4h28c2.21 0 4-1.79 4-4zM17 27l5 6.01L29 24l9 12H10l7-9z"
-     id="path4"
-     style="fill:#ffffff;fill-opacity:0.627451" />
-</svg>
--- a/art/ic_send_text_offline_white.svg
+++ b/art/ic_send_text_offline_white.svg
@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg3621"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="96"
-   height="96"
-   sodipodi:docname="ic_send_text_offline_white.svg"
-   inkscape:export-filename="/home/daniel/workspace/Conversations/res/drawable-xxhdpi/ic_action_send_now_online.png"
-   inkscape:export-xdpi="154.28572"
-   inkscape:export-ydpi="154.28572">
-  <metadata
-     id="metadata3627">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs3625" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1344"
-     inkscape:window-height="1056"
-     id="namedview3623"
-     showgrid="true"
-     showguides="true"
-     inkscape:zoom="8"
-     inkscape:cx="31.783303"
-     inkscape:cy="56.698828"
-     inkscape:window-x="2880"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3621"
-     inkscape:snap-others="false">
-    <inkscape:grid
-       type="xygrid"
-       id="grid3631" />
-  </sodipodi:namedview>
-  <path
-     style="fill:#ffffff;fill-opacity:0.627451;stroke:none"
-     d="M 3.887575,4.1549246 90.999747,47.676331 3.887575,91.286663 13.203552,52.344101 63.012683,47.720794 13.203552,43.008558 Z"
-     id="path3633"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccccc"
-     inkscape:export-filename="/home/daniel/workspace/Conversations/res/drawable-mdpi/ic_action_send_now_dnd.png"
-     inkscape:export-xdpi="51.42857"
-     inkscape:export-ydpi="51.42857" />
-</svg>
--- a/art/ic_send_voice_offline_white.svg
+++ b/art/ic_send_voice_offline_white.svg
@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_send_voice_offline_white.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1516"
-     inkscape:window-height="1056"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="-36.711864"
-     inkscape:cy="24"
-     inkscape:window-x="2880"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M24 30c3.31 0 5.98-2.69 5.98-6L30 12c0-3.32-2.68-6-6-6-3.31 0-6 2.68-6 6v12c0 3.31 2.69 6 6 6zm10.6-6c0 6-5.07 10.2-10.6 10.2-5.52 0-10.6-4.2-10.6-10.2H10c0 6.83 5.44 12.47 12 13.44V44h4v-6.56c6.56-.97 12-6.61 12-13.44h-3.4z"
-     id="path4"
-     style="fill:#ffffff;fill-opacity:0.627451" />
-</svg>
--- a/art/ic_verified_fingerprint.svg
+++ b/art/ic_verified_fingerprint.svg
@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="ic_verified_fingerprint.svg">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1916"
-     inkscape:window-height="1156"
-     id="namedview6"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="-3.3559322"
-     inkscape:cy="24"
-     inkscape:window-x="0"
-     inkscape:window-y="20"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M24 2L6 10v12c0 11.11 7.67 21.47 18 24 10.33-2.53 18-12.89 18-24V10L24 2zm-4 32l-8-8 2.83-2.83L20 28.34l13.17-13.17L36 18 20 34z"
-     id="path4"
-     style="fill:#259b24;fill-opacity:0.87" />
-</svg>
--- a/art/main_logo.svg
+++ b/art/main_logo.svg
@ -1 +0,0 @@
-ic_launcher.svg
--- a/art/md_switch_thumb_disable.svg
+++ b/art/md_switch_thumb_disable.svg
@ -1,156 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="md_switch_thumb_disable_centered_square.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="10.572032"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <g
-       id="g6404">
-      <circle
-         style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)"
-         id="circle4234"
-         cx="59.999996"
-         cy="66.499878"
-         r="26.444" />
-      <g
-         transform="translate(3.3103058e-6,0.33229253)"
-         id="g4148">
-        <circle
-           style="opacity:1;fill:#bdbdbd;fill-opacity:1;stroke:#bdbdbd;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path4218"
-           cx="59.999996"
-           cy="62.167587"
-           r="25.916904" />
-        <circle
-           r="25.916904"
-           cy="183.07845"
-           cx="-74.490921"
-           id="circle4220"
-           style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-           transform="matrix(0,-1,1,0,-123.07845,-12.323334)" />
-      </g>
-    </g>
-  </g>
-</svg>
--- a/art/md_switch_thumb_off_normal.svg
+++ b/art/md_switch_thumb_off_normal.svg
@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="md_switch_thumb_off_normal_centered.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="10.052965"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       r="26.444"
-       cy="66.5"
-       cx="59.999996"
-       id="circle4234"
-       style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)" />
-    <g
-       id="g6390"
-       transform="translate(3.3103058e-6,-0.91758577)">
-      <circle
-         r="25.916904"
-         cy="63.417587"
-         cx="59.999996"
-         id="path4218"
-         style="opacity:1;fill:#fafafa;fill-opacity:1;stroke:#fafafa;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         transform="matrix(0,-1,1,0,-123.07845,-11.073334)"
-         style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-         id="circle4220"
-         cx="-74.490921"
-         cy="183.07845"
-         r="25.916904" />
-    </g>
-  </g>
-</svg>
--- a/art/md_switch_thumb_off_pressed.svg
+++ b/art/md_switch_thumb_off_pressed.svg
@ -1,159 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="md_switch_thumb_off_pressed_centered.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="10.572032"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       style="opacity:1;fill:#313131;fill-opacity:0.10196078;fill-rule:nonzero;stroke:none;stroke-width:1.00100005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.10196078"
-       id="path4819"
-       cx="60"
-       cy="62.5"
-       r="60" />
-    <circle
-       r="26.444"
-       cy="66.5"
-       cx="59.999996"
-       id="circle4234"
-       style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)" />
-    <g
-       id="g6417"
-       transform="translate(3.3103058e-6,-0.91758577)">
-      <circle
-         r="25.916904"
-         cy="63.417587"
-         cx="59.999996"
-         id="path4218"
-         style="opacity:1;fill:#fafafa;fill-opacity:1;stroke:#fafafa;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         transform="matrix(0,-1,1,0,-123.07845,-11.073334)"
-         style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-         id="circle4220"
-         cx="-74.490921"
-         cy="183.07845"
-         r="25.916904" />
-    </g>
-  </g>
-</svg>
--- a/art/md_switch_thumb_on_normal.svg
+++ b/art/md_switch_thumb_on_normal.svg
@ -1,146 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="md_switch_thumb_on_normal_centered_square.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="-14.397519"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       r="26.444"
-       cy="66.499878"
-       cx="59.999996"
-       id="circle4234"
-       style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)" />
-    <g
-       id="g6440"
-       transform="translate(3.3103058e-6,0.33241423)">
-      <circle
-         r="25.916904"
-         cy="62.167587"
-         cx="59.999996"
-         id="path4218"
-         style="opacity:1;fill:#0091ea;fill-opacity:1;stroke:#0091ea;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-      <circle
-         transform="matrix(0,-1,1,0,-123.07845,-12.323334)"
-         style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-         id="circle4220"
-         cx="-74.490921"
-         cy="183.07845"
-         r="25.916904" />
-    </g>
-  </g>
-</svg>
--- a/art/md_switch_thumb_on_pressed.svg
+++ b/art/md_switch_thumb_on_pressed.svg
@ -1,162 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   sodipodi:docname="md_switch_thumb_on_pressed_centered_square.svg"
-   viewBox="0 0 120 120"
-   height="120"
-   width="120"
-   inkscape:version="0.91 r13725"
-   version="1.1"
-   id="svg2">
-  <metadata
-     id="metadata8">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs6">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4222">
-      <stop
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0"
-         id="stop4224" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="1"
-         id="stop4226" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4179"
-       osb:paint="gradient">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25454545"
-         offset="1"
-         id="stop4183" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4222"
-       id="linearGradient4228"
-       x1="159.38722"
-       y1="19.802504"
-       x2="212.27522"
-       y2="19.802504"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-260.32215,163.27594)" />
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4230"
-       x="-0.012"
-       width="1.024"
-       y="-0.012"
-       height="1.024">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.25916904"
-         id="feGaussianBlur4232" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       style="color-interpolation-filters:sRGB"
-       id="filter4371"
-       x="-0.23999999"
-       width="1.48"
-       y="-0.23999999"
-       height="1.48">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="5.2888"
-         id="feGaussianBlur4373" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     inkscape:current-layer="layer2"
-     inkscape:window-maximized="1"
-     inkscape:window-y="0"
-     inkscape:window-x="1400"
-     inkscape:cy="61.379767"
-     inkscape:cx="-46.31369"
-     inkscape:zoom="3.8530612"
-     showgrid="false"
-     id="namedview4"
-     inkscape:window-height="1024"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="PNG"
-     style="display:none"
-     sodipodi:insensitive="true"
-     transform="translate(0,-2.5)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="SVG"
-     style="display:inline"
-     transform="translate(0,-2.5)">
-    <circle
-       style="opacity:1;fill:#0093e8;fill-opacity:0.10196078;fill-rule:nonzero;stroke:none;stroke-width:1.00100005;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.10196078"
-       id="path4819"
-       cx="60"
-       cy="62.5"
-       r="60" />
-    <g
-       id="g4156">
-      <circle
-         style="opacity:1;fill:#000404;fill-opacity:0.45531915;stroke:none;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4371)"
-         id="circle4234"
-         cx="59.999996"
-         cy="66.5"
-         r="26.444" />
-      <g
-         transform="translate(3.3103058e-6,0.33241423)"
-         id="g4149">
-        <circle
-           style="opacity:1;fill:#0091ea;fill-opacity:1;stroke:#0091ea;stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-           id="path4218"
-           cx="59.999996"
-           cy="62.167587"
-           r="25.916904" />
-        <circle
-           r="25.916904"
-           cy="183.07845"
-           cx="-74.490921"
-           id="circle4220"
-           style="opacity:0.3;fill:none;fill-opacity:1;stroke:url(#linearGradient4228);stroke-width:1.05419147;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4230)"
-           transform="matrix(0,-1,1,0,-123.07845,-12.323334)" />
-      </g>
-    </g>
-  </g>
-</svg>
--- a/art/message_bubble_received.svg
+++ b/art/message_bubble_received.svg
@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="26"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="message_bubble_received.svg">
-  <defs
-     id="defs4">
-    <filter
-       x="-0.25"
-       y="-0.25"
-       width="1.5"
-       height="1.5"
-       inkscape:label="Drop Shadow"
-       id="filter3811"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         flood-opacity="0.25"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood3813" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite3815" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur3817" />
-      <feOffset
-         dx="0"
-         dy="1"
-         result="offset"
-         id="feOffset3819" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite3821" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="25.745257"
-     inkscape:cy="9.618802"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="989"
-     inkscape:window-height="755"
-     inkscape:window-x="22"
-     inkscape:window-y="16"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     guidecolor="#000000"
-     guideopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       originx="0px"
-       originy="0px"
-       color="#0000ff"
-       opacity="0.03137255" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="20,26"
-       id="guide3060" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="24,26"
-       id="guide3062" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,22"
-       id="guide3064" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,6"
-       id="guide3066" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="26,0"
-       id="guide3068" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="18,0"
-       id="guide3070" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,10"
-       id="guide3074" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,8"
-       id="guide3076" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer"
-     inkscape:groupmode="layer"
-     id="layer"
-     transform="translate(0,-2)">
-    <g
-       id="g3759"
-       style="fill:#4b9b4a;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
-      <path
-         style="display:none"
-         d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"
-         id="path3805"
-         inkscape:connector-curvature="0"
-         transform="translate(0,2)"
-         sodipodi:nodetypes="cccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path2989"
-         d="M 4,4 16,16 16,4 z"
-         sodipodi:nodetypes="cccc" />
-      <rect
-         ry="2"
-         y="4"
-         x="12"
-         height="20"
-         width="20"
-         id="rect2987" />
-    </g>
-  </g>
-</svg>
--- a/art/message_bubble_received_dark.svg
+++ b/art/message_bubble_received_dark.svg
@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="26"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="message_bubble_received.svg">
-  <defs
-     id="defs4">
-    <filter
-       x="-0.25"
-       y="-0.25"
-       width="1.5"
-       height="1.5"
-       inkscape:label="Drop Shadow"
-       id="filter3811"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         flood-opacity="0.25"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood3813" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite3815" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur3817" />
-      <feOffset
-         dx="0"
-         dy="1"
-         result="offset"
-         id="feOffset3819" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite3821" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="25.745257"
-     inkscape:cy="9.618802"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="989"
-     inkscape:window-height="755"
-     inkscape:window-x="22"
-     inkscape:window-y="16"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     guidecolor="#000000"
-     guideopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       originx="0px"
-       originy="0px"
-       color="#0000ff"
-       opacity="0.03137255" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="20,26"
-       id="guide3060" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="24,26"
-       id="guide3062" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,22"
-       id="guide3064" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,6"
-       id="guide3066" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="26,0"
-       id="guide3068" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="18,0"
-       id="guide3070" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,10"
-       id="guide3074" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,8"
-       id="guide3076" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer"
-     inkscape:groupmode="layer"
-     id="layer"
-     transform="translate(0,-2)">
-    <g
-       id="g3759"
-       style="fill:#326130;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
-      <path
-         style="display:none"
-         d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"
-         id="path3805"
-         inkscape:connector-curvature="0"
-         transform="translate(0,2)"
-         sodipodi:nodetypes="cccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path2989"
-         d="M 4,4 16,16 16,4 z"
-         sodipodi:nodetypes="cccc" />
-      <rect
-         ry="2"
-         y="4"
-         x="12"
-         height="20"
-         width="20"
-         id="rect2987" />
-    </g>
-  </g>
-</svg>
--- a/art/message_bubble_received_grey.svg
+++ b/art/message_bubble_received_grey.svg
@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="26"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="message_bubble_received_grey.svg">
-  <defs
-     id="defs4">
-    <filter
-       x="-0.25"
-       y="-0.25"
-       width="1.5"
-       height="1.5"
-       inkscape:label="Drop Shadow"
-       id="filter3811"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         flood-opacity="0.25"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood3813" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite3815" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur3817" />
-      <feOffset
-         dx="0"
-         dy="1"
-         result="offset"
-         id="feOffset3819" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite3821" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="-9.879743"
-     inkscape:cy="9.618802"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer"
-     showgrid="true"
-     inkscape:window-width="2135"
-     inkscape:window-height="911"
-     inkscape:window-x="22"
-     inkscape:window-y="16"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     guidecolor="#000000"
-     guideopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       originx="0px"
-       originy="0px"
-       color="#0000ff"
-       opacity="0.03137255" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="20,26"
-       id="guide3060" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="24,26"
-       id="guide3062" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,22"
-       id="guide3064" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,6"
-       id="guide3066" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="26,0"
-       id="guide3068" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="18,0"
-       id="guide3070" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,10"
-       id="guide3074" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,8"
-       id="guide3076" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer"
-     inkscape:groupmode="layer"
-     id="layer"
-     transform="translate(0,-2)">
-    <g
-       id="g3759"
-       style="fill:#424242;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
-      <path
-         style="display:none;fill:#424242;fill-opacity:1"
-         d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"
-         id="path3805"
-         inkscape:connector-curvature="0"
-         transform="translate(0,2)"
-         sodipodi:nodetypes="cccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path2989"
-         d="M 4,4 16,16 16,4 z"
-         sodipodi:nodetypes="cccc"
-         style="fill:#424242;fill-opacity:1" />
-      <rect
-         ry="2"
-         y="4"
-         x="12"
-         height="20"
-         width="20"
-         id="rect2987"
-         style="fill:#424242;fill-opacity:1" />
-    </g>
-  </g>
-</svg>
--- a/art/message_bubble_received_warning.svg
+++ b/art/message_bubble_received_warning.svg
@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="26"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="message_bubble_received.svg">
-  <defs
-     id="defs4">
-    <filter
-       x="-0.25"
-       y="-0.25"
-       width="1.5"
-       height="1.5"
-       inkscape:label="Drop Shadow"
-       id="filter3811"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         flood-opacity="0.25"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood3813" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite3815" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur3817" />
-      <feOffset
-         dx="0"
-         dy="1"
-         result="offset"
-         id="feOffset3819" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite3821" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="25.745257"
-     inkscape:cy="9.618802"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="989"
-     inkscape:window-height="755"
-     inkscape:window-x="22"
-     inkscape:window-y="16"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     guidecolor="#000000"
-     guideopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       originx="0px"
-       originy="0px"
-       color="#0000ff"
-       opacity="0.03137255" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="20,26"
-       id="guide3060" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="24,26"
-       id="guide3062" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,22"
-       id="guide3064" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,6"
-       id="guide3066" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="26,0"
-       id="guide3068" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="18,0"
-       id="guide3070" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,10"
-       id="guide3074" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,8"
-       id="guide3076" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer"
-     inkscape:groupmode="layer"
-     id="layer"
-     transform="translate(0,-2)">
-    <g
-       id="g3759"
-       style="fill:#c64545;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
-      <path
-         style="display:none"
-         d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"
-         id="path3805"
-         inkscape:connector-curvature="0"
-         transform="translate(0,2)"
-         sodipodi:nodetypes="cccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path2989"
-         d="M 4,4 16,16 16,4 z"
-         sodipodi:nodetypes="cccc" />
-      <rect
-         ry="2"
-         y="4"
-         x="12"
-         height="20"
-         width="20"
-         id="rect2987" />
-    </g>
-  </g>
-</svg>
--- a/art/message_bubble_received_white.svg
+++ b/art/message_bubble_received_white.svg
@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="26"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="message_bubble_received.svg">
-  <defs
-     id="defs4">
-    <filter
-       x="-0.25"
-       y="-0.25"
-       width="1.5"
-       height="1.5"
-       inkscape:label="Drop Shadow"
-       id="filter3811"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         flood-opacity="0.25"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood3813" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite3815" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur3817" />
-      <feOffset
-         dx="0"
-         dy="1"
-         result="offset"
-         id="feOffset3819" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite3821" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="25.745257"
-     inkscape:cy="9.618802"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="989"
-     inkscape:window-height="755"
-     inkscape:window-x="22"
-     inkscape:window-y="16"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     guidecolor="#000000"
-     guideopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       originx="0px"
-       originy="0px"
-       color="#0000ff"
-       opacity="0.03137255" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="20,26"
-       id="guide3060" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="24,26"
-       id="guide3062" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,22"
-       id="guide3064" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,6"
-       id="guide3066" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="26,0"
-       id="guide3068" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="18,0"
-       id="guide3070" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,10"
-       id="guide3074" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,8"
-       id="guide3076" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer"
-     inkscape:groupmode="layer"
-     id="layer"
-     transform="translate(0,-2)">
-    <g
-       id="g3759"
-       style="fill:#fafafa;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
-      <path
-         style="display:none"
-         d="m 8,6 c 2,2 4,6 4,10 L 16,6 z"
-         id="path3805"
-         inkscape:connector-curvature="0"
-         transform="translate(0,2)"
-         sodipodi:nodetypes="cccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path2989"
-         d="M 4,4 16,16 16,4 z"
-         sodipodi:nodetypes="cccc" />
-      <rect
-         ry="2"
-         y="4"
-         x="12"
-         height="20"
-         width="20"
-         id="rect2987" />
-    </g>
-  </g>
-</svg>
--- a/art/message_bubble_sent.svg
+++ b/art/message_bubble_sent.svg
@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="26"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.5 r10040"
-   sodipodi:docname="message_bubble_sent.svg">
-  <defs
-     id="defs4">
-    <filter
-       x="-0.25"
-       y="-0.25"
-       width="1.5"
-       height="1.5"
-       inkscape:label="Drop Shadow"
-       id="filter3811"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         flood-opacity="0.25"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood3813" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite3815" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur3817" />
-      <feOffset
-         dx="0"
-         dy="1"
-         result="offset"
-         id="feOffset3819" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite3821" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="14.269338"
-     inkscape:cy="16.118802"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:window-width="989"
-     inkscape:window-height="755"
-     inkscape:window-x="434"
-     inkscape:window-y="16"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     guidecolor="#404040"
-     guideopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       originx="0px"
-       originy="0px"
-       color="#0000ff"
-       opacity="0.03137255" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="12,26"
-       id="guide3146" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="16,26"
-       id="guide3148" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,22"
-       id="guide3150" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,6"
-       id="guide3152" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="18,0"
-       id="guide3154" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="10,0"
-       id="guide3160" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,20"
-       id="guide3162" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,18"
-       id="guide3164" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer"
-     inkscape:groupmode="layer"
-     id="layer"
-     transform="translate(0,-2)">
-    <g
-       id="g3759"
-       style="fill:#fafafa;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
-      <path
-         style="display:none"
-         d="M 28,18 C 26,16 24,12 24,8 l -4,10 z"
-         id="path3809"
-         inkscape:connector-curvature="0"
-         transform="translate(0,2)"
-         sodipodi:nodetypes="cccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path2989"
-         d="m 20,12 0,12 12,0 z"
-         sodipodi:nodetypes="cccc" />
-      <rect
-         ry="2"
-         y="4"
-         x="4"
-         height="20"
-         width="20"
-         id="rect2987" />
-    </g>
-  </g>
-</svg>
--- a/art/message_bubble_sent_grey.svg
+++ b/art/message_bubble_sent_grey.svg
@ -1,167 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="36"
-   height="26"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="message_bubble_sent_grey.svg">
-  <defs
-     id="defs4">
-    <filter
-       x="-0.25"
-       y="-0.25"
-       width="1.5"
-       height="1.5"
-       inkscape:label="Drop Shadow"
-       id="filter3811"
-       color-interpolation-filters="sRGB">
-      <feFlood
-         flood-opacity="0.25"
-         flood-color="rgb(0,0,0)"
-         result="flood"
-         id="feFlood3813" />
-      <feComposite
-         in="flood"
-         in2="SourceGraphic"
-         operator="in"
-         result="composite1"
-         id="feComposite3815" />
-      <feGaussianBlur
-         stdDeviation="0.5"
-         result="blur"
-         id="feGaussianBlur3817" />
-      <feOffset
-         dx="0"
-         dy="1"
-         result="offset"
-         id="feOffset3819" />
-      <feComposite
-         in="SourceGraphic"
-         in2="offset"
-         operator="over"
-         result="composite2"
-         id="feComposite3821" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="16"
-     inkscape:cx="6.244862"
-     inkscape:cy="16.118802"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer"
-     showgrid="true"
-     inkscape:window-width="1554"
-     inkscape:window-height="900"
-     inkscape:window-x="878"
-     inkscape:window-y="369"
-     inkscape:window-maximized="0"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     guidecolor="#404040"
-     guideopacity="0.49803922">
-    <inkscape:grid
-       type="xygrid"
-       id="grid2985"
-       empspacing="4"
-       visible="true"
-       enabled="true"
-       snapvisiblegridlinesonly="true"
-       spacingx="1px"
-       spacingy="1px"
-       originx="0px"
-       originy="0px"
-       color="#0000ff"
-       opacity="0.03137255" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="12,26"
-       id="guide3146" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="16,26"
-       id="guide3148" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,22"
-       id="guide3150" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="36,6"
-       id="guide3152" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="18,0"
-       id="guide3154" />
-    <sodipodi:guide
-       orientation="1,0"
-       position="10,0"
-       id="guide3160" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,20"
-       id="guide3162" />
-    <sodipodi:guide
-       orientation="0,1"
-       position="0,18"
-       id="guide3164" />
-  </sodipodi:namedview>
-  <metadata
-     id="metadata7">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer"
-     inkscape:groupmode="layer"
-     id="layer"
-     transform="translate(0,-2)">
-    <g
-       id="g3759"
-       style="fill:#424242;fill-opacity:1;stroke:none;fill-rule:nonzero;filter:url(#filter3811)">
-      <path
-         style="display:none;fill:#424242;fill-opacity:1"
-         d="M 28,18 C 26,16 24,12 24,8 l -4,10 z"
-         id="path3809"
-         inkscape:connector-curvature="0"
-         transform="translate(0,2)"
-         sodipodi:nodetypes="cccc" />
-      <path
-         inkscape:connector-curvature="0"
-         id="path2989"
-         d="m 20,12 0,12 12,0 z"
-         sodipodi:nodetypes="cccc"
-         style="fill:#424242;fill-opacity:1" />
-      <rect
-         ry="2"
-         y="4"
-         x="4"
-         height="20"
-         width="20"
-         id="rect2987"
-         style="fill:#424242;fill-opacity:1" />
-    </g>
-  </g>
-</svg>
--- a/art/omemo_logo.svg
+++ b/art/omemo_logo.svg
@ -1,273 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4196"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="2367.5596"
-   height="1451.5084"
-   viewBox="0 0 2367.5595 1451.5084"
-   sodipodi:docname="omemo_logo.svg">
-  <metadata
-     id="metadata4202">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs4200">
-    <linearGradient
-       id="linearGradient4245"
-       osb:paint="solid">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4247" />
-    </linearGradient>
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1600"
-     inkscape:window-height="836"
-     id="namedview4198"
-     showgrid="false"
-     inkscape:zoom="0.32"
-     inkscape:cx="1158.7782"
-     inkscape:cy="667.71025"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4196"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 1160.235,302.29735 271.9745,-131.35135 186.9826,134.44197 24.7249,151.44038 -86.5373,135.98729 z"
-     id="path4267"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 598.8809,1125.9476 -43.05491,131.8557 -21.52745,94.8553 4.0364,47.0913 67.27328,6.7273 80.72795,-58.5277 43.72764,-78.7098 7.40006,-55.1641 -21.52745,-71.9824 z"
-     id="path4259"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 709.52231,1171.4517 C 480.05218,1174.9052 321.72113,1008.3849 269.81593,895.97589 206.11648,758.02449 215.35674,596.92706 303.94612,450.17116 390.00741,320.24292 538.03872,188.34494 665.64434,170.1992 c 86.87989,-10.63238 215.40898,15.76659 250.11793,24.23821 35.046,8.55388 138.10213,41.16536 192.58973,67.91907 53.5186,26.27793 164.698,69.05834 309.1218,196.39025 100.3317,88.4579 183.2875,109.97875 279.7545,106.68109 52.9405,-1.80973 148.8273,-10.56706 171.5302,-24.72865 679.9746,-424.15329 639.4516,799.03733 13.1124,405.39142 -158.3183,-74.1014 -440.1478,10.5521 -637.0436,91.78671 -223.8429,92.3524 -350.01628,130.7858 -535.30499,133.5744 z"
-     id="path4225"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ssccssssscss"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 2121.4484,451.36293 c -26.791,-0.0103 -69.7877,2.87028 -101.1871,10.73905 -68.1167,46.199 -138.5457,83.35128 -167.446,144.67176 -12.1866,25.8575 -15.1986,221.06115 -3.3883,250.53885 22.0574,55.0538 36.5353,68.5186 75.8437,113.5484 490.8133,255.43581 586.5854,-519.34849 196.1777,-519.49806 z"
-     id="path4225-4"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093"
-     sodipodi:nodetypes="scsscs" />
-  <path
-     style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 1879.4205,872.05219 c -30.0884,-43.2017 -23.0447,-213.01732 -11.2518,-239.49258 19.553,-43.89704 110.0168,-119.19707 177.1545,-153.50421 62.2867,-31.14337 245.3285,107.06591 242.3844,259.61033 -2.4489,126.88796 -74.9751,256.91706 -216.1596,260.51446 -95.0727,-15.7629 -143.2721,-56.9801 -192.1275,-127.128 z"
-     id="path4313"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="sscscs"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 712.41248,50.975873 130.5787,23.17966 80.35619,97.354527 11.5898,38.63275 -335.33229,-24.72496 56.4038,-112.807627 z"
-     id="path4317"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 1414.8968,95.744433 c -119.2326,0.1221 -252.577,46.677797 -357.9883,141.492197 59.2267,85.339 179.6057,681.13776 68.8789,839.94337 91.9688,196.1395 767.4955,273.501 557.166,-210.17391 -15.7049,-36.1151 -49.7142,-108.75426 -41.832,-193.48626 8.4493,-90.8299 56.4409,-192.1808 64.2324,-223.9238 57.3257,-233.5482 -98.225,-354.048497 -290.457,-353.851597 z m -37.9434,48.607397 c 179.9257,-1.202 313.9232,108.10167 295.8852,273.14927 -49.0308,223.244 -65.6093,352.99519 9.7574,506.70029 0.9067,322.06951 -372.1528,246.99471 -531.1856,150.28521 136.0694,-390.78747 -67.0566,-814.79857 -78.5644,-831.62107 107.9381,-67.831 213.0862,-97.9056 304.1074,-98.5137 z"
-     id="path4227-8"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093"
-     sodipodi:nodetypes="sccsssssccccs" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 1371.9686,142.84932 c -91.0213,0.60808 -196.1693,30.68269 -304.1075,98.51367 11.5078,16.82249 214.6339,440.83547 78.5645,831.62311 159.0328,96.7094 532.0903,171.7842 531.1836,-150.28521 -75.3667,-153.7051 -47.9691,-295.82084 1.0617,-519.06483 19.5833,-183.59134 -126.7767,-261.98875 -306.7023,-260.78674 z m 42.0957,76.75039 c 158.8265,-0.80887 251.0755,161.9003 140.5517,325.36606 -113.709,-40.69316 -178.0341,-143.3305 -350.0787,-233.47358 73.9173,-58.593 149.3003,-91.58576 209.527,-91.89248 z"
-     id="path4229-6"
-     sodipodi:nodetypes="sccccssccs"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 1354.944,727.52278 -6.0809,177.36791 128.2608,-32.6939 7.361,-132.81901 c 65.526,-55.1437 -11.1658,-135.6742 -75.9144,-147.0284 -93.1144,-16.3282 -143.1451,90.3398 -53.6265,135.1734 z"
-     id="path4233"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ccccsc"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 598.8809,1127.2931 c -14.1274,92.1644 -82.99521,244.9415 -51.12771,263.7113 36.46239,21.4761 172.66811,-90.819 192.40161,-197.7835 18.83652,133.4254 -129.0419,247.1826 -195.76526,219.9837 -38.73013,-15.7879 4.93336,-176.7045 54.49136,-285.9115 z"
-     id="path4257"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cscsc"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 713.64035,1156.0811 23.95231,78.8109 72.62957,139.0779 118.98884,69.5389 -1.5453,-78.0381 -40.9507,-101.9905 -65.67567,-100.4452 -27.04293,-32.4515 z"
-     id="path4261"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 719.04894,1169.2163 c 9.27185,21.6343 50.66928,211.7208 189.30053,231.7965 30.3325,4.3925 -14.6805,-140.6232 -105.85379,-251.8855 102.24809,93.7488 161.32989,298.1418 122.07959,299.7901 C 810.58,1453.7045 732.44164,1267.601 719.04894,1169.2163 Z"
-     id="path4255"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cscsc"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 234.13659,657.90289 -48.22924,-33.49254 -68.9946,-29.47343 -68.324762,2.00956 -31.48299,135.97969 54.2579,195.59632 92.028162,42.154 87.08057,10.8767 79.91784,5.717 49.77454,-1.1406 z"
-     id="path4265"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093"
-     sodipodi:nodetypes="ccccccccccc" />
-  <path
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.81825721px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 362.2228,973.50299 c -87.01468,18.7244 -206.31388,2.7914 -260.29527,-66.2183 C 40.854878,829.20969 44.412488,641.34522 72.212698,611.40084 98.152348,583.46053 206.19233,642.42569 258.48372,672.39141 226.33414,633.9643 97.758248,551.92129 22.266478,615.19423 c -39.234376,32.88402 -22.2634293,269.25766 24.02476,303.47066 82.593032,61.047 269.567992,98.25131 315.931562,54.8381 z"
-     id="path4263"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="csscssc"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     inkscape:connector-curvature="0"
-     style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 705.09299,169.2159 c -15.02488,0.0627 -29.55297,0.81546 -43.06769,2.46948 -127.0389,18.06512 -274.41191,149.37803 -360.09102,278.72918 -88.19593,146.10416 -97.39583,306.48603 -33.97922,443.82493 51.67469,111.90981 209.30324,277.68941 437.75427,274.25121 103.34093,-1.5552 188.21293,-14.2523 282.05624,-41.2806 l 53.34803,-135.65461 7.6922,-153.845 -32.3069,-87.691 -68.46233,-87.69283 -22.3067,-99.22916 30.769,-200.76658 -28.3598,-161.94745 c -6.6814,-1.88509 -12.5089,-3.44563 -17.1054,-4.56753 -29.15558,-7.11615 -124.80661,-26.93763 -205.94068,-26.60004 z"
-     id="path4225-42-9"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 447.07437,279.1177 -67.22098,67.22099 -37.8601,46.3593 180.02862,4.63593 96.58187,45.58664 70.31161,81.90143 47.13196,130.5787 -4.63593,166.8935 -88.85533,154.531 -78.03816,55.63111 16.99841,16.2258 81.12878,2.318 72.62957,-32.4515 L 807.90426,918.10339 837.26515,722.62168 810.99488,518.64075 734.50204,415.87764 630.96627,335.52152 535.9297,298.43408 Z"
-     id="path4247"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="M 704.34544,1170.0033 C 474.87531,1173.4568 316.54426,1006.9366 264.63906,894.52759 200.93961,756.57613 210.17987,595.47873 298.76925,448.72283 384.83054,318.7946 532.86185,186.89663 660.46747,168.75089 c 86.87989,-10.63238 215.40898,15.76659 250.1179,24.23821 35.046,8.55388 138.10213,41.16536 192.58973,67.91907 53.5186,26.27792 164.698,69.05836 309.1218,196.39026 100.3317,88.4579 183.2875,109.9787 279.7545,106.6811 52.9405,-1.8098 148.8273,-10.5671 171.5302,-24.7287 679.9746,-424.15326 639.4516,799.03727 13.1124,405.39146 -158.3183,-74.1014 -440.1478,10.5521 -637.0436,91.78671 -223.8429,92.3524 -350.0163,130.7857 -535.30496,133.5743 z"
-     id="path4225-42"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ssccssssscss"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 600.77485,188.39742 c 45.59931,-168.111187 93.61702,-207.521997 165.6011,-175.903587 28.11465,12.34913 88.59168,36.45928 110.93127,66.5789 46.81515,63.119057 81.36115,162.974077 99.35615,284.156557 -8.7416,75.03201 -41.5452,164.02089 -27.3175,238.20842 17.5559,91.54126 116.68213,142.15421 125.66043,234.93028 9.4985,98.1511 -22.9467,217.44721 -86.32323,293.93611 36.78763,-80.4955 64.77883,-202.86651 55.72773,-281.91641 -15.7564,-137.61237 -102.80503,-141.89728 -115.82623,-244.76458 -9.3046,-73.506 20.1158,-155.47823 24.0394,-229.46683 3.7424,-70.5705 -32.2949,-195.09979 -74.30353,-233.83762 C 781.36459,50.911903 652.78479,43.071673 600.77485,188.39742 Z"
-     id="path4405"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="csscsscssssc"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#f57c00;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 978.84877,929.24739 143.14363,-41.5225 87.4159,-74.3036 5.4635,-186.85146 -73.2108,-30.5956 -65.562,22.9467 -77.58163,46.986 -87.416,87.416 z"
-     id="path4289"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 913.12497,751.04553 c 45.1649,-86.3232 245.53153,-195.3877 312.51203,-177.0172 29.651,8.1322 84.3992,143.4773 -29.5028,270.98936 -50.127,56.1165 -219.63263,88.5086 -219.63263,88.5086 l 2.1854,-6.5562 c 0,0 154.41873,-31.7084 192.31513,-91.7868 38.4759,-60.9969 52.9259,-177.98746 0,-216.35436 -79.3518,-57.5234 -257.87713,132.2166 -257.87713,132.2166 z"
-     id="path4287"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cssccssc"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-     d="m 330.40347,402.7425 c 114.35294,-10.55962 249.75787,-2.93669 319.87917,81.90143 79.96514,96.74795 96.08396,242.01494 62.58506,351.55806 -23.16188,75.7405 -98.38474,154.531 -163.80286,199.34501 60.19701,36.3696 76.03151,31.5859 158.39427,3.8632 C 761.64992,1021.17 829.49446,914.53909 837.26515,833.88399 848.77388,714.43039 855.97093,574.91586 790.90585,472.28145 719.85004,360.19719 579.71348,287.1018 454.02827,276.79974 l -13.13513,9.27185 c 166.63592,15.4531 280.2303,99.1189 342.28616,214.02545 65.19894,120.72647 36.96723,291.05045 30.9062,330.69635 -11.59484,75.8433 -39.28607,162.0595 -121.30683,197.02701 -32.03238,13.6562 -80.61368,27.043 -116.67091,8.4993 C 636.37485,988.41499 708.98856,931.86239 729.09345,855.51829 762.38235,729.11061 744.53737,534.45916 642.55609,446.01118 573.9429,386.50322 397.62445,372.60895 347.40188,381.10816 Z"
-     id="path4245"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="csscsssccssscsscc"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-     id="path4249"
-     sodipodi:type="arc"
-     sodipodi:cx="592.71979"
-     sodipodi:cy="560.36414"
-     sodipodi:rx="41.337044"
-     sodipodi:ry="48.677265"
-     sodipodi:start="0"
-     sodipodi:end="6.2714218"
-     sodipodi:open="true"
-     d="m 634.05683,560.36414 a 41.337044,48.677265 0 0 1 -41.21548,48.67705 41.337044,48.677265 0 0 1 -41.45789,-48.39075 41.337044,48.677265 0 0 1 40.97163,-48.96167 41.337044,48.677265 0 0 1 41.69888,48.10276"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:15;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 329.82495,822.87809 c 50.9573,98.8977 80.17049,31.9344 81.80769,19.0432 2.98204,-23.4803 -26.03926,-8.0283 -44.87764,-12.8177 -24.76611,-6.2965 -49.64587,-30.9043 -36.93005,-6.2255 z"
-     id="path4253"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="ssss"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 349.24366,1015.5476 c 24.85373,22.5357 29.23211,28.8458 48.29094,41.7233 13.9627,-4.7761 21.9738,-0.484 43.60813,-17.9975 -43.655,-2.9618 -58.6749,-15.7418 -91.89907,-23.7258 z"
-     id="path4339"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="cccc"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#000000;fill-opacity:0.11764706;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 1840.2193,917.45789 c -144.4722,-64.5024 -401.6544,9.1852 -581.3301,79.8965 C 1054.6229,1077.7432 939.48447,1111.1985 770.40085,1113.6259 560.99961,1116.632 416.51658,971.68219 369.15085,873.83489 311.02239,753.75418 319.45382,613.52678 400.29538,485.78208 478.83,372.68518 613.91429,257.87398 730.35984,242.07898 c 12.38775,-1.4461 25.70459,-2.1055 39.47656,-2.1601 74.36866,-0.2952 162.04327,17.0358 188.76757,23.2578 31.981,7.4458 126.02373,35.8332 175.74613,59.1211 48.8379,22.8738 150.2931,60.1123 282.0859,170.9492 91.5569,76.9988 167.2589,95.7317 255.2891,92.8613 48.3104,-1.5753 135.8099,-9.1984 156.5274,-21.5254 l 39.4824,-26.4785 c -22.7029,14.1616 -118.5888,22.9187 -171.5293,24.7285 -96.467,3.2976 -179.4222,-18.2237 -279.7539,-106.6816 -144.4238,-127.3319 -255.6045,-170.1108 -309.1231,-196.3887 -54.4876,-26.7537 -157.54383,-59.3661 -192.58983,-67.9199 -29.28571,-7.148 -125.36331,-27.0578 -206.8594,-26.7188 -15.09187,0.063 -29.68283,0.8192 -43.25782,2.4805 -127.60562,18.1458 -275.63793,150.0445 -361.69921,279.9727 -88.58938,146.7559 -97.82836,307.8532 -34.12891,445.80461 51.9052,112.40901 210.23495,278.92821 439.70508,275.47471 185.28865,-2.7886 311.46379,-41.2219 535.30669,-133.5743 196.8958,-81.23461 478.7247,-165.88851 637.043,-91.78711 z"
-     id="path4225-42-3"
-     inkscape:connector-curvature="0"
-     sodipodi:nodetypes="csssccsssssccsssssccssscc"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-  <path
-     style="fill:#000000;fill-opacity:0.11764706;fill-rule:evenodd;stroke:none;stroke-width:10;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-     d="m 707.63885,164.4148 c -15.0918,0.063 -29.6848,0.8211 -43.2597,2.4824 -127.6056,18.1458 -275.6361,150.0425 -361.6973,279.9707 -88.5894,146.7559 -97.8304,307.8533 -34.1309,445.80469 51.9052,112.40901 210.237,278.93011 439.7071,275.47661 185.2887,-2.7886 311.46185,-41.2218 535.30475,-133.5742 195.3026,-80.57741 474.1694,-164.51701 633.1757,-93.55281 -7.0564,-4.019 -14.1914,-8.2481 -21.4101,-12.7011 -151.9427,-69.8031 -422.4225,9.9405 -611.3887,86.46281 -214.8282,86.9953 -335.92133,123.1994 -513.74805,125.8262 -220.2288,3.2531 -372.1832,-153.60771 -421.9981,-259.49611 -61.1341,-129.94919 -52.2658,-281.70249 32.7559,-419.94529 82.5954,-122.3913 224.6641,-246.6373 347.1308,-263.7305 83.381,-10.0156 206.734,14.8519 240.04502,22.8321 33.6347,8.0576 132.54073,38.7767 184.83393,63.9785 51.3632,24.7535 158.0664,65.0525 296.6738,184.998 96.2911,83.3266 175.9061,103.5985 268.4883,100.4922 50.8085,-1.7048 142.8325,-9.9528 164.6211,-23.2929 0.3844,-0.2354 0.7646,-0.4611 1.1485,-0.6954 -38.3016,9.244 -106.3509,14.9537 -147.9278,16.375 -96.467,3.2976 -179.4222,-18.2237 -279.7539,-106.6816 C 1271.7855,328.1122 1160.6067,285.3314 1107.0881,259.0535 1052.6005,232.2998 949.54427,199.6894 914.49827,191.1355 885.21265,183.9876 789.13495,164.0757 707.63885,164.4148 Z"
-     id="path4421"
-     inkscape:connector-curvature="0"
-     inkscape:export-xdpi="15.191093"
-     inkscape:export-ydpi="15.191093" />
-</svg>
--- a/art/play_gif.svg
+++ b/art/play_gif.svg
@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="24"
-   height="24"
-   viewBox="0 0 24 24"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="play_gif.svg">
-  <metadata
-     id="metadata14">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1200"
-     id="namedview12"
-     showgrid="false"
-     inkscape:zoom="9.8333333"
-     inkscape:cx="1.5762712"
-     inkscape:cy="11.084746"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <defs
-     id="defs4">
-    <path
-       id="a"
-       d="M24 24H0V0h24v24z" />
-  </defs>
-  <clipPath
-     id="b">
-    <use
-       xlink:href="#a"
-       overflow="visible"
-       id="use8" />
-  </clipPath>
-  <path
-     d="M11.5 9H13v6h-1.5zM9 9H6c-.6 0-1 .5-1 1v4c0 .5.4 1 1 1h3c.6 0 1-.5 1-1v-2H8.5v1.5h-2v-3H10V10c0-.5-.4-1-1-1zm10 1.5V9h-4.5v6H16v-2h2v-1.5h-2v-1z"
-     clip-path="url(#b)"
-     id="path10"
-     style="fill:#ffffff;fill-opacity:0.7019608" />
-</svg>
--- a/art/play_video.svg
+++ b/art/play_video.svg
@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="48"
-   height="48"
-   viewBox="0 0 48 48"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="play_video.svg">
-  <metadata
-     id="metadata12">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs10" />
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1916"
-     inkscape:window-height="1156"
-     id="namedview8"
-     showgrid="false"
-     inkscape:zoom="4.9166667"
-     inkscape:cx="0.91525424"
-     inkscape:cy="24"
-     inkscape:window-x="0"
-     inkscape:window-y="20"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg2" />
-  <path
-     d="M0 0h48v48H0z"
-     fill="none"
-     id="path4" />
-  <path
-     d="M20 33l12-9-12-9v18zm4-29C12.95 4 4 12.95 4 24s8.95 20 20 20 20-8.95 20-20S35.05 4 24 4zm0 36c-8.82 0-16-7.18-16-16S15.18 8 24 8s16 7.18 16 16-7.18 16-16 16z"
-     id="path6"
-     style="fill:#ffffff;fill-opacity:0.7019608;opacity:1;stroke:none;stroke-opacity:0.38039216" />
-</svg>
--- a/art/render.rb
+++ b/art/render.rb
@ -1,146 +1,46 @@
 #!/bin/env ruby
-
-require 'xml'
-
-resolutions = {
-	'mdpi' => 1,
+resolutions={
+	'mdpi'=> 1,
 	'hdpi' => 1.5,
 	'xhdpi' => 2,
 	'xxhdpi' => 3,
 	'xxxhdpi' => 4,
 	}
-
 images = {
-	'ic_launcher.svg' => ['ic_launcher', 48],
-	'main_logo.svg' => ['main_logo', 200],
-	'play_video.svg' => ['play_video', 128],
-	'play_gif.svg' => ['play_gif', 128],
+	'conversations_baloon.svg' => ['ic_launcher', 48],
 	'conversations_mono.svg' => ['ic_notification', 24],
 	'ic_received_indicator.svg' => ['ic_received_indicator', 12],
 	'ic_send_text_offline.svg' => ['ic_send_text_offline', 36],
-	'ic_send_text_offline_white.svg' => ['ic_send_text_offline_white', 36],
 	'ic_send_text_online.svg' => ['ic_send_text_online', 36],
 	'ic_send_text_away.svg' => ['ic_send_text_away', 36],
 	'ic_send_text_dnd.svg' => ['ic_send_text_dnd', 36],
-	'ic_send_photo_online.svg' => ['ic_send_photo_online', 36],
-	'ic_send_photo_offline.svg' => ['ic_send_photo_offline', 36],
-	'ic_send_photo_offline_white.svg' => ['ic_send_photo_offline_white', 36],
-	'ic_send_photo_away.svg' => ['ic_send_photo_away', 36],
-	'ic_send_photo_dnd.svg' => ['ic_send_photo_dnd', 36],
+        'ic_send_photo_online.svg' => ['ic_send_photo_online', 36],
+        'ic_send_photo_offline.svg' => ['ic_send_photo_offline', 36],
+        'ic_send_photo_away.svg' => ['ic_send_photo_away', 36],
+        'ic_send_photo_dnd.svg' => ['ic_send_photo_dnd', 36],
 	'ic_send_location_online.svg' => ['ic_send_location_online', 36],
-	'ic_send_location_offline.svg' => ['ic_send_location_offline', 36],
-	'ic_send_location_offline_white.svg' => ['ic_send_location_offline_white', 36],
-	'ic_send_location_away.svg' => ['ic_send_location_away', 36],
-	'ic_send_location_dnd.svg' => ['ic_send_location_dnd', 36],
+        'ic_send_location_offline.svg' => ['ic_send_location_offline', 36],
+        'ic_send_location_away.svg' => ['ic_send_location_away', 36],
+        'ic_send_location_dnd.svg' => ['ic_send_location_dnd', 36],
 	'ic_send_voice_online.svg' => ['ic_send_voice_online', 36],
-	'ic_send_voice_offline.svg' => ['ic_send_voice_offline', 36],
-	'ic_send_voice_offline_white.svg' => ['ic_send_voice_offline_white', 36],
-	'ic_send_voice_away.svg' => ['ic_send_voice_away', 36],
-	'ic_send_voice_dnd.svg' => ['ic_send_voice_dnd', 36],
+        'ic_send_voice_offline.svg' => ['ic_send_voice_offline', 36],
+        'ic_send_voice_away.svg' => ['ic_send_voice_away', 36],
+        'ic_send_voice_dnd.svg' => ['ic_send_voice_dnd', 36],
 	'ic_send_cancel_online.svg' => ['ic_send_cancel_online', 36],
-	'ic_send_cancel_offline.svg' => ['ic_send_cancel_offline', 36],
-	'ic_send_cancel_offline_white.svg' => ['ic_send_cancel_offline_white', 36],
-	'ic_send_cancel_away.svg' => ['ic_send_cancel_away', 36],
-	'ic_send_cancel_dnd.svg' => ['ic_send_cancel_dnd', 36],
-	'ic_send_picture_online.svg' => ['ic_send_picture_online', 36],
-	'ic_send_picture_offline.svg' => ['ic_send_picture_offline', 36],
-	'ic_send_picture_offline_white.svg' => ['ic_send_picture_offline_white', 36],
-	'ic_send_picture_away.svg' => ['ic_send_picture_away', 36],
-	'ic_send_picture_dnd.svg' => ['ic_send_picture_dnd', 36],
-	'ic_notifications_none_white80.svg' => ['ic_notifications_none_white80', 24],
-	'ic_notifications_off_white80.svg' => ['ic_notifications_off_white80', 24],
-	'ic_notifications_paused_white80.svg' => ['ic_notifications_paused_white80', 24],
-	'ic_notifications_white80.svg' => ['ic_notifications_white80', 24],
-	'ic_verified_fingerprint.svg' => ['ic_verified_fingerprint', 36],
-	'md_switch_thumb_disable.svg' => ['switch_thumb_disable', 48],
-	'md_switch_thumb_off_normal.svg' => ['switch_thumb_off_normal', 48],
-	'md_switch_thumb_off_pressed.svg' => ['switch_thumb_off_pressed', 48],
-	'md_switch_thumb_on_normal.svg' => ['switch_thumb_on_normal', 48],
-	'md_switch_thumb_on_pressed.svg' => ['switch_thumb_on_pressed', 48],
-	'message_bubble_received.svg' => ['message_bubble_received.9', 0],
-	'message_bubble_received_grey.svg' => ['message_bubble_received_grey.9', 0],
-	'message_bubble_received_dark.svg' => ['message_bubble_received_dark.9', 0],
-	'message_bubble_received_warning.svg' => ['message_bubble_received_warning.9', 0],
-	'message_bubble_received_white.svg' => ['message_bubble_received_white.9', 0],
-	'message_bubble_sent.svg' => ['message_bubble_sent.9', 0],
-	'message_bubble_sent_grey.svg' => ['message_bubble_sent_grey.9', 0],
+        'ic_send_cancel_offline.svg' => ['ic_send_cancel_offline', 36],
+        'ic_send_cancel_away.svg' => ['ic_send_cancel_away', 36],
+        'ic_send_cancel_dnd.svg' => ['ic_send_cancel_dnd', 36],
+        'ic_send_picture_online.svg' => ['ic_send_picture_online', 36],
+        'ic_send_picture_offline.svg' => ['ic_send_picture_offline', 36],
+        'ic_send_picture_away.svg' => ['ic_send_picture_away', 36],
+        'ic_send_picture_dnd.svg' => ['ic_send_picture_dnd', 36]
 	}
-
-# Executable paths for Mac OSX
-# "/Applications/Inkscape.app/Contents/Resources/bin/inkscape"
-
-inkscape = "inkscape"
-imagemagick = "convert"
-
-def execute_cmd(cmd)
-	puts cmd
-	system cmd
-end
-
-images.each do |source_filename, settings|
-	svg_content = File.read(source_filename)
-
-	svg = XML::Document.string(svg_content)
-	base_width = svg.root["width"].to_i
-	base_height = svg.root["height"].to_i
-
-	guides = svg.find(".//sodipodi:guide")
-
-	resolutions.each do |resolution, factor|
-		output_filename, base_size = settings
-
-		if base_size > 0
-			width = factor * base_size
-			height = factor * base_size
-		else
-			width = factor * base_width
-			height = factor * base_height
-		end
-
-		path = "../src/main/res/drawable-#{resolution}/#{output_filename}.png"
-		execute_cmd "#{inkscape} -f #{source_filename} -z -C -w #{width} -h #{height} -e #{path}"
-
-		top = []
-		right = []
-		bottom = []
-		left = []
-
-		guides.each do |guide|
-			orientation = guide["orientation"]
-			x, y = guide["position"].split(",")
-			x, y = x.to_i, y.to_i
-
-			if orientation == "1,0" and y == base_height
-				top.push(x * factor)
-			end
-
-			if orientation == "0,1" and x == base_width
-				right.push((base_height - y) * factor)
-			end
-
-			if orientation == "1,0" and y == 0
-				bottom.push(x * factor)
-			end
-
-			if orientation == "0,1" and x == 0
-				left.push((base_height - y) * factor)
-			end
-		end
-
-		next if top.length != 2
-		next if right.length != 2
-		next if bottom.length != 2
-		next if left.length != 2
-
-		execute_cmd "#{imagemagick} -background none PNG32:#{path} -gravity center -extent #{width+2}x#{height+2} PNG32:#{path}"
-
-		draw_format = "-draw \"rectangle %d,%d %d,%d\""
-		top_line = draw_format % [top.min + 1, 0, top.max, 0]
-		right_line = draw_format % [width + 1, right.min + 1, width + 1, right.max]
-		bottom_line = draw_format % [bottom.min + 1, height + 1, bottom.max, height + 1]
-		left_line = draw_format % [0, left.min + 1, 0, left.max]
-		draws = "#{top_line} #{right_line} #{bottom_line} #{left_line}"
-
-		execute_cmd "#{imagemagick} -background none PNG32:#{path} -fill black -stroke none #{draws} PNG32:#{path}"
+images.each do |source, result|
+	resolutions.each do |name, factor|
+		size = factor * result[1]
+		path = "../src/main/res/drawable-#{name}/#{result[0]}.png"
+		cmd = "inkscape -e #{path} -C -h #{size} -w #{size} #{source}"
+		puts cmd
+		system cmd
 	end
 end
--- a/build.gradle
+++ b/build.gradle
@ -1,118 +1,114 @@
 // Top-level build file where you can add configuration options common to all
 // sub-projects/modules.
 buildscript {
-    repositories {
-        jcenter()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.0.0'
-    }
+	repositories {
+		jcenter()
+		mavenCentral()
+	}
+	dependencies {
+		classpath 'com.android.tools.build:gradle:1.2.3'
+	}
+}
+
+allprojects {
+	repositories {
+		jcenter()
+		mavenCentral()
+	}
 }

 apply plugin: 'com.android.application'

 repositories {
-    jcenter()
-    mavenCentral()
-}
-
-configurations {
-    playstoreCompile
+	jcenter()
+	mavenCentral()
 }

 dependencies {
+    compile project(':libs:openpgp-api-lib')
    compile project(':libs:MemorizingTrustManager')
-    playstoreCompile 'com.google.android.gms:play-services-gcm:10.0.1'
-    compile 'org.sufficientlysecure:openpgp-api:10.0'
-    compile 'com.soundcloud.android:android-crop:1.0.1@aar'
-    compile 'com.android.support:support-v13:25.1.0'
-    compile 'org.bouncycastle:bcprov-jdk15on:1.52'
-    compile 'org.bouncycastle:bcmail-jdk15on:1.52'
+    compile 'com.android.support:support-v13:21.0.3'
+    compile 'org.bouncycastle:bcprov-jdk15on:1.51'
    compile 'org.jitsi:org.otr4j:0.22'
    compile 'org.gnu.inet:libidn:1.15'
-    compile 'com.google.zxing:core:3.2.1'
-    compile 'com.google.zxing:android-integration:3.2.1'
-    compile 'de.measite.minidns:minidns:0.1.7'
-    compile 'de.timroes.android:EnhancedListView:0.3.4'
-    compile 'me.leolin:ShortcutBadger:1.1.11@aar'
-    compile 'com.kyleduo.switchbutton:library:1.2.8'
-    compile 'org.whispersystems:axolotl-android:1.3.4'
-    compile 'com.makeramen:roundedimageview:2.2.0'
-    compile "com.wefika:flowlayout:0.4.1"
-    compile 'net.ypresto.androidtranscoder:android-transcoder:0.2.0'
-}
-
-ext {
-    travisBuild = System.getenv("TRAVIS") == "true"
-    // allows for -Dpre-dex=false to be set
-    preDexEnabled = "true".equals(System.getProperty("pre-dex", "true"))
+    compile 'com.google.zxing:core:3.1.0'
+    compile 'com.google.zxing:android-integration:3.1.0'
+    compile 'de.measite.minidns:minidns:0.1.3'
+	compile 'de.timroes.android:EnhancedListView:0.3.4'
+	compile 'me.leolin:ShortcutBadger:1.1.1@aar'
+    compile project(':libs:emojicon')
+    compile project(':libs:colorpicker')
 }

 android {
-    compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+	compileSdkVersion 22
+	buildToolsVersion "22.0.1"

-    defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 25
-        versionCode 193
-        versionName "1.15.5"
-        archivesBaseName += "-$versionName"
-        applicationId "eu.siacs.conversations"
-    }
+	defaultConfig {
+		minSdkVersion 14
+		targetSdkVersion 21
+		versionCode 64
+		versionName "1.5.2.1"
+	}

-    dexOptions {
-        // Skip pre-dexing when running on Travis CI or when disabled via -Dpre-dex=false.
-        preDexLibraries = preDexEnabled && !travisBuild
-    }
+	compileOptions {
+		sourceCompatibility JavaVersion.VERSION_1_7
+		targetCompatibility JavaVersion.VERSION_1_7
+	}

-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
-    }
+	//
+	// To sign release builds, create the file `gradle.properties` in
+	// $HOME/.gradle or in your project directory with this content:
+	//
+	// mStoreFile=/path/to/key.store
+	// mStorePassword=xxx
+	// mKeyAlias=alias
+	// mKeyPassword=xxx
+	//
+	if (project.hasProperty('mStoreFile') &&
+			project.hasProperty('mStorePassword') &&
+			project.hasProperty('mKeyAlias') &&
+			project.hasProperty('mKeyPassword')) {
+		signingConfigs {
+			release {
+				storeFile file(mStoreFile)
+					storePassword mStorePassword
+					keyAlias mKeyAlias
+					keyPassword mKeyPassword
+			}
+		}
+		buildTypes.release.signingConfig = signingConfigs.release
+	} else {
+		buildTypes.release.signingConfig = null
+	}

-    productFlavors {
-        playstore
-        free
-    }
-    if (project.hasProperty('mStoreFile') &&
-            project.hasProperty('mStorePassword') &&
-            project.hasProperty('mKeyAlias') &&
-            project.hasProperty('mKeyPassword')) {
-        signingConfigs {
-            release {
-                storeFile file(mStoreFile)
-                storePassword mStorePassword
-                keyAlias mKeyAlias
-                keyPassword mKeyPassword
-            }
-        }
-        buildTypes.release.signingConfig = signingConfigs.release
-    } else {
-        buildTypes.release.signingConfig = null
-    }
+	applicationVariants.all { variant ->
+		if (variant.name.equals('release')) {
+			variant.outputs.each { output ->
+				if (output.zipAlign != null) {
+					output.zipAlign.outputFile = new File(output.outputFile.parent, rootProject.name + "-${variant.versionName}.apk")
+				}
+				output.packageApplication.outputFile = new File(output.outputFile.parent, output.packageApplication.outputFile.name
+					.replace(".apk", "-${variant.versionName}.apk"))
+			}
+		}
+	}

-    lintOptions {
-        disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity', 'AppCompatResource'
-    }
+	lintOptions {
+		disable 'ExtraTranslation', 'MissingTranslation', 'InvalidPackage', 'MissingQuantity'
+	}

-    subprojects {
+	subprojects {

-        afterEvaluate {
-            if (getPlugins().hasPlugin('android') ||
-                    getPlugins().hasPlugin('android-library')) {
+		afterEvaluate {
+			if (getPlugins().hasPlugin('android') ||
+					getPlugins().hasPlugin('android-library')) {

-                configure(android.lintOptions) {
-                    disable 'AndroidGradlePluginVersion', 'MissingTranslation'
-                }
-            }
+				configure(android.lintOptions) {
+					disable 'AndroidGradlePluginVersion', 'MissingTranslation'
+				}
+			}

-        }
-    }
-
-    packagingOptions {
-        exclude 'META-INF/BCKEY.DSA'
-        exclude 'META-INF/BCKEY.SF'
-    }
+		}
+	}
 }
--- a/docs/XEPs.md
+++ b/docs/XEPs.md
@ -2,17 +2,13 @@
 * XEP-0030: Service Discovery
 * XEP-0045: Multi-User Chat
 * XEP-0048: Bookmarks
-* XEP-0084: User Avatar
 * XEP-0085: Chat State Notifications
 * XEP-0092: Software Version
 * XEP-0115: Entity Capabilities
 * XEP-0163: Personal Eventing Protocol (avatars and nicks)
 * XEP-0166: Jingle (only used for file transfer)
-* XEP-0172: User Nickname
 * XEP-0184: Message Delivery Receipts (reply only)
-* XEP-0191: Blocking command
 * XEP-0198: Stream Management
-* XEP-0199: XMPP Ping
 * XEP-0234: Jingle File Transfer
 * XEP-0237: Roster Versioning
 * XEP-0245: The /me Command
@ -20,13 +16,7 @@
 * XEP-0260: Jingle SOCKS5 Bytestreams Transport Method
 * XEP-0261: Jingle In-Band Bytestreams Transport Method
 * XEP-0280: Message Carbons
-* XEP-0308: Last Message Correction
 * XEP-0313: Message Archive Management
-* XEP-0319: Last User Interaction in Presence
 * XEP-0333: Chat Markers
 * XEP-0352: Client State Indication
-* XEP-0357: Push Notifications
-* XEP-0363: HTTP File Upload
-* XEP-0368: SRV records for XMPP over TLS
-* XEP-0377: Spam Reporting 
-* XEP-0384: OMEMO Encryption
+* XEP-0191: Blocking command
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@ -1,6 +1,6 @@
-#Sat Apr 09 13:15:52 CEST 2016
+#Sat Nov 22 17:47:57 CET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.2.1-all.zip
--- a/libs/MemorizingTrustManager/build.gradle
+++ b/libs/MemorizingTrustManager/build.gradle
@ -3,18 +3,18 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.android.tools.build:gradle:2.0.0'
+		classpath 'com.android.tools.build:gradle:1.2.3'
 	}
 }

-apply plugin: 'com.android.library'
+apply plugin: 'android-library'

 android {
-	compileSdkVersion 25
-	buildToolsVersion "25.0.2"
+	compileSdkVersion 19
+	buildToolsVersion "19.1"
 	defaultConfig {
-		minSdkVersion 14
-		targetSdkVersion 25
+        	minSdkVersion 7
+		targetSdkVersion 19
 	}

 	sourceSets {
--- a/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingTrustManager.java
+++ b/libs/MemorizingTrustManager/src/de/duenndns/ssl/MemorizingTrustManager.java
@ -35,33 +35,15 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.SystemClock;
-import android.preference.PreferenceManager;
-import android.util.Base64;
-import android.util.Log;
 import android.util.SparseArray;
 import android.os.Handler;

-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.security.NoSuchAlgorithmException;
 import java.security.cert.*;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
 import java.security.MessageDigest;
-import java.util.ArrayList;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.text.SimpleDateFormat;
@ -69,10 +51,8 @@ import java.util.Collection;
 import java.util.Enumeration;
 import java.util.List;
 import java.util.Locale;
-import java.util.regex.Pattern;

 import javax.net.ssl.HostnameVerifier;
-import javax.net.ssl.HttpsURLConnection;
 import javax.net.ssl.SSLSession;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.TrustManagerFactory;
@ -88,15 +68,7 @@ import javax.net.ssl.X509TrustManager;
 * <b>WARNING:</b> This only works if a dedicated thread is used for
 * opening sockets!
 */
-public class MemorizingTrustManager {
-
-
-	private static final Pattern PATTERN_IPV4 = Pattern.compile("\\A(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
-	private static final Pattern PATTERN_IPV6_HEX4DECCOMPRESSED = Pattern.compile("\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?) ::((?:[0-9A-Fa-f]{1,4}:)*)(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
-	private static final Pattern PATTERN_IPV6_6HEX4DEC = Pattern.compile("\\A((?:[0-9A-Fa-f]{1,4}:){6,6})(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)(\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)){3}\\z");
-	private static final Pattern PATTERN_IPV6_HEXCOMPRESSED = Pattern.compile("\\A((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)::((?:[0-9A-Fa-f]{1,4}(?::[0-9A-Fa-f]{1,4})*)?)\\z");
-	private static final Pattern PATTERN_IPV6 = Pattern.compile("\\A(?:[0-9a-fA-F]{1,4}:){7}[0-9a-fA-F]{1,4}\\z");
-
+public class MemorizingTrustManager implements X509TrustManager {
 	final static String DECISION_INTENT = "de.duenndns.ssl.DECISION";
 	final static String DECISION_INTENT_ID     = DECISION_INTENT + ".decisionId";
 	final static String DECISION_INTENT_CERT   = DECISION_INTENT + ".cert";
@ -122,7 +94,6 @@ public class MemorizingTrustManager {
 	private KeyStore appKeyStore;
 	private X509TrustManager defaultTrustManager;
 	private X509TrustManager appTrustManager;
-	private String poshCacheDir;

 	/** Creates an instance of the MemorizingTrustManager class that falls back to a custom TrustManager.
 	 *
@ -178,11 +149,28 @@ public class MemorizingTrustManager {
 		File dir = app.getDir(KEYSTORE_DIR, Context.MODE_PRIVATE);
 		keyStoreFile = new File(dir + File.separator + KEYSTORE_FILE);

-		poshCacheDir = app.getFilesDir().getAbsolutePath()+"/posh_cache/";
-
 		appKeyStore = loadAppKeyStore();
 	}

+	
+	/**
+	 * Returns a X509TrustManager list containing a new instance of
+	 * TrustManagerFactory.
+	 *
+	 * This function is meant for convenience only. You can use it
+	 * as follows to integrate TrustManagerFactory for HTTPS sockets:
+	 *
+	 * <pre>
+	 *     SSLContext sc = SSLContext.getInstance("TLS");
+	 *     sc.init(null, MemorizingTrustManager.getInstanceList(this),
+	 *         new java.security.SecureRandom());
+	 *     HttpsURLConnection.setDefaultSSLSocketFactory(sc.getSocketFactory());
+	 * </pre>
+	 * @param c Activity or Service to show the Dialog / Notification
+	 */
+	public static X509TrustManager[] getInstanceList(Context c) {
+		return new X509TrustManager[] { new MemorizingTrustManager(c) };
+	}

 	/**
 	 * Binds an Activity to the MTM for displaying the query dialog.
@ -401,7 +389,7 @@ public class MemorizingTrustManager {
 		return false;
 	}

-	public void checkCertTrusted(X509Certificate[] chain, String authType, String domain, boolean isServer, boolean interactive)
+	public void checkCertTrusted(X509Certificate[] chain, String authType, boolean isServer, boolean interactive)
 		throws CertificateException
 	{
 		LOGGER.log(Level.FINE, "checkCertTrusted(" + chain + ", " + authType + ", " + isServer + ")");
@ -431,15 +419,6 @@ public class MemorizingTrustManager {
 				else
 					defaultTrustManager.checkClientTrusted(chain, authType);
 			} catch (CertificateException e) {
-				boolean trustSystemCAs = !PreferenceManager.getDefaultSharedPreferences(master).getBoolean("dont_trust_system_cas", false);
-				if (domain != null && isServer && trustSystemCAs && !isIp(domain)) {
-					String hash = getBase64Hash(chain[0],"SHA-256");
-					List<String> fingerprints = getPoshFingerprints(domain);
-					if (hash != null && fingerprints.contains(hash)) {
-						Log.d("mtm","trusted cert fingerprint of "+domain+" via posh");
-						return;
-					}
-				}
 				e.printStackTrace();
 				if (interactive) {
 					interactCert(chain, authType, e);
@ -450,147 +429,20 @@ public class MemorizingTrustManager {
 		}
 	}

-	private List<String> getPoshFingerprints(String domain) {
-		List<String> cached = getPoshFingerprintsFromCache(domain);
-		if (cached == null) {
-			return getPoshFingerprintsFromServer(domain);
-		} else {
-			return cached;
-		}
+	public void checkClientTrusted(X509Certificate[] chain, String authType)
+		throws CertificateException
+	{
+		checkCertTrusted(chain, authType, false,true);
 	}

-	private List<String> getPoshFingerprintsFromServer(String domain) {
-		return getPoshFingerprintsFromServer(domain, "https://"+domain+"/.well-known/posh/xmpp-client.json",-1,true);
+	public void checkServerTrusted(X509Certificate[] chain, String authType)
+		throws CertificateException
+	{
+		checkCertTrusted(chain, authType, true,true);
 	}

-	private List<String> getPoshFingerprintsFromServer(String domain, String url, int maxTtl, boolean followUrl) {
-		Log.d("mtm","downloading json for "+domain+" from "+url);
-		try {
-			List<String> results = new ArrayList<>();
-			HttpsURLConnection connection = (HttpsURLConnection) new URL(url).openConnection();
-			connection.setConnectTimeout(5000);
-			connection.setReadTimeout(5000);
-			BufferedReader in = new BufferedReader(new InputStreamReader(connection.getInputStream()));
-			String inputLine;
-			StringBuilder builder = new StringBuilder();
-			while ((inputLine = in.readLine()) != null) {
-				builder.append(inputLine);
-			}
-			JSONObject jsonObject = new JSONObject(builder.toString());
-			in.close();
-			int expires = jsonObject.getInt("expires");
-			if (expires <= 0) {
-				return new ArrayList<>();
-			}
-			if (maxTtl >= 0) {
-				expires = Math.min(maxTtl,expires);
-			}
-			String redirect;
-			try {
-				redirect = jsonObject.getString("url");
-			} catch (JSONException e) {
-				redirect = null;
-			}
-			if (followUrl && redirect != null && redirect.toLowerCase().startsWith("https")) {
-				return getPoshFingerprintsFromServer(domain, redirect, expires, false);
-			}
-			JSONArray fingerprints = jsonObject.getJSONArray("fingerprints");
-			for(int i = 0; i < fingerprints.length(); i++) {
-				JSONObject fingerprint = fingerprints.getJSONObject(i);
-				String sha256 = fingerprint.getString("sha-256");
-				if (sha256 != null) {
-					results.add(sha256);
-				}
-			}
-			writeFingerprintsToCache(domain, results,1000L * expires+System.currentTimeMillis());
-			return results;
-		} catch (Exception e) {
-			Log.d("mtm","error fetching posh "+e.getMessage());
-			return new ArrayList<>();
-		}
-	}
-
-	private File getPoshCacheFile(String domain) {
-		return new File(poshCacheDir+domain+".json");
-	}
-
-	private void writeFingerprintsToCache(String domain, List<String> results, long expires) {
-		File file = getPoshCacheFile(domain);
-		file.getParentFile().mkdirs();
-		try {
-			file.createNewFile();
-			JSONObject jsonObject = new JSONObject();
-			jsonObject.put("expires",expires);
-			jsonObject.put("fingerprints",new JSONArray(results));
-			FileOutputStream outputStream = new FileOutputStream(file);
-			outputStream.write(jsonObject.toString().getBytes());
-			outputStream.flush();
-			outputStream.close();
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	private List<String> getPoshFingerprintsFromCache(String domain) {
-		File file = getPoshCacheFile(domain);
-		try {
-			InputStream is = new FileInputStream(file);
-			BufferedReader buf = new BufferedReader(new InputStreamReader(is));
-
-			String line = buf.readLine();
-			StringBuilder sb = new StringBuilder();
-
-			while(line != null){
-				sb.append(line).append("\n");
-				line = buf.readLine();
-			}
-			JSONObject jsonObject = new JSONObject(sb.toString());
-			is.close();
-			long expires = jsonObject.getLong("expires");
-			long expiresIn = expires - System.currentTimeMillis();
-			if (expiresIn < 0) {
-				file.delete();
-				return null;
-			} else {
-				Log.d("mtm","posh fingerprints expire in "+(expiresIn/1000)+"s");
-			}
-			List<String> result = new ArrayList<>();
-			JSONArray jsonArray = jsonObject.getJSONArray("fingerprints");
-			for(int i = 0; i < jsonArray.length(); ++i) {
-				result.add(jsonArray.getString(i));
-			}
-			return result;
-		} catch (FileNotFoundException e) {
-			return null;
-		} catch (IOException e) {
-			return null;
-		} catch (JSONException e) {
-			file.delete();
-			return null;
-		}
-	}
-
-	private static boolean isIp(final String server) {
-		return server != null && (
-				PATTERN_IPV4.matcher(server).matches()
-						|| PATTERN_IPV6.matcher(server).matches()
-						|| PATTERN_IPV6_6HEX4DEC.matcher(server).matches()
-						|| PATTERN_IPV6_HEX4DECCOMPRESSED.matcher(server).matches()
-						|| PATTERN_IPV6_HEXCOMPRESSED.matcher(server).matches());
-	}
-
-	private static String getBase64Hash(X509Certificate certificate, String digest) throws CertificateEncodingException {
-		MessageDigest md;
-		try {
-			md = MessageDigest.getInstance(digest);
-		} catch (NoSuchAlgorithmException e) {
-			return null;
-		}
-		md.update(certificate.getEncoded());
-		return Base64.encodeToString(md.digest(),Base64.NO_WRAP);
-	}
-
-	private X509Certificate[] getAcceptedIssuers() {
+	public X509Certificate[] getAcceptedIssuers()
+	{
 		LOGGER.log(Level.FINE, "getAcceptedIssuers()");
 		return defaultTrustManager.getAcceptedIssuers();
 	}
@ -701,6 +553,22 @@ public class MemorizingTrustManager {
 		certDetails(si, cert);
 		return si.toString();
 	}
+
+	// We can use Notification.Builder once MTM's minSDK is >= 11
+	@SuppressWarnings("deprecation")
+	void startActivityNotification(Intent intent, int decisionId, String certName) {
+		Notification n = new Notification(android.R.drawable.ic_lock_lock,
+				master.getString(R.string.mtm_notification),
+				System.currentTimeMillis());
+		PendingIntent call = PendingIntent.getActivity(master, 0, intent, 0);
+		n.setLatestEventInfo(master.getApplicationContext(),
+				master.getString(R.string.mtm_notification),
+				certName, call);
+		n.flags |= Notification.FLAG_AUTO_CANCEL;
+
+		notificationManager.notify(NOTIFICATION_ID + decisionId, n);
+	}
+
 	/**
 	 * Returns the top-most entry of the activity stack.
 	 *
@ -730,6 +598,7 @@ public class MemorizingTrustManager {
 					getUI().startActivity(ni);
 				} catch (Exception e) {
 					LOGGER.log(Level.FINE, "startActivity(MemorizingActivity)", e);
+					startActivityNotification(ni, myId, message);
 				}
 			}
 		});
@ -833,45 +702,28 @@ public class MemorizingTrustManager {
 		}
 		@Override
 		public boolean verify(String hostname, SSLSession session) {
-			return verify(hostname, session, false);
+			return verify(hostname, session, true);
 		}
 		
 		
 	}
 	
-	public X509TrustManager getNonInteractive(String domain) {
-		return new NonInteractiveMemorizingTrustManager(domain);
-	}
-
-	public X509TrustManager getInteractive(String domain) {
-		return new InteractiveMemorizingTrustManager(domain);
-	}
-
 	public X509TrustManager getNonInteractive() {
-		return new NonInteractiveMemorizingTrustManager(null);
-	}
-
-	public X509TrustManager getInteractive() {
-		return new InteractiveMemorizingTrustManager(null);
+		return new NonInteractiveMemorizingTrustManager();
 	}
 	
 	private class NonInteractiveMemorizingTrustManager implements X509TrustManager {

-		private final String domain;
-
-		public NonInteractiveMemorizingTrustManager(String domain) {
-			this.domain = domain;
-		}
-
 		@Override
-		public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-			MemorizingTrustManager.this.checkCertTrusted(chain, authType, domain, false, false);
+		public void checkClientTrusted(X509Certificate[] chain, String authType)
+				throws CertificateException {
+			MemorizingTrustManager.this.checkCertTrusted(chain, authType, false, false);
 		}

 		@Override
 		public void checkServerTrusted(X509Certificate[] chain, String authType)
 				throws CertificateException {
-			MemorizingTrustManager.this.checkCertTrusted(chain, authType, domain, true, false);
+			MemorizingTrustManager.this.checkCertTrusted(chain, authType, true, false);
 		}

 		@Override
@ -880,28 +732,4 @@ public class MemorizingTrustManager {
 		}
 		
 	}
-
-	private class InteractiveMemorizingTrustManager implements X509TrustManager {
-		private final String domain;
-
-		public InteractiveMemorizingTrustManager(String domain) {
-			this.domain = domain;
-		}
-
-		@Override
-		public void checkClientTrusted(X509Certificate[] chain, String authType) throws CertificateException {
-			MemorizingTrustManager.this.checkCertTrusted(chain, authType, domain, false, true);
-		}
-
-		@Override
-		public void checkServerTrusted(X509Certificate[] chain, String authType)
-				throws CertificateException {
-			MemorizingTrustManager.this.checkCertTrusted(chain, authType, domain, true, true);
-		}
-
-		@Override
-		public X509Certificate[] getAcceptedIssuers() {
-			return MemorizingTrustManager.this.getAcceptedIssuers();
-		}
-	}
 }
--- a/libs/bcprov-jdk15on-1.50.jar
+++ b/libs/bcprov-jdk15on-1.50.jar
--- a/libs/colorpicker/.gitignore
+++ b/libs/colorpicker/.gitignore
@ -0,0 +1 @@
+/build
--- a/libs/colorpicker/build.gradle
+++ b/libs/colorpicker/build.gradle
@ -0,0 +1,18 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        minSdkVersion 7
+        targetSdkVersion 21
+        versionCode 2
+        versionName "2.0"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+}
--- a/libs/colorpicker/proguard-rules.pro
+++ b/libs/colorpicker/proguard-rules.pro
@ -0,0 +1,17 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Developer/android-sdk-macosx/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
--- a/libs/colorpicker/src/main/AndroidManifest.xml
+++ b/libs/colorpicker/src/main/AndroidManifest.xml
@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="yuku.ambilwarna" />
--- a/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaDialog.java
@ -0,0 +1,298 @@
+package yuku.ambilwarna;
+
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnCancelListener;
+import android.graphics.Color;
+import android.graphics.drawable.GradientDrawable;
+import android.view.LayoutInflater;
+import android.view.MotionEvent;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+import android.widget.ImageView;
+import android.widget.RelativeLayout;
+
+public class AmbilWarnaDialog {
+	public interface OnAmbilWarnaListener {
+		void onCancel(AmbilWarnaDialog dialog);
+
+		void onOk(AmbilWarnaDialog dialog, int color);
+	}
+
+	final AlertDialog dialog;
+	private final boolean supportsAlpha;
+	final OnAmbilWarnaListener listener;
+	final View viewHue;
+	final AmbilWarnaSquare viewSatVal;
+	final ImageView viewCursor;
+	final ImageView viewAlphaCursor;
+	final View viewOldColor;
+	final View viewNewColor;
+	final View viewAlphaOverlay;
+	final ImageView viewTarget;
+	final ImageView viewAlphaCheckered;
+	final ViewGroup viewContainer;
+	final float[] currentColorHsv = new float[3];
+	int alpha;
+
+	/**
+	 * Create an AmbilWarnaDialog.
+	 *
+	 * @param context activity context
+	 * @param color current color
+	 * @param listener an OnAmbilWarnaListener, allowing you to get back error or OK
+	 */
+	public AmbilWarnaDialog(final Context context, int color, OnAmbilWarnaListener listener) {
+		this(context, color, false, listener);
+	}
+
+	/**
+	 * Create an AmbilWarnaDialog.
+	 *
+	 * @param context activity context
+	 * @param color current color
+	 * @param supportsAlpha whether alpha/transparency controls are enabled
+	 * @param listener an OnAmbilWarnaListener, allowing you to get back error or OK
+	 */
+	public AmbilWarnaDialog(final Context context, int color, boolean supportsAlpha, OnAmbilWarnaListener listener) {
+		this.supportsAlpha = supportsAlpha;
+		this.listener = listener;
+
+		if (!supportsAlpha) { // remove alpha if not supported
+			color = color | 0xff000000;
+		}
+
+		Color.colorToHSV(color, currentColorHsv);
+		alpha = Color.alpha(color);
+
+		final View view = LayoutInflater.from(context).inflate(R.layout.ambilwarna_dialog, null);
+		viewHue = view.findViewById(R.id.ambilwarna_viewHue);
+		viewSatVal = (AmbilWarnaSquare) view.findViewById(R.id.ambilwarna_viewSatBri);
+		viewCursor = (ImageView) view.findViewById(R.id.ambilwarna_cursor);
+		viewOldColor = view.findViewById(R.id.ambilwarna_oldColor);
+		viewNewColor = view.findViewById(R.id.ambilwarna_newColor);
+		viewTarget = (ImageView) view.findViewById(R.id.ambilwarna_target);
+		viewContainer = (ViewGroup) view.findViewById(R.id.ambilwarna_viewContainer);
+		viewAlphaOverlay = view.findViewById(R.id.ambilwarna_overlay);
+		viewAlphaCursor = (ImageView) view.findViewById(R.id.ambilwarna_alphaCursor);
+		viewAlphaCheckered = (ImageView) view.findViewById(R.id.ambilwarna_alphaCheckered);
+
+		{ // hide/show alpha
+			viewAlphaOverlay.setVisibility(supportsAlpha? View.VISIBLE: View.GONE);
+			viewAlphaCursor.setVisibility(supportsAlpha? View.VISIBLE: View.GONE);
+			viewAlphaCheckered.setVisibility(supportsAlpha? View.VISIBLE: View.GONE);
+		}
+
+		viewSatVal.setHue(getHue());
+		viewOldColor.setBackgroundColor(color);
+		viewNewColor.setBackgroundColor(color);
+
+		viewHue.setOnTouchListener(new View.OnTouchListener() {
+			@Override
+			public boolean onTouch(View v, MotionEvent event) {
+				if (event.getAction() == MotionEvent.ACTION_MOVE
+				|| event.getAction() == MotionEvent.ACTION_DOWN
+				|| event.getAction() == MotionEvent.ACTION_UP) {
+
+					float y = event.getY();
+					if (y < 0.f) y = 0.f;
+					if (y > viewHue.getMeasuredHeight()) {
+						y = viewHue.getMeasuredHeight() - 0.001f; // to avoid jumping the cursor from bottom to top.
+					}
+					float hue = 360.f - 360.f / viewHue.getMeasuredHeight() * y;
+					if (hue == 360.f) hue = 0.f;
+					setHue(hue);
+
+					// update view
+					viewSatVal.setHue(getHue());
+					moveCursor();
+					viewNewColor.setBackgroundColor(getColor());
+					updateAlphaView();
+					return true;
+				}
+				return false;
+			}
+		});
+
+		if (supportsAlpha) viewAlphaCheckered.setOnTouchListener(new View.OnTouchListener() {
+			@Override
+			public boolean onTouch(View v, MotionEvent event) {
+				if ((event.getAction() == MotionEvent.ACTION_MOVE)
+				|| (event.getAction() == MotionEvent.ACTION_DOWN)
+				|| (event.getAction() == MotionEvent.ACTION_UP)) {
+
+					float y = event.getY();
+					if (y < 0.f) {
+						y = 0.f;
+					}
+					if (y > viewAlphaCheckered.getMeasuredHeight()) {
+						y = viewAlphaCheckered.getMeasuredHeight() - 0.001f; // to avoid jumping the cursor from bottom to top.
+					}
+					final int a = Math.round(255.f - ((255.f / viewAlphaCheckered.getMeasuredHeight()) * y));
+					AmbilWarnaDialog.this.setAlpha(a);
+
+					// update view
+					moveAlphaCursor();
+					int col = AmbilWarnaDialog.this.getColor();
+					int c = a << 24 | col & 0x00ffffff;
+					viewNewColor.setBackgroundColor(c);
+					return true;
+				}
+				return false;
+			}
+		});
+		viewSatVal.setOnTouchListener(new View.OnTouchListener() {
+			@Override
+			public boolean onTouch(View v, MotionEvent event) {
+				if (event.getAction() == MotionEvent.ACTION_MOVE
+				|| event.getAction() == MotionEvent.ACTION_DOWN
+				|| event.getAction() == MotionEvent.ACTION_UP) {
+
+					float x = event.getX(); // touch event are in dp units.
+					float y = event.getY();
+
+					if (x < 0.f) x = 0.f;
+					if (x > viewSatVal.getMeasuredWidth()) x = viewSatVal.getMeasuredWidth();
+					if (y < 0.f) y = 0.f;
+					if (y > viewSatVal.getMeasuredHeight()) y = viewSatVal.getMeasuredHeight();
+
+					setSat(1.f / viewSatVal.getMeasuredWidth() * x);
+					setVal(1.f - (1.f / viewSatVal.getMeasuredHeight() * y));
+
+					// update view
+					moveTarget();
+					viewNewColor.setBackgroundColor(getColor());
+
+					return true;
+				}
+				return false;
+			}
+		});
+
+		dialog = new AlertDialog.Builder(context)
+		.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				if (AmbilWarnaDialog.this.listener != null) {
+					AmbilWarnaDialog.this.listener.onOk(AmbilWarnaDialog.this, getColor());
+				}
+			}
+		})
+		.setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
+			@Override
+			public void onClick(DialogInterface dialog, int which) {
+				if (AmbilWarnaDialog.this.listener != null) {
+					AmbilWarnaDialog.this.listener.onCancel(AmbilWarnaDialog.this);
+				}
+			}
+		})
+		.setOnCancelListener(new OnCancelListener() {
+			// if back button is used, call back our listener.
+			@Override
+			public void onCancel(DialogInterface paramDialogInterface) {
+				if (AmbilWarnaDialog.this.listener != null) {
+					AmbilWarnaDialog.this.listener.onCancel(AmbilWarnaDialog.this);
+				}
+
+			}
+		})
+		.create();
+		// kill all padding from the dialog window
+		dialog.setView(view, 0, 0, 0, 0);
+
+		// move cursor & target on first draw
+		ViewTreeObserver vto = view.getViewTreeObserver();
+		vto.addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
+			@Override
+			public void onGlobalLayout() {
+				moveCursor();
+				if (AmbilWarnaDialog.this.supportsAlpha) moveAlphaCursor();
+				moveTarget();
+				if (AmbilWarnaDialog.this.supportsAlpha) updateAlphaView();
+				view.getViewTreeObserver().removeGlobalOnLayoutListener(this);
+			}
+		});
+	}
+
+	protected void moveCursor() {
+		float y = viewHue.getMeasuredHeight() - (getHue() * viewHue.getMeasuredHeight() / 360.f);
+		if (y == viewHue.getMeasuredHeight()) y = 0.f;
+		RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) viewCursor.getLayoutParams();
+		layoutParams.leftMargin = (int) (viewHue.getLeft() - Math.floor(viewCursor.getMeasuredWidth() / 2) - viewContainer.getPaddingLeft());
+		layoutParams.topMargin = (int) (viewHue.getTop() + y - Math.floor(viewCursor.getMeasuredHeight() / 2) - viewContainer.getPaddingTop());
+		viewCursor.setLayoutParams(layoutParams);
+	}
+
+	protected void moveTarget() {
+		float x = getSat() * viewSatVal.getMeasuredWidth();
+		float y = (1.f - getVal()) * viewSatVal.getMeasuredHeight();
+		RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) viewTarget.getLayoutParams();
+		layoutParams.leftMargin = (int) (viewSatVal.getLeft() + x - Math.floor(viewTarget.getMeasuredWidth() / 2) - viewContainer.getPaddingLeft());
+		layoutParams.topMargin = (int) (viewSatVal.getTop() + y - Math.floor(viewTarget.getMeasuredHeight() / 2) - viewContainer.getPaddingTop());
+		viewTarget.setLayoutParams(layoutParams);
+	}
+
+	protected void moveAlphaCursor() {
+		final int measuredHeight = this.viewAlphaCheckered.getMeasuredHeight();
+		float y = measuredHeight - ((this.getAlpha() * measuredHeight) / 255.f);
+		final RelativeLayout.LayoutParams layoutParams = (RelativeLayout.LayoutParams) this.viewAlphaCursor.getLayoutParams();
+		layoutParams.leftMargin = (int) (this.viewAlphaCheckered.getLeft() - Math.floor(this.viewAlphaCursor.getMeasuredWidth() / 2) - this.viewContainer.getPaddingLeft());
+		layoutParams.topMargin = (int) ((this.viewAlphaCheckered.getTop() + y) - Math.floor(this.viewAlphaCursor.getMeasuredHeight() / 2) - this.viewContainer.getPaddingTop());
+
+		this.viewAlphaCursor.setLayoutParams(layoutParams);
+	}
+
+	private int getColor() {
+		final int argb = Color.HSVToColor(currentColorHsv);
+		return alpha << 24 | (argb & 0x00ffffff);
+	}
+
+	private float getHue() {
+		return currentColorHsv[0];
+	}
+
+	private float getAlpha() {
+		return this.alpha;
+	}
+
+	private float getSat() {
+		return currentColorHsv[1];
+	}
+
+	private float getVal() {
+		return currentColorHsv[2];
+	}
+
+	private void setHue(float hue) {
+		currentColorHsv[0] = hue;
+	}
+
+	private void setSat(float sat) {
+		currentColorHsv[1] = sat;
+	}
+
+	private void setAlpha(int alpha) {
+		this.alpha = alpha;
+	}
+
+	private void setVal(float val) {
+		currentColorHsv[2] = val;
+	}
+
+	public void show() {
+		dialog.show();
+	}
+
+	public AlertDialog getDialog() {
+		return dialog;
+	}
+
+	private void updateAlphaView() {
+		final GradientDrawable gd = new GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, new int[] {
+		Color.HSVToColor(currentColorHsv), 0x0
+		});
+		viewAlphaOverlay.setBackgroundDrawable(gd);
+	}
+}
--- a/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/AmbilWarnaSquare.java
@ -0,0 +1,46 @@
+package yuku.ambilwarna;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.ComposeShader;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.Shader;
+import android.graphics.Shader.TileMode;
+import android.util.AttributeSet;
+import android.view.View;
+
+public class AmbilWarnaSquare extends View {
+	Paint paint;
+	Shader luar;
+	final float[] color = { 1.f, 1.f, 1.f };
+
+	public AmbilWarnaSquare(Context context, AttributeSet attrs) {
+		super(context, attrs);
+	}
+
+	public AmbilWarnaSquare(Context context, AttributeSet attrs, int defStyle) {
+		super(context, attrs, defStyle);
+	}
+
+	@SuppressLint("DrawAllocation") @Override protected void onDraw(Canvas canvas) {
+		super.onDraw(canvas);
+		if (paint == null) {
+			paint = new Paint();
+			luar = new LinearGradient(0.f, 0.f, 0.f, this.getMeasuredHeight(), 0xffffffff, 0xff000000, TileMode.CLAMP);
+		}
+		int rgb = Color.HSVToColor(color);
+		Shader dalam = new LinearGradient(0.f, 0.f, this.getMeasuredWidth(), 0.f, 0xffffffff, rgb, TileMode.CLAMP);
+		ComposeShader shader = new ComposeShader(luar, dalam, PorterDuff.Mode.MULTIPLY);
+		paint.setShader(shader);
+		canvas.drawRect(0.f, 0.f, this.getMeasuredWidth(), this.getMeasuredHeight(), paint);
+	}
+
+	void setHue(float hue) {
+		color[0] = hue;
+		invalidate();
+	}
+}
--- a/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java
@ -0,0 +1,34 @@
+package yuku.ambilwarna.widget;
+
+import android.content.Context;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.util.AttributeSet;
+import android.util.FloatMath;
+import android.view.View;
+
+public class AmbilWarnaPrefWidgetView extends View {
+	Paint paint;
+	float rectSize;
+	float strokeWidth;
+
+	public AmbilWarnaPrefWidgetView(Context context, AttributeSet attrs) {
+		super(context, attrs);
+		
+		float density = context.getResources().getDisplayMetrics().density;
+		rectSize = FloatMath.floor(24.f * density + 0.5f);
+		strokeWidth = FloatMath.floor(1.f * density + 0.5f);
+
+		paint = new Paint();
+		paint.setColor(0xffffffff);
+		paint.setStyle(Style.STROKE);
+		paint.setStrokeWidth(strokeWidth);
+	}
+
+	@Override protected void onDraw(Canvas canvas) {
+		super.onDraw(canvas);
+
+		canvas.drawRect(strokeWidth, strokeWidth, rectSize - strokeWidth, rectSize - strokeWidth, paint);
+	}
+}
--- a/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java
+++ b/libs/colorpicker/src/main/java/yuku/ambilwarna/widget/AmbilWarnaPreference.java
@ -0,0 +1,134 @@
+package yuku.ambilwarna.widget;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.preference.Preference;
+import android.util.AttributeSet;
+import android.view.View;
+
+import yuku.ambilwarna.AmbilWarnaDialog;
+import yuku.ambilwarna.R;
+
+public class AmbilWarnaPreference extends Preference {
+	private final boolean supportsAlpha;
+	int value;
+
+	public AmbilWarnaPreference(Context context, AttributeSet attrs) {
+		super(context, attrs);
+
+		final TypedArray ta = context.obtainStyledAttributes(attrs, R.styleable.AmbilWarnaPreference);
+		supportsAlpha = ta.getBoolean(R.styleable.AmbilWarnaPreference_supportsAlpha, false);
+
+		setWidgetLayoutResource(R.layout.ambilwarna_pref_widget);
+	}
+
+	@Override protected void onBindView(View view) {
+		super.onBindView(view);
+
+		// Set our custom views inside the layout
+		final View box = view.findViewById(R.id.ambilwarna_pref_widget_box);
+		if (box != null) {
+			box.setBackgroundColor(value);
+		}
+	}
+
+	@Override protected void onClick() {
+		new AmbilWarnaDialog(getContext(), value, supportsAlpha, new AmbilWarnaDialog.OnAmbilWarnaListener() {
+			@Override public void onOk(AmbilWarnaDialog dialog, int color) {
+				if (!callChangeListener(color)) return; // They don't want the value to be set
+				value = color;
+				persistInt(value);
+				notifyChanged();
+			}
+
+			@Override public void onCancel(AmbilWarnaDialog dialog) {
+				// nothing to do
+			}
+		}).show();
+	}
+
+	public void forceSetValue(int value) {
+		this.value = value;
+		persistInt(value);
+		notifyChanged();
+	}
+
+	@Override protected Object onGetDefaultValue(TypedArray a, int index) {
+		// This preference type's value type is Integer, so we read the default value from the attributes as an Integer.
+		return a.getInteger(index, 0);
+	}
+
+	@Override protected void onSetInitialValue(boolean restoreValue, Object defaultValue) {
+		if (restoreValue) { // Restore state
+			value = getPersistedInt(value);
+		} else { // Set state
+			int value = (Integer) defaultValue;
+			this.value = value;
+			persistInt(value);
+		}
+	}
+
+	/*
+	 * Suppose a client uses this preference type without persisting. We
+	 * must save the instance state so it is able to, for example, survive
+	 * orientation changes.
+	 */
+	@Override protected Parcelable onSaveInstanceState() {
+		final Parcelable superState = super.onSaveInstanceState();
+		if (isPersistent()) return superState; // No need to save instance state since it's persistent
+
+		final SavedState myState = new SavedState(superState);
+		myState.value = value;
+		return myState;
+	}
+
+	@Override protected void onRestoreInstanceState(Parcelable state) {
+		if (!state.getClass().equals(SavedState.class)) {
+			// Didn't save state for us in onSaveInstanceState
+			super.onRestoreInstanceState(state);
+			return;
+		}
+
+		// Restore the instance state
+		SavedState myState = (SavedState) state;
+		super.onRestoreInstanceState(myState.getSuperState());
+		this.value = myState.value;
+		notifyChanged();
+	}
+
+	/**
+	 * SavedState, a subclass of {@link android.preference.Preference.BaseSavedState}, will store the state
+	 * of MyPreference, a subclass of Preference.
+	 * <p>
+	 * It is important to always call through to super methods.
+	 */
+	private static class SavedState extends BaseSavedState {
+		int value;
+
+		public SavedState(Parcel source) {
+			super(source);
+			value = source.readInt();
+		}
+
+		@Override public void writeToParcel(Parcel dest, int flags) {
+			super.writeToParcel(dest, flags);
+			dest.writeInt(value);
+		}
+
+		public SavedState(Parcelable superState) {
+			super(superState);
+		}
+
+		@SuppressWarnings("unused") public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
+			public SavedState createFromParcel(Parcel in) {
+				return new SavedState(in);
+			}
+
+			public SavedState[] newArray(int size) {
+				return new SavedState[size];
+			}
+		};
+	}
+}
--- a/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_arrow_down.png
+++ b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_arrow_down.png
--- a/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_arrow_right.png
+++ b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_arrow_right.png
--- a/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_cursor.png
+++ b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_cursor.png
--- a/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_target.png
+++ b/libs/colorpicker/src/main/res/drawable-hdpi/ambilwarna_target.png
--- a/libs/colorpicker/src/main/res/drawable-ldpi/ambilwarna_arrow_down.png
+++ b/libs/colorpicker/src/main/res/drawable-ldpi/ambilwarna_arrow_down.png
--- a/libs/colorpicker/src/main/res/drawable-ldpi/ambilwarna_arrow_right.png
+++ b/libs/colorpicker/src/main/res/drawable-ldpi/ambilwarna_arrow_right.png
--- a/libs/colorpicker/src/main/res/drawable-ldpi/ambilwarna_cursor.png
+++ b/libs/colorpicker/src/main/res/drawable-ldpi/ambilwarna_cursor.png
--- a/libs/colorpicker/src/main/res/drawable-ldpi/ambilwarna_target.png
+++ b/libs/colorpicker/src/main/res/drawable-ldpi/ambilwarna_target.png
--- a/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_alphacheckered.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_alphacheckered.png
--- a/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_arrow_down.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_arrow_down.png
--- a/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_arrow_right.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_arrow_right.png
--- a/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_cursor.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_cursor.png
--- a/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_hue.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_hue.png
--- a/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_target.png
+++ b/libs/colorpicker/src/main/res/drawable-mdpi/ambilwarna_target.png
--- a/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_arrow_down.png
+++ b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_arrow_down.png
--- a/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_arrow_right.png
+++ b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_arrow_right.png
--- a/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_cursor.png
+++ b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_cursor.png
--- a/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_target.png
+++ b/libs/colorpicker/src/main/res/drawable-xhdpi/ambilwarna_target.png
--- a/libs/colorpicker/src/main/res/drawable/ambilwarna_alphacheckered_tiled.xml
+++ b/libs/colorpicker/src/main/res/drawable/ambilwarna_alphacheckered_tiled.xml
@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ambilwarna_alphacheckered"
+    android:tileMode="repeat" >
+
+</bitmap>
--- a/libs/colorpicker/src/main/res/layout-land/ambilwarna_dialog.xml
+++ b/libs/colorpicker/src/main/res/layout-land/ambilwarna_dialog.xml
@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:id="@+id/ambilwarna_viewContainer"
+	android:paddingTop="@dimen/ambilwarna_spacer"
+	android:paddingRight="@dimen/ambilwarna_spacer"
+	android:paddingBottom="0dp"
+	android:paddingLeft="@dimen/ambilwarna_spacer"
+	android:clipToPadding="false"
+	android:layout_gravity="center"
+>
+	<LinearLayout
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:id="@+id/ambilwarna_state"
+		android:orientation="vertical"
+		android:paddingRight="@dimen/ambilwarna_spacer"
+		android:gravity="center"
+		android:layout_centerVertical="true"
+	>
+        <FrameLayout
+            android:layout_width="60dp"
+            android:layout_height="30dp">
+
+            <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:background="@drawable/ambilwarna_alphacheckered_tiled" />
+
+            <View
+                    android:id="@+id/ambilwarna_oldColor"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:background="#faa" />
+        </FrameLayout>
+
+		<ImageView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:src="@drawable/ambilwarna_arrow_down"
+			android:paddingTop="@dimen/ambilwarna_spacer"
+			android:paddingBottom="@dimen/ambilwarna_spacer"
+		/>
+        <FrameLayout
+            android:layout_width="60dp"
+            android:layout_height="30dp">
+
+            <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:background="@drawable/ambilwarna_alphacheckered_tiled" />
+
+            <View
+                    android:id="@+id/ambilwarna_newColor"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:background="#aaf" />
+        </FrameLayout>
+	</LinearLayout>
+	<yuku.ambilwarna.AmbilWarnaSquare
+		android:id="@+id/ambilwarna_viewSatBri"
+		android:layout_width="@dimen/ambilwarna_hsvWidth"
+		android:layout_height="@dimen/ambilwarna_hsvHeight"
+		android:layout_toRightOf="@id/ambilwarna_state"
+		android:layerType="software"
+	/>
+	<!-- needed because i can't get parent keeping its bottom layout
+	and its wrap_content height. This view will serve as a bottom spacer. -->
+	<View
+		android:layout_width="@dimen/ambilwarna_spacer"
+		android:layout_height="@dimen/ambilwarna_spacer"
+		android:layout_below="@id/ambilwarna_viewSatBri"
+	/>
+	<ImageView
+		android:id="@+id/ambilwarna_viewHue"
+		android:layout_width="@dimen/ambilwarna_hueWidth"
+		android:layout_height="@dimen/ambilwarna_hsvHeight"
+		android:layout_toRightOf="@id/ambilwarna_viewSatBri"
+		android:layout_marginLeft="@dimen/ambilwarna_spacer"
+		android:src="@drawable/ambilwarna_hue"
+		android:scaleType="fitXY"
+	/>
+
+    <ImageView
+            android:id="@+id/ambilwarna_alphaCheckered"
+            android:layout_width="@dimen/ambilwarna_hueWidth"
+            android:layout_height="@dimen/ambilwarna_hsvHeight"
+            android:layout_marginLeft="@dimen/ambilwarna_spacer"
+            android:layout_toRightOf="@id/ambilwarna_viewHue"
+            android:scaleType="fitXY"
+            android:src="@drawable/ambilwarna_alphacheckered_tiled" />
+
+    <View
+            android:id="@+id/ambilwarna_overlay"
+            android:layout_width="@dimen/ambilwarna_hueWidth"
+            android:layout_height="@dimen/ambilwarna_hsvHeight"
+            android:layout_marginLeft="@dimen/ambilwarna_spacer"
+            android:layout_toRightOf="@id/ambilwarna_viewHue" />
+
+    <ImageView
+		android:id="@+id/ambilwarna_cursor"
+		android:layout_width="9dp"
+		android:layout_height="9dp"
+		android:src="@drawable/ambilwarna_cursor"
+		android:scaleType="matrix" 
+		/>
+
+    <ImageView
+            android:id="@+id/ambilwarna_alphaCursor"
+            android:layout_width="9dp"
+            android:layout_height="9dp"
+            android:scaleType="matrix"
+            android:src="@drawable/ambilwarna_cursor" />
+
+    <ImageView
+		android:id="@+id/ambilwarna_target"
+		android:layout_width="15dp"
+		android:layout_height="15dp"
+		android:src="@drawable/ambilwarna_target"
+		android:scaleType="matrix"
+		 />
+		
+
+</RelativeLayout>
--- a/libs/colorpicker/src/main/res/layout/ambilwarna_dialog.xml
+++ b/libs/colorpicker/src/main/res/layout/ambilwarna_dialog.xml
@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ambilwarna_dialogView"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center" >
+
+    <RelativeLayout
+        android:id="@+id/ambilwarna_viewContainer"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:clipToPadding="false"
+        android:paddingBottom="@dimen/ambilwarna_spacer"
+        android:paddingLeft="@dimen/ambilwarna_spacer"
+        android:paddingRight="@dimen/ambilwarna_spacer"
+        android:paddingTop="@dimen/ambilwarna_spacer" >
+
+        <yuku.ambilwarna.AmbilWarnaSquare
+            android:id="@+id/ambilwarna_viewSatBri"
+            android:layout_width="@dimen/ambilwarna_hsvWidth"
+            android:layout_height="@dimen/ambilwarna_hsvHeight"
+            android:layerType="software" />
+
+        <ImageView
+            android:id="@+id/ambilwarna_viewHue"
+            android:layout_width="@dimen/ambilwarna_hueWidth"
+            android:layout_height="@dimen/ambilwarna_hsvHeight"
+            android:layout_marginLeft="@dimen/ambilwarna_spacer"
+            android:layout_toRightOf="@id/ambilwarna_viewSatBri"
+            android:scaleType="fitXY"
+            android:src="@drawable/ambilwarna_hue" />
+
+        <ImageView
+            android:id="@+id/ambilwarna_alphaCheckered"
+            android:layout_width="@dimen/ambilwarna_hueWidth"
+            android:layout_height="@dimen/ambilwarna_hsvHeight"
+            android:layout_marginLeft="@dimen/ambilwarna_spacer"
+            android:layout_toRightOf="@id/ambilwarna_viewHue"
+            android:scaleType="fitXY"
+            android:src="@drawable/ambilwarna_alphacheckered_tiled" />
+
+        <View
+            android:id="@+id/ambilwarna_overlay"
+            android:layout_width="@dimen/ambilwarna_hueWidth"
+            android:layout_height="@dimen/ambilwarna_hsvHeight"
+            android:layout_marginLeft="@dimen/ambilwarna_spacer"
+            android:layout_toRightOf="@id/ambilwarna_viewHue" />
+
+        <ImageView
+            android:id="@+id/ambilwarna_cursor"
+            android:layout_width="9dp"
+            android:layout_height="9dp"
+            android:scaleType="matrix"
+            android:src="@drawable/ambilwarna_cursor" />
+
+        <ImageView
+            android:id="@+id/ambilwarna_alphaCursor"
+            android:layout_width="9dp"
+            android:layout_height="9dp"
+            android:scaleType="matrix"
+            android:src="@drawable/ambilwarna_cursor" />
+
+        <ImageView
+            android:id="@+id/ambilwarna_target"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:scaleType="matrix"
+            android:src="@drawable/ambilwarna_target" />
+
+        <LinearLayout
+            android:id="@+id/ambilwarna_state"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/ambilwarna_viewSatBri"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="@dimen/ambilwarna_spacer"
+            android:gravity="center"
+            android:orientation="horizontal" >
+
+            <FrameLayout
+                android:layout_width="60dp"
+                android:layout_height="30dp" >
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:background="@drawable/ambilwarna_alphacheckered_tiled" />
+
+                <View
+                    android:id="@+id/ambilwarna_oldColor"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:background="#faa" />
+            </FrameLayout>
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/ambilwarna_spacer"
+                android:paddingRight="@dimen/ambilwarna_spacer"
+                android:src="@drawable/ambilwarna_arrow_right" />
+
+            <FrameLayout
+                android:layout_width="60dp"
+                android:layout_height="30dp" >
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:background="@drawable/ambilwarna_alphacheckered_tiled" />
+
+                <View
+                    android:id="@+id/ambilwarna_newColor"
+                    android:layout_width="fill_parent"
+                    android:layout_height="fill_parent"
+                    android:background="#aaf" />
+            </FrameLayout>
+        </LinearLayout>
+    </RelativeLayout>
+
+</FrameLayout>
--- a/libs/colorpicker/src/main/res/layout/ambilwarna_pref_widget.xml
+++ b/libs/colorpicker/src/main/res/layout/ambilwarna_pref_widget.xml
@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginRight="6dp"
+        android:focusable="false"
+        android:clickable="false">
+
+    <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scaleType="fitXY"
+            android:src="@drawable/ambilwarna_alphacheckered_tiled"/>
+
+
+    <yuku.ambilwarna.widget.AmbilWarnaPrefWidgetView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:id="@+id/ambilwarna_pref_widget_box"
+            />
+</FrameLayout>
--- a/libs/colorpicker/src/main/res/values-land/dimen.xml
+++ b/libs/colorpicker/src/main/res/values-land/dimen.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="ambilwarna_hsvWidth">240dp</dimen>
+	<dimen name="ambilwarna_hsvHeight">120dp</dimen>
+</resources>
--- a/libs/colorpicker/src/main/res/values-xlarge-land/dimen.xml
+++ b/libs/colorpicker/src/main/res/values-xlarge-land/dimen.xml
@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="ambilwarna_hsvWidth">240dp</dimen>
+	<dimen name="ambilwarna_hsvHeight">240dp</dimen>
+</resources>
--- a/libs/colorpicker/src/main/res/values/attrs.xml
+++ b/libs/colorpicker/src/main/res/values/attrs.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="AmbilWarnaPreference">
+        <attr name="supportsAlpha"
+              format="boolean"/>
+    </declare-styleable>
+</resources>
--- a/libs/colorpicker/src/main/res/values/dimen.xml
+++ b/libs/colorpicker/src/main/res/values/dimen.xml
@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<dimen name="ambilwarna_hsvHeight">240dp</dimen>
+	<dimen name="ambilwarna_hsvWidth">240dp</dimen>
+	<dimen name="ambilwarna_hueWidth">30dp</dimen>
+	<dimen name="ambilwarna_spacer">8dp</dimen>
+</resources>
--- a/libs/emojicon/build.gradle
+++ b/libs/emojicon/build.gradle
@ -0,0 +1,27 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 13
+    buildToolsVersion "21.1.2"
+
+    defaultConfig {
+        minSdkVersion 14
+        targetSdkVersion 21
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:support-v4:21.0.3'
+}
--- a/libs/emojicon/lint.xml
+++ b/libs/emojicon/lint.xml
@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lint>
+</lint>
--- a/libs/emojicon/src/main/AndroidManifest.xml
+++ b/libs/emojicon/src/main/AndroidManifest.xml
@ -0,0 +1,12 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="github.ankushsachdeva.emojicon">
+
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19"/>
+
+    <application android:allowBackup="true"
+        android:label="@string/app_name"
+        android:icon="@drawable/ic_launcher">
+
+    </application>
+
+</manifest>
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiAdapter.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiAdapter.java
@ -0,0 +1,101 @@
+/*
+ * Copyright 2014 Ankush Sachdeva
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package github.ankushsachdeva.emojicon;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.BaseAdapter;
+import android.widget.TextView;
+
+/**
+ * @author Ankush Sachdeva (sankush@yahoo.co.in)
+ */
+class EmojiAdapter extends BaseAdapter {
+    private final List<Emojicon> mEmojicons = new ArrayList<>();
+    private OnEmojiClickedListener mClickListener;
+    private final Context mContext;
+
+    public EmojiAdapter(Context context) {
+        this.mContext = context;
+    }
+
+    public void setEmojiconList(List<Emojicon> emojiconList) {
+        mEmojicons.clear();
+        mEmojicons.addAll(emojiconList);
+        notifyDataSetChanged();
+    }
+
+    public void setClickListener(OnEmojiClickedListener clickListener) {
+        mClickListener = clickListener;
+    }
+
+    @Override
+    public int getCount() {
+        return mEmojicons.size();
+    }
+
+    @Override
+    public Emojicon getItem(int position) {
+        return mEmojicons.get(position);
+    }
+
+    @Override
+    public long getItemId(int position) {
+        return position;
+    }
+
+    @Override
+    public View getView(final int position, View convertView, ViewGroup parent) {
+        View v = convertView;
+        if (v == null) {
+            v = LayoutInflater.from(mContext).inflate(R.layout.emojicon_item, null);
+            v.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (mClickListener != null) {
+                        mClickListener.onEmojiClicked(((ViewHolder) v.getTag()).mEmoji);
+                    }
+                }
+            });
+            ViewHolder holder = new ViewHolder();
+            holder.mEmojiContainer = (TextView) v.findViewById(R.id.emojiContainer);
+            holder.mEmojiId = (TextView) v.findViewById(R.id.emojiId);
+            v.setTag(holder);
+        }
+        Emojicon emoji = getItem(position);
+        ViewHolder holder = (ViewHolder) v.getTag();
+        holder.mEmoji = emoji;
+        holder.mEmojiId.setText(emoji.getId());
+        holder.mEmojiContainer.setText(emoji.toString());
+        return v;
+    }
+
+    private class ViewHolder {
+        TextView mEmojiContainer;
+        TextView mEmojiId;
+        Emojicon mEmoji;
+    }
+
+    public interface OnEmojiClickedListener {
+        void onEmojiClicked(Emojicon emojicon);
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiRecentAdapter.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiRecentAdapter.java
@ -0,0 +1,21 @@
+package github.ankushsachdeva.emojicon;
+
+import android.content.Context;
+
+/**
+ * Created by aleksandr.naumov on 14.05.2015.
+ */
+class EmojiRecentAdapter extends EmojiAdapter implements Updatable {
+    private final EmojiconRecentsManager mRecentsManager;
+
+    public EmojiRecentAdapter(Context context, EmojiconRecentsManager mRecentsManager) {
+        super(context);
+        this.mRecentsManager = mRecentsManager;
+        update();
+    }
+
+    @Override
+    public void update() {
+        setEmojiconList(mRecentsManager.getEmojiList());
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/Emojicon.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/Emojicon.java
@ -0,0 +1,53 @@
+package github.ankushsachdeva.emojicon;
+
+import java.nio.charset.Charset;
+
+/**
+ * Created by aleksandr.naumov on 13.05.2015.
+ */
+public class Emojicon {
+    private final String mStringRepresentation;
+
+    public Emojicon(String stringRepresentation) {
+        byte bytes[] = new byte[stringRepresentation.length() / 2];
+        for (int i = 0; i < stringRepresentation.length(); i += 2) {
+            try {
+                bytes[i / 2] = (byte) Integer.parseInt(stringRepresentation.substring(i, i + 2), 16);
+            } catch (NumberFormatException ex) {
+                throw new RuntimeException(String.format("Cannot parse '%s' as emojicon code", stringRepresentation), ex);
+            }
+        }
+        this.mStringRepresentation = new String(bytes, Charset.forName("Utf-8"));
+    }
+
+    @Override
+    public String toString() {
+        return mStringRepresentation;
+    }
+
+    public String getId() {
+        String id = "";
+        for (byte b : mStringRepresentation.getBytes()) {
+            id += String.format("%x", b);
+        }
+        return id;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        Emojicon emojicon = (Emojicon) o;
+        return mStringRepresentation.equals(emojicon.mStringRepresentation);
+
+    }
+
+    @Override
+    public int hashCode() {
+        return mStringRepresentation.hashCode();
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconEditText.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconEditText.java
@ -0,0 +1,67 @@
+/*
+ * Copyright 2014 Ankush Sachdeva
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package github.ankushsachdeva.emojicon;
+
+import github.ankushsachdeva.emojicon.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.util.AttributeSet;
+import android.widget.EditText;
+
+/**
+ * @author Hieu Rocker (rockerhieu@gmail.com).
+ */
+public class EmojiconEditText extends EditText {
+    private int mEmojiconSize;
+
+    public EmojiconEditText(Context context) {
+        super(context);
+        mEmojiconSize = (int) getTextSize();
+
+    }
+
+    public EmojiconEditText(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs);
+    }
+
+    public EmojiconEditText(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(attrs);
+    }
+
+    private void init(AttributeSet attrs) {
+        TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.Emojicon);
+        mEmojiconSize = (int) a.getDimension(R.styleable.Emojicon_emojiconSize, getTextSize());
+        a.recycle();
+        setText(getText());
+    }
+
+    @Override
+    protected void onTextChanged(CharSequence text, int start, int lengthBefore, int lengthAfter) {
+        super.onTextChanged(text,start,lengthBefore,lengthAfter);
+        EmojiconHandler.addEmojis(getContext(), getText(), mEmojiconSize);
+    }
+
+    /**
+     * Set the size of emojicon in pixels.
+     */
+    public void setEmojiconSize(int pixels) {
+        mEmojiconSize = pixels;
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconGridView.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconGridView.java
@ -0,0 +1,78 @@
+/*
+ * Copyright 2014 Ankush Sachdeva
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package github.ankushsachdeva.emojicon;
+
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
+import github.ankushsachdeva.emojicon.emoji.People;
+
+import java.util.Arrays;
+
+import android.app.Activity;
+import android.content.Context;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.GridView;
+
+import github.ankushsachdeva.emojicon.R;
+
+/**
+ * @author Hieu Rocker (rockerhieu@gmail.com)
+ * @author 	Ankush Sachdeva (sankush@yahoo.co.in)
+ */
+public class EmojiconGridView{
+	public View rootView;
+	EmojiconsPopup mEmojiconPopup;
+    EmojiconRecents mRecents;
+    Emojicon[] mData;
+    
+    public EmojiconGridView(Context context, Emojicon[] emojicons, EmojiconRecents recents, EmojiconsPopup emojiconPopup) {
+		LayoutInflater inflater = (LayoutInflater) context.getSystemService(Activity.LAYOUT_INFLATER_SERVICE);
+		mEmojiconPopup = emojiconPopup;
+		rootView = inflater.inflate(R.layout.emojicon_grid, null);
+		setRecents(recents);
+		 GridView gridView = (GridView) rootView.findViewById(R.id.Emoji_GridView);
+	        if (emojicons== null) {
+	            mData = People.DATA;
+	        } else {
+	            Object[] o = (Object[]) emojicons;
+	            mData = Arrays.asList(o).toArray(new Emojicon[o.length]);
+	        }
+	        EmojiAdapter mAdapter = new EmojiAdapter(rootView.getContext(), mData);
+	        mAdapter.setEmojiClickListener(new OnEmojiconClickedListener() {
+				
+				@Override
+				public void onEmojiconClicked(Emojicon emojicon) {
+					if (mEmojiconPopup.onEmojiconClickedListener != null) {
+			            mEmojiconPopup.onEmojiconClickedListener.onEmojiconClicked(emojicon);
+			        }
+			        if (mRecents != null) {
+			            mRecents.addRecentEmoji(rootView.getContext(), emojicon);
+			        }
+				}
+			});
+	        gridView.setAdapter(mAdapter);
+	}
+    
+	private void setRecents(EmojiconRecents recents) {
+        mRecents = recents;
+    }
+
+    public interface OnEmojiconClickedListener {
+        void onEmojiconClicked(Emojicon emojicon);
+    }
+    
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconGroup.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconGroup.java
@ -0,0 +1,39 @@
+package github.ankushsachdeva.emojicon;
+
+import android.content.Context;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by aleksandr.naumov on 14.05.2015.
+ */
+abstract class EmojiconGroup {
+    protected final int mIconResId;
+
+    public EmojiconGroup(int iconResId) {
+        mIconResId = iconResId;
+    }
+
+    public static EmojiconGroup fromString(String allEmojicons, int mIconResId) {
+        return new StaticEmojiconGroup(extractEmojicons(allEmojicons), mIconResId);
+    }
+
+    private static List<Emojicon> extractEmojicons(String emojiconsString) {
+        List<Emojicon> emojicons = new ArrayList<>();
+        for (String emojiconString : emojiconsString.split(" ")) {
+            if(!emojiconString.isEmpty()) {
+                emojicons.add(new Emojicon(emojiconString));
+            }
+        }
+        return emojicons;
+    }
+
+    public abstract List<Emojicon> getEmojicons();
+
+    public abstract EmojiAdapter createAdapter(Context context);
+
+    public int getIconResId() {
+        return mIconResId;
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconGroupsLoader.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconGroupsLoader.java
@ -0,0 +1,92 @@
+package github.ankushsachdeva.emojicon;
+
+import android.content.Context;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.IOException;
+import java.nio.charset.Charset;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Created by aleksandr.naumov on 14.05.2015.
+ */
+class EmojiconGroupsLoader {
+    private static EmojiconGroupsLoader sInstance;
+    private final List<EmojiconGroup> mGroups;
+
+    public static synchronized EmojiconGroupsLoader getInstance(Context context) {
+        if (sInstance == null) {
+            sInstance = new EmojiconGroupsLoader(context);
+        }
+        return sInstance;
+    }
+
+    private EmojiconGroupsLoader(Context context) {
+        try {
+            mGroups = parseEmojiXml(context);
+        } catch (IOException | XmlPullParserException ex) {
+            throw new RuntimeException(ex);
+        }
+    }
+
+    private List<EmojiconGroup> parseEmojiXml(Context context) throws IOException, XmlPullParserException {
+        ArrayList<EmojiconGroup> groups = new ArrayList<>();
+        XmlPullParser parser = context.getResources().getXml(R.xml.emoji);
+        parser.next();
+        String groupName = null;
+        for (int eventType = parser.getEventType(); eventType != XmlPullParser.END_DOCUMENT; eventType = parser.next()) {
+            switch (eventType) {
+                case XmlPullParser.START_TAG:
+                    if ("group".equals(parser.getName())) {
+                        groupName = parser.getAttributeValue(0);
+                    }
+                    break;
+                case XmlPullParser.TEXT:
+                    if (groupName != null) {
+                        groups.add(EmojiconGroup.fromString(
+                                parser.getText(),
+                                getGroupNameIcon(groupName)
+                        ));
+                        groupName = null;
+                    }
+                    break;
+            }
+        }
+        return groups;
+    }
+
+    private int getGroupNameIcon(String groupName) {
+        for (KnownGroupNames knownGroupName : KnownGroupNames.values()) {
+            if (groupName.toLowerCase().equals(knownGroupName.name().toLowerCase())) {
+                return knownGroupName.getIconResId();
+            }
+        }
+        throw new IllegalArgumentException(String.format("Unknown group name '%s'", groupName));
+    }
+
+    public List<EmojiconGroup> getGroups() {
+        return mGroups;
+    }
+
+    public enum KnownGroupNames {
+        RECENT(R.drawable.ic_emoji_recent_light),
+        SMILES(R.drawable.ic_emoji_people_light),
+        NATURE(R.drawable.ic_emoji_nature_light),
+        OBJECTS(R.drawable.ic_emoji_objects_light),
+        TECH(R.drawable.ic_emoji_places_light),
+        SYMBOLS(R.drawable.ic_emoji_symbols_light);
+
+        private final int iconResId;
+
+        KnownGroupNames(int iconResId) {
+            this.iconResId = iconResId;
+        }
+
+        public int getIconResId() {
+            return iconResId;
+        }
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconHandler.java
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconPopupDelegate.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconPopupDelegate.java
@ -0,0 +1,196 @@
+package github.ankushsachdeva.emojicon;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.view.ContextThemeWrapper;
+import android.view.KeyEvent;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.PopupWindow;
+
+/**
+ * Created by aleksandr.naumov on 15.05.2015.
+ */
+public class EmojiconPopupDelegate {
+    public static final String KEY_EMOJI_POPUP_SHOWN = "key_emoji_popup_shown";
+    private Context mContext;
+    private EmojiconsPopup mPopup;
+    private EditText mPrefferredEditText;
+    private boolean mPendingShow;
+    private View mRootView;
+
+    @Nullable
+    private PopupShownListener mListener;
+
+    public void setShowHideListener(PopupShownListener listener) {
+        this.mListener = listener;
+    }
+
+    public void setInputEditText(EditText editText) {
+        mPrefferredEditText = editText;
+    }
+
+    public void attach(View rootView) {
+        mContext = createThemedContext(rootView.getContext());
+        mRootView = rootView;
+        mPopup = new EmojiconsPopup(rootView, mContext);
+        mPopup.setOnDismissListener(new DismissListener());
+        mPopup.setOnSoftKeyboardOpenCloseListener(new KeyboardOpenCloseListener());
+        mPopup.setOnEmojiconClickedListener(new EmojiconClickedListener());
+        mPopup.setOnEmojiconBackspaceClickedListener(new BackspaceClickedListener());
+        mPopup.attachGlobalLayoutListener();
+        if (mPendingShow) {
+            show();
+        }
+    }
+
+    private Context createThemedContext(Context context) {
+        TypedArray typedArray = context.obtainStyledAttributes(null, new int[]{R.attr.emojicon_theme});
+        int themeId = typedArray.getResourceId(0, R.style.Emojicon);
+        typedArray.recycle();
+        return new ContextThemeWrapper(context, themeId);
+    }
+
+    public void detach() {
+        hide();
+        if (mPopup != null) {
+            mPopup.detachGlobalLayoutListener();
+            mPopup = null;
+        }
+        mContext = null;
+        mPrefferredEditText = null;
+        mRootView = null;
+    }
+
+    public void saveState(Bundle bundle) {
+        bundle.putBoolean(KEY_EMOJI_POPUP_SHOWN, isShown());
+    }
+
+    public void restoreState(Bundle bundle) {
+        if (bundle.containsKey(KEY_EMOJI_POPUP_SHOWN)) {
+            if (bundle.getBoolean(KEY_EMOJI_POPUP_SHOWN)) {
+                show();
+            } else {
+                hide();
+            }
+        }
+    }
+
+    public void show() {
+        if (mPopup != null && !mPopup.isShowing()) {
+            if (mPopup.isKeyBoardOpen()) {
+                //If keyboard is visible, simply show the emoji popup
+                mPopup.showAtBottom();
+            } else {
+                //else, open the text keyboard first and immediately after that show the emoji popup
+                mPrefferredEditText.setFocusableInTouchMode(true);
+                mPrefferredEditText.requestFocus();
+                mPopup.showAtBottomPending();
+                final InputMethodManager inputMethodManager = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
+                inputMethodManager.showSoftInput(mPrefferredEditText, InputMethodManager.SHOW_IMPLICIT);
+            }
+            mPendingShow = false;
+            notifyShown();
+        } else if (!mPendingShow) {
+            mPendingShow = true;
+            notifyShown();
+        }
+    }
+
+    public void hide() {
+        if (mPopup != null && mPopup.isShowing()) {
+            mPopup.dismiss();
+            notifyHidden();
+        } else if (mPendingShow) {
+            mPendingShow = false;
+            notifyHidden();
+        }
+    }
+
+    private void notifyShown() {
+        if (mListener != null) {
+            mListener.onPopupShown();
+        }
+    }
+
+    private void notifyHidden() {
+        if (mListener != null) {
+            mListener.onPopupHidden();
+        }
+    }
+
+    public boolean isShown() {
+        return mPopup != null ? mPopup.isShowing() : mPendingShow;
+    }
+
+    public void toggle() {
+        if (isShown()) {
+            hide();
+        } else {
+            show();
+        }
+    }
+
+    @Nullable
+    public EditText findFocusedEditText() {
+        View view = mRootView != null ? mRootView.findFocus() : null;
+        if (view instanceof EditText) {
+            return (EditText) view;
+        } else {
+            return null;
+        }
+    }
+
+    public interface PopupShownListener {
+        void onPopupShown();
+
+        void onPopupHidden();
+    }
+
+    private class BackspaceClickedListener implements EmojiconsPopup.OnEmojiconBackspaceClickedListener {
+        @Override
+        public void onEmojiconBackspaceClicked(View v) {
+            EditText currentFocus = findFocusedEditText();
+            if (currentFocus != null) {
+                KeyEvent event = new KeyEvent(0, 0, 0, KeyEvent.KEYCODE_DEL, 0, 0, 0, 0, KeyEvent.KEYCODE_ENDCALL);
+                currentFocus.dispatchKeyEvent(event);
+            }
+        }
+    }
+
+    private class EmojiconClickedListener implements EmojiconsPopup.OnEmojiconClickedListener {
+
+        @Override
+        public void onEmojiconClicked(Emojicon emojicon) {
+            EditText currentFocus = findFocusedEditText();
+            if (currentFocus != null) {
+                String textToInsert = emojicon.toString();
+                int start = Math.max(currentFocus.getSelectionStart(), 0);
+                int end = Math.max(currentFocus.getSelectionEnd(), 0);
+                currentFocus.getText().replace(Math.min(start, end), Math.max(start, end), textToInsert, 0, textToInsert.length());
+            }
+        }
+    }
+
+    private class KeyboardOpenCloseListener implements EmojiconsPopup.OnSoftKeyboardOpenCloseListener {
+        @Override
+        public void onKeyboardOpen(int keyBoardHeight) {
+
+        }
+
+        @Override
+        public void onKeyboardClose() {
+            hide();
+        }
+    }
+
+    private class DismissListener implements PopupWindow.OnDismissListener {
+        @Override
+        public void onDismiss() {
+            notifyHidden();
+        }
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecents.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecents.java
@ -0,0 +1,28 @@
+/*
+ * Copyright 2014 Ankush Sachdeva
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package github.ankushsachdeva.emojicon;
+
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
+
+import android.content.Context;
+
+/**
+* @author Daniele Ricci
+*/
+public interface EmojiconRecents {
+    public void addRecentEmoji(Context context, Emojicon emojicon);
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsGridView.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsGridView.java
@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 Ankush Sachdeva
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package github.ankushsachdeva.emojicon;
+
+import github.ankushsachdeva.emojicon.emoji.Emojicon;
+import android.content.Context;
+import android.widget.GridView;
+
+import github.ankushsachdeva.emojicon.R;
+
+/**
+ * @author Daniele Ricci
+ * @author 	Ankush Sachdeva (sankush@yahoo.co.in)
+ */
+public class EmojiconRecentsGridView extends EmojiconGridView implements EmojiconRecents {
+	EmojiAdapter mAdapter;
+	
+	public EmojiconRecentsGridView(Context context, Emojicon[] emojicons,
+			EmojiconRecents recents,EmojiconsPopup emojiconsPopup) {
+		super(context, emojicons, recents, emojiconsPopup);
+		EmojiconRecentsManager recents1 = EmojiconRecentsManager
+	            .getInstance(rootView.getContext());
+		mAdapter = new EmojiAdapter(rootView.getContext(),  recents1);
+		mAdapter.setEmojiClickListener(new OnEmojiconClickedListener() {
+			
+			@Override
+			public void onEmojiconClicked(Emojicon emojicon) {
+				if (mEmojiconPopup.onEmojiconClickedListener != null) {
+		            mEmojiconPopup.onEmojiconClickedListener.onEmojiconClicked(emojicon);
+		        }
+		    }
+		});
+        GridView gridView = (GridView) rootView.findViewById(R.id.Emoji_GridView);
+        gridView.setAdapter(mAdapter);
+    }
+
+    @Override
+    public void addRecentEmoji(Context context, Emojicon emojicon) {
+        EmojiconRecentsManager recents = EmojiconRecentsManager
+            .getInstance(context);
+        recents.push(emojicon);
+
+        // notify dataset changed
+        if (mAdapter != null)
+            mAdapter.notifyDataSetChanged();
+    }
+
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsManager.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconRecentsManager.java
@ -0,0 +1,84 @@
+/*
+ * Copyright 2014 Ankush Sachdeva
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package github.ankushsachdeva.emojicon;
+
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+
+
+/**
+ * @author Daniele Ricci
+ */
+class EmojiconRecentsManager {
+
+    private static final String PREFERENCE_NAME = "emojicon_v2";
+    private static final String PREF_RECENTS = "recent_emojis_v2";
+    private static final String PREF_PAGE = "recent_page_v2";
+    private static final String EMOJI_DIVIDER = " ";
+
+    private final LinkedList<Emojicon> mEmoji;
+    private Context mContext;
+
+    public EmojiconRecentsManager(Context context) {
+        mContext = context.getApplicationContext();
+        mEmoji = loadRecent();
+    }
+
+    public LinkedList<Emojicon> getEmojiList() {
+        return mEmoji;
+    }
+
+    public int getRecentPage() {
+        return getPreferences().getInt(PREF_PAGE, 0);
+    }
+
+    public void setRecentPage(int page) {
+        getPreferences().edit().putInt(PREF_PAGE, page).commit();
+    }
+
+    public void push(Emojicon object) {
+        if (mEmoji.contains(object)) {
+            mEmoji.remove(object);
+        }
+        mEmoji.addFirst(object);
+    }
+
+    private SharedPreferences getPreferences() {
+        return mContext.getSharedPreferences(PREFERENCE_NAME, Context.MODE_PRIVATE);
+    }
+
+    private LinkedList<Emojicon> loadRecent() {
+        String allEmoji = getPreferences().getString(PREF_RECENTS, "");
+        if (allEmoji != null) {
+            return new LinkedList<>(EmojiconGroup.fromString(allEmoji, 0).getEmojicons());
+        } else {
+            return new LinkedList<>();
+        }
+    }
+
+    public void save() {
+        StringBuilder str = new StringBuilder();
+        for (Iterator<Emojicon> iterator = mEmoji.iterator(); iterator.hasNext(); ) {
+            Emojicon emojicon = iterator.next();
+            str.append(emojicon.getId()).append(iterator.hasNext() ? EMOJI_DIVIDER : "");
+        }
+        getPreferences().edit().putString(PREF_RECENTS, str.toString()).apply();
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconSpan.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconSpan.java
@ -0,0 +1,51 @@
+/*
+ * Copyright 2014 Ankush Sachdeva
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package github.ankushsachdeva.emojicon;
+
+import android.content.Context;
+import android.graphics.drawable.Drawable;
+import android.text.style.DynamicDrawableSpan;
+
+/**
+ * @author Hieu Rocker (rockerhieu@gmail.com)
+ */
+class EmojiconSpan extends DynamicDrawableSpan {
+    private final Context mContext;
+    private final int mResourceId;
+    private final int mSize;
+    private Drawable mDrawable;
+
+    public EmojiconSpan(Context context, int resourceId, int size) {
+        super();
+        mContext = context;
+        mResourceId = resourceId;
+        mSize = size;
+    }
+
+    public Drawable getDrawable() {
+        if (mDrawable == null) {
+            try {
+                mDrawable = mContext.getResources().getDrawable(mResourceId);
+                int size = mSize;
+                mDrawable.setBounds(0, 0, size, size);
+            } catch (Exception e) {
+                // swallow
+            }
+        }
+        return mDrawable;
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconTextView.java
@ -0,0 +1,76 @@
+/*
+ * Copyright 2014 Ankush Sachdeva
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package github.ankushsachdeva.emojicon;
+
+import github.ankushsachdeva.emojicon.R;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.text.SpannableStringBuilder;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+/**
+ * @author Hieu Rocker (rockerhieu@gmail.com).
+ */
+public class EmojiconTextView extends TextView {
+    private int mEmojiconSize;
+    private int mTextStart = 0;
+    private int mTextLength = -1;
+
+    public EmojiconTextView(Context context) {
+        super(context);
+        init(null);
+    }
+
+    public EmojiconTextView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(attrs);
+    }
+
+    public EmojiconTextView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(attrs);
+    }
+
+    private void init(AttributeSet attrs) {
+        if (attrs == null) {
+            mEmojiconSize = (int) getTextSize();
+        } else {
+            TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.Emojicon);
+            mEmojiconSize = (int) a.getDimension(R.styleable.Emojicon_emojiconSize, getTextSize());
+            mTextStart = a.getInteger(R.styleable.Emojicon_emojiconTextStart, 0);
+            mTextLength = a.getInteger(R.styleable.Emojicon_emojiconTextLength, -1);
+            a.recycle();
+        }
+        setText(getText());
+    }
+
+    @Override
+    public void setText(CharSequence text, BufferType type) {
+        SpannableStringBuilder builder = new SpannableStringBuilder(text);
+        EmojiconHandler.addEmojis(getContext(), builder, mEmojiconSize, mTextStart, mTextLength);
+        super.setText(builder, type);
+    }
+
+    /**
+     * Set the size of emojicon in pixels.
+     */
+    public void setEmojiconSize(int pixels) {
+        mEmojiconSize = pixels;
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconsPopup.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/EmojiconsPopup.java
@ -0,0 +1,361 @@
+/*
+ * Copyright 2014 Ankush Sachdeva
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package github.ankushsachdeva.emojicon;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import android.content.Context;
+import android.graphics.Rect;
+import android.support.annotation.Nullable;
+import android.support.v4.view.PagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.util.SparseArray;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.View.OnClickListener;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver.OnGlobalLayoutListener;
+import android.view.WindowManager.LayoutParams;
+import android.widget.GridView;
+import android.widget.ImageButton;
+import android.widget.LinearLayout;
+import android.widget.PopupWindow;
+
+
+/**
+ * @author Ankush Sachdeva (sankush@yahoo.co.in).
+ */
+
+public class EmojiconsPopup extends PopupWindow implements ViewPager.OnPageChangeListener, EmojiAdapter.OnEmojiClickedListener {
+    private View[] mEmojiTabs;
+    private EmojiconRecentsManager mRecentsManager;
+    private int keyBoardHeight = 0;
+    private boolean mWaitingForKbOpen = false;
+    private boolean mIsOpened = false;
+    private View mRootView;
+    private Context mContext;
+    private ViewPager mEmojisPager;
+
+    @Nullable
+    private OnSoftKeyboardOpenCloseListener mSoftKeyboardOpenCloseListener;
+
+    @Nullable
+    private OnEmojiconClickedListener mEmojiconClickedListener;
+
+    @Nullable
+    private OnEmojiconBackspaceClickedListener mEmojiconBackspaceClickedListener;
+
+    private GlobalLayoutListener mGlobalLayoutListener = new GlobalLayoutListener();
+
+    /**
+     * Constructor
+     *
+     * @param rootView The top most layout in your view hierarchy. The difference of this view and the screen height will be used to calculate the keyboard height.
+     * @param context  The context of current activity.
+     */
+    public EmojiconsPopup(View rootView, Context context) {
+        super(context, null, R.attr.emojicon_dialog_style);
+        mContext = context;
+        mRootView = rootView;
+        mRecentsManager = new EmojiconRecentsManager(context);
+        setContentView(createCustomView());
+        setSoftInputMode(LayoutParams.SOFT_INPUT_STATE_ALWAYS_VISIBLE);
+    }
+
+    /**
+     * Set the listener for the event of keyboard opening or closing.
+     */
+    public void setOnSoftKeyboardOpenCloseListener(OnSoftKeyboardOpenCloseListener listener) {
+        this.mSoftKeyboardOpenCloseListener = listener;
+    }
+
+    /**
+     * Set the listener for the event when any of the emojicon is clicked
+     */
+    public void setOnEmojiconClickedListener(OnEmojiconClickedListener listener) {
+        this.mEmojiconClickedListener = listener;
+    }
+
+    /**
+     * Set the listener for the event when backspace on emojicon popup is clicked
+     */
+    public void setOnEmojiconBackspaceClickedListener(OnEmojiconBackspaceClickedListener listener) {
+        this.mEmojiconBackspaceClickedListener = listener;
+    }
+
+    /**
+     * Use this function to show the emoji popup.
+     * NOTE: Since, the soft keyboard sizes are variable on different android devices, the
+     * library needs you to open the soft keyboard atleast once before calling this function.
+     * If that is not possible see showAtBottomPending() function.
+     */
+    public void showAtBottom() {
+        showAtLocation(mRootView, Gravity.BOTTOM, 0, 0);
+    }
+
+    /**
+     * Use this function when the soft keyboard has not been opened yet. This
+     * will show the emoji popup after the keyboard is up next time.
+     * Generally, you will be calling InputMethodManager.showSoftInput function after
+     * calling this function.
+     */
+    public void showAtBottomPending() {
+        if (isKeyBoardOpen()) {
+            showAtBottom();
+        } else {
+            mWaitingForKbOpen = true;
+        }
+    }
+
+    /**
+     * @return Returns true if the soft keyboard is open, false otherwise.
+     */
+    public Boolean isKeyBoardOpen() {
+        return mIsOpened;
+    }
+
+    /**
+     * Dismiss the popup
+     */
+    @Override
+    public void dismiss() {
+        super.dismiss();
+        mRecentsManager.save();
+    }
+
+    /**
+     * Call this function to resize the emoji popup according to your soft keyboard size
+     */
+    public void attachGlobalLayoutListener() {
+        mRootView.getViewTreeObserver().addOnGlobalLayoutListener(mGlobalLayoutListener);
+    }
+
+    public void detachGlobalLayoutListener() {
+        mRootView.getViewTreeObserver().removeGlobalOnLayoutListener(mGlobalLayoutListener);
+    }
+
+    /**
+     * Manually set the popup window size
+     *
+     * @param width  Width of the popup
+     * @param height Height of the popup
+     */
+    public void setSize(int width, int height) {
+        setWidth(width);
+        setHeight(height);
+    }
+
+    private View createCustomView() {
+        View view = LayoutInflater.from(mContext).inflate(R.layout.emojicons, null);
+        List<EmojiconGroup> displayedGroups = collectDisplayedGroups();
+        initViewPager(view, displayedGroups);
+        initTabs(view, displayedGroups);
+        initCurrentPage();
+        return view;
+    }
+
+    private void initCurrentPage() {
+        // get last selected page
+        int page = mRecentsManager.getRecentPage();
+        // last page was recents, check if there are recents to use
+        // if none was found, go to page 1
+        if (page == 0 && mRecentsManager.getEmojiList().isEmpty()) {
+            page = 1;
+        }
+        if (page == 0) {
+            onPageSelected(page);
+        } else {
+            mEmojisPager.setCurrentItem(page, false);
+        }
+    }
+
+    private void initTabs(View view, List<EmojiconGroup> displayedGroups) {
+        LinearLayout tabHostLayout = (LinearLayout) view.findViewById(R.id.emojis_tab);
+        mEmojiTabs = new View[displayedGroups.size()];
+        for (int i = 0; i < displayedGroups.size(); i++) {
+            final int position = i;
+            mEmojiTabs[i] = inflateTab(tabHostLayout, displayedGroups.get(i).getIconResId());
+            mEmojiTabs[i].setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    mEmojisPager.setCurrentItem(position);
+                }
+            });
+            inflateDivider(tabHostLayout);
+        }
+        View backSpace = inflateTab(tabHostLayout, R.drawable.ic_keyboard_delete);
+        backSpace.setOnTouchListener(new RepeatTouchListener(1000, 50, new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (mEmojiconBackspaceClickedListener != null) {
+                    mEmojiconBackspaceClickedListener.onEmojiconBackspaceClicked(v);
+                }
+            }
+        }));
+    }
+
+    private View inflateTab(LinearLayout tabHostLayout, int iconResId) {
+        ImageButton tabView = (ImageButton) LayoutInflater.from(mContext)
+                .inflate(R.layout.emojicon_tab, tabHostLayout, false);
+
+        tabHostLayout.addView(tabView);
+        tabView.setImageDrawable(mContext.getResources().getDrawable(iconResId));
+        return tabView;
+    }
+
+    private View inflateDivider(LinearLayout tabHostLayout) {
+        return LayoutInflater.from(mContext).inflate(R.layout.emojicon_tab_divider, tabHostLayout);
+    }
+
+    private void initViewPager(View view, List<EmojiconGroup> displayedGroups) {
+        mEmojisPager = (ViewPager) view.findViewById(R.id.emojis_pager);
+        mEmojisPager.setOnPageChangeListener(this);
+        mEmojisPager.setAdapter(new EmojisPagerAdapter(displayedGroups));
+    }
+
+    private List<EmojiconGroup> collectDisplayedGroups() {
+        List<EmojiconGroup> groups = new ArrayList<>();
+        groups.add(new RecentsEmojiconGroup(mRecentsManager, EmojiconGroupsLoader.KnownGroupNames.RECENT.getIconResId()));
+        groups.addAll(EmojiconGroupsLoader.getInstance(mContext).getGroups());
+        return groups;
+    }
+
+    @Override
+    public void onPageScrolled(int i, float v, int i2) {
+        // ignore
+    }
+
+    @Override
+    public void onPageSelected(int position) {
+        for (int i = 0; i < mEmojiTabs.length; i++) {
+            mEmojiTabs[i].setSelected(i == position);
+        }
+        mRecentsManager.setRecentPage(position);
+        EmojiAdapter adapter = ((EmojisPagerAdapter) mEmojisPager.getAdapter()).getPageAdapter(position);
+        if (adapter instanceof Updatable) {
+            ((Updatable) adapter).update();
+        }
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int i) {
+        // ignore
+    }
+
+    @Override
+    public void onEmojiClicked(Emojicon emojicon) {
+        mRecentsManager.push(emojicon);
+        if (mEmojiconClickedListener != null) {
+            mEmojiconClickedListener.onEmojiconClicked(emojicon);
+        }
+    }
+
+    private class EmojisPagerAdapter extends PagerAdapter {
+        private final List<EmojiconGroup> mGroups;
+        private final SparseArray<EmojiAdapter> mAdapters = new SparseArray<>();
+
+        public EmojisPagerAdapter(List<EmojiconGroup> groups) {
+            mGroups = groups;
+        }
+
+        public EmojiAdapter getPageAdapter(int pageIndex) {
+            return mAdapters.get(pageIndex);
+        }
+
+        @Override
+        public int getCount() {
+            return mGroups.size();
+        }
+
+        @Override
+        public GridView instantiateItem(ViewGroup container, final int viewPosition) {
+            GridView gridView = (GridView) LayoutInflater.from(mContext).inflate(R.layout.emojicon_grid, container, false);
+            container.addView(gridView);
+            final EmojiAdapter adapter = mGroups.get(viewPosition).createAdapter(mContext);
+            gridView.setAdapter(adapter);
+            adapter.setClickListener(EmojiconsPopup.this);
+            mAdapters.put(viewPosition, adapter);
+            return gridView;
+        }
+
+        @Override
+        public void destroyItem(ViewGroup container, int position, Object view) {
+            container.removeView((View) view);
+            mAdapters.remove(position);
+        }
+
+        @Override
+        public boolean isViewFromObject(View view, Object key) {
+            return key == view;
+        }
+    }
+
+    public interface OnEmojiconClickedListener {
+        void onEmojiconClicked(Emojicon emojicon);
+    }
+
+    public interface OnEmojiconBackspaceClickedListener {
+        void onEmojiconBackspaceClicked(View v);
+    }
+
+    public interface OnSoftKeyboardOpenCloseListener {
+        void onKeyboardOpen(int keyBoardHeight);
+
+        void onKeyboardClose();
+    }
+
+    private class GlobalLayoutListener implements OnGlobalLayoutListener {
+        @Override
+        public void onGlobalLayout() {
+            Rect r = new Rect();
+            mRootView.getWindowVisibleDisplayFrame(r);
+
+            int screenHeight = mRootView.getRootView().getHeight();
+            int heightDifference = screenHeight - (r.bottom - r.top);
+            int resourceId = mContext.getResources()
+                    .getIdentifier("status_bar_height", "dimen", "android");
+            if (resourceId > 0) {
+                heightDifference -= mContext.getResources().getDimensionPixelSize(resourceId);
+            }
+            if (heightDifference > 100) {
+                int oldHeight = getHeight();
+                keyBoardHeight = heightDifference;
+                setSize(LayoutParams.MATCH_PARENT, keyBoardHeight);
+                if (!mIsOpened) {
+                    if (mSoftKeyboardOpenCloseListener != null) {
+                        mSoftKeyboardOpenCloseListener.onKeyboardOpen(keyBoardHeight);
+                    }
+                }
+                mIsOpened = true;
+                if (mWaitingForKbOpen) {
+                    showAtBottom();
+                    mWaitingForKbOpen = false;
+                } else if(isShowing() && oldHeight != keyBoardHeight) {
+                    dismiss();
+                    showAtBottom();
+                }
+            } else {
+                mIsOpened = false;
+                if (mSoftKeyboardOpenCloseListener != null) {
+                    mSoftKeyboardOpenCloseListener.onKeyboardClose();
+                }
+            }
+        }
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/RecentsEmojiconGroup.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/RecentsEmojiconGroup.java
@ -0,0 +1,28 @@
+package github.ankushsachdeva.emojicon;
+
+import android.content.Context;
+
+import java.util.List;
+
+/**
+ * Created by aleksandr.naumov on 14.05.2015.
+ */
+class RecentsEmojiconGroup extends EmojiconGroup {
+
+    private final EmojiconRecentsManager mRecentsManager;
+
+    public RecentsEmojiconGroup(EmojiconRecentsManager mRecentsManager, int iconResId) {
+        super(iconResId);
+        this.mRecentsManager = mRecentsManager;
+    }
+
+    @Override
+    public List<Emojicon> getEmojicons() {
+        return mRecentsManager.getEmojiList();
+    }
+
+    @Override
+    public EmojiAdapter createAdapter(Context context) {
+        return new EmojiRecentAdapter(context, mRecentsManager);
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/RepeatTouchListener.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/RepeatTouchListener.java
@ -0,0 +1,74 @@
+package github.ankushsachdeva.emojicon;
+
+import android.os.Handler;
+import android.os.SystemClock;
+import android.view.MotionEvent;
+import android.view.View;
+
+/**
+ * A class, that can be used as a TouchListener on any view (e.g. a Button).
+ * It cyclically runs a clickListener, emulating keyboard-like behaviour. First
+ * click is fired immediately, next before initialInterval, and subsequent before
+ * normalInterval.
+ * <p/>
+ * <p>Interval is scheduled before the onClick completes, so it has to run fast.
+ * If it runs slow, it does not generate skipped onClicks.
+ */
+class RepeatTouchListener implements View.OnTouchListener {
+
+    private Handler handler = new Handler();
+
+    private int initialInterval;
+    private final int normalInterval;
+    private final View.OnClickListener clickListener;
+
+    private Runnable handlerRunnable = new Runnable() {
+        @Override
+        public void run() {
+            if (downView == null) {
+                return;
+            }
+            handler.removeCallbacksAndMessages(downView);
+            handler.postAtTime(this, downView, SystemClock.uptimeMillis() + normalInterval);
+            clickListener.onClick(downView);
+        }
+    };
+
+    private View downView;
+
+    /**
+     * @param initialInterval The interval before first click event
+     * @param normalInterval  The interval before second and subsequent click
+     *                        events
+     * @param clickListener   The OnClickListener, that will be called
+     *                        periodically
+     */
+    public RepeatTouchListener(int initialInterval, int normalInterval, View.OnClickListener clickListener) {
+        if (clickListener == null)
+            throw new IllegalArgumentException("null runnable");
+        if (initialInterval < 0 || normalInterval < 0)
+            throw new IllegalArgumentException("negative interval");
+
+        this.initialInterval = initialInterval;
+        this.normalInterval = normalInterval;
+        this.clickListener = clickListener;
+    }
+
+    public boolean onTouch(View view, MotionEvent motionEvent) {
+        switch (motionEvent.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+                downView = view;
+                handler.removeCallbacks(handlerRunnable);
+                handler.postAtTime(handlerRunnable, downView, SystemClock.uptimeMillis() + initialInterval);
+                clickListener.onClick(view);
+                return true;
+            case MotionEvent.ACTION_UP:
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_OUTSIDE:
+                handler.removeCallbacksAndMessages(downView);
+                downView = null;
+                return true;
+        }
+        return false;
+    }
+}
--- a/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/StaticEmojiconGroup.java
+++ b/libs/emojicon/src/main/java/github/ankushsachdeva/emojicon/StaticEmojiconGroup.java
@ -0,0 +1,29 @@
+package github.ankushsachdeva.emojicon;
+
+import android.content.Context;
+
+import java.util.List;
+
+/**
+ * Created by aleksandr.naumov on 13.05.2015.
+ */
+class StaticEmojiconGroup extends EmojiconGroup {
+    private final List<Emojicon> mEmojicons;
+
+    public StaticEmojiconGroup(List<Emojicon> emojicons, int iconResId) {
+        super(iconResId);
+        mEmojicons = emojicons;
+    }
+
+    @Override
+    public List<Emojicon> getEmojicons() {
+        return mEmojicons;
+    }
+
+    @Override
+    public EmojiAdapter createAdapter(Context context) {
+        EmojiAdapter adapter = new EmojiAdapter(context);
+        adapter.setEmojiconList(getEmojicons());
+        return adapter;
+    }
+}
--- a/Show more
+++ b/Show more
Author	SHA1	Message	Date
lookshe	4bb806585f	merged latest version from https://github.com/firexel/emojicon/ but only seems to work with lollipop, so switch back to the old pictures	2015-08-12 21:43:04 +02:00
lookshe	0ee1992da2	Fixes FS#38 - Issues with URLs with multiple dots in file name	2015-08-12 19:20:24 +02:00
lookshe	473f035355	Fixes FS#33 - Get back the comment	2015-08-12 18:28:56 +02:00
steckbrief	b085643555	Fixes FS#20: Limitation of end conversation swipe to left side	2015-08-11 22:19:48 +02:00
lookshe	8fd688ca96	Merge tag '1.5.2' into trz/rebase	2015-08-11 17:35:53 +02:00
steckbrief	553f41a2db	Show Online status in contact list with respect to SHOW_ONLINE_STATUS preference	2015-06-19 23:12:24 +02:00
steckbrief	a73ce32e27	Status color added to "create conversation" (refers to ticket #22 in flyspray)	2015-06-19 23:11:44 +02:00
lookshe	b3b4a2902e	moved color picker to libs	2015-04-15 21:43:53 +02:00
lookshe	549810783c	changed received and read confirmation setting to one list and put it to settings class	2015-04-14 23:48:28 +02:00
lookshe	8932dd9fb3	adjusted todo	2015-04-14 00:06:53 +02:00
lookshe	516c343e8a	check with lowercase to also match JPEG, JPeg ...	2015-04-13 15:55:00 +02:00
lookshe	12486e9a29	adjusted todo	2015-04-13 11:19:42 +02:00
lookshe	ae8a2467aa	changed last message in overview also to EmojiconTextView for displaying smileys correctly	2015-04-12 23:37:58 +02:00
lookshe	573bfed961	adjusted todo	2015-04-12 23:10:21 +02:00
lookshe	3ef609cfbd	better and perhaps faster way for checking if a message is downloadable	2015-04-12 23:09:53 +02:00
lookshe	03bc7dcdc9	new settings to initialisation of Settings	2015-04-12 23:09:10 +02:00
lookshe	7405d50c70	implementation for downloading only when enabled wlan	2015-04-12 21:28:45 +02:00
lookshe	56e695cf1b	added settings for accepting and downloading files fix in Settings, initialize with same values like in preferences.xml	2015-04-12 20:59:12 +02:00
lookshe	98c09f18a2	add missing resource files	2015-04-12 17:25:50 +02:00
lookshe	d64aa6407c	Merge remote-tracking branch 'origin/trz/master' into trz/master	2015-04-12 17:24:10 +02:00
lookshe	cae106e310	whatsapp-like smiley implementation	2015-04-12 17:22:53 +02:00
lookshe	972c65b775	whatsapp-like smiley implemantation	2015-04-12 17:21:35 +02:00
lookshe	fd5f36b864	adjusted todo	2015-04-12 12:09:18 +02:00
steckbrief	deac0df707	Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master	2015-04-11 23:00:31 +02:00
steckbrief	17779e7700	Color choose dialog	2015-04-11 23:00:10 +02:00
lookshe	82bfd8ac33	show online status under avatar in same way for muc as the send button does	2015-04-11 21:49:48 +02:00
lookshe	ae520c2957	differ between received and read message	2015-04-11 21:48:55 +02:00
lookshe	94a669fcb8	no trim of messages or password check password with only spaces separately	2015-04-11 20:53:25 +02:00
lookshe	3a814addab	correct parsing of led color	2015-04-11 20:23:25 +02:00
lookshe	c829f612cd	todo added	2015-04-11 17:24:06 +02:00
lookshe	df63c14617	Merge branch 'trz/master' of ssh://git.fucktheforce.de/conversations into trz/master	2015-04-11 14:15:07 +02:00
lookshe	87e56b534a	changed distribution url due to bug: http://stackoverflow.com/questions/29576097/gradle-sync-error-in-android-studio-when-importing-project/29576568#29576568	2015-04-11 14:14:43 +02:00
steckbrief	e17b75511e	timestamp parsing reverted	2015-03-31 16:30:47 +02:00
steckbrief	6220260df3	Configurable LED color (Attention: Expert setting because currently only text input)	2015-03-31 15:26:26 +02:00
steckbrief	52ed924a13	Changes for emoticon parser reactivated	2015-03-31 14:13:12 +02:00
steckbrief	75c5275f7e	Merge tag '1.2.0' into trz/master Conflicts: src/main/java/eu/siacs/conversations/parser/AbstractParser.java src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/res/values-de/strings.xml src/main/res/xml/preferences.xml	2015-03-30 22:12:49 +02:00
steckbrief	c8fe93cf0a	- Some comments to refer to the XEPs added - parseTimestamp method changed to use the XMLGregorianCalendar (refer to XEP-0082 and subsequently Date/DateTime definition of XML Schema Part 2, http://www.w3.org/TR/xmlschema-2/#date, http://www.w3.org/TR/xmlschema-2/#dateTime) a small test comparing the original implementation with the XMLGregorianCalendar implementation showed a significant performance improvement (about 0.1s on windows 7 64bit, AMD-A6 1.8GHz, 16GB RAM, Android Studio + Eclipse + Firefox running)	2015-02-21 00:12:15 +01:00
steckbrief	20eae39557	Merge master-origin Conflicts: src/main/java/eu/siacs/conversations/ui/SettingsActivity.java src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java src/main/res/values-de/strings.xml	2015-02-20 22:19:31 +01:00
steckbrief	980a84a6ce	ToDo modified	2015-02-20 21:09:20 +01:00
lookshe	c67ed416a1	modified TODO	2015-02-19 10:14:17 +01:00
lookshe	0f169e8dbe	added section to TODO	2015-02-13 09:22:50 +01:00
lookshe	77c19f81dc	some more in TODO	2015-02-13 00:25:10 +01:00
lookshe	aed8c64e54	add TODO	2015-02-07 13:06:15 +01:00
steckbrief	46bbf1ce5f	- Avoiding accessing shared preferences to know if emoticons should be parsed for every single message - Adding support to show online status in Conversations overview (configurable via the setting "send_button_status")	2015-01-20 22:42:53 +01:00
Tristan Zur	e8ca2a1ae3	Merge branch 'master' of ssh://git.fucktheforce.de/conversations Conflicts: src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java	2015-01-11 02:39:39 +01:00
Tristan Zur	5a860416b5	Setting added for parsing emoticons or not	2015-01-11 01:40:25 +01:00
lookshe	71bb1e90b0	changes to get it working under eclipse	2015-01-10 23:11:07 +01:00
Tristan Zur	0464a6a3fa	Fixed missing symbol for eu.siacs.conversations.Config and wrong parameter for method eu.siacs.conversations.utils.UIHelper.transformAscii..	2015-01-10 22:17:51 +01:00
lookshe	95e2a53951	Merge branch 'master' of ssh://git.fucktheforce.de/conversations Conflicts: src/main/java/eu/siacs/conversations/Config.java src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java src/main/java/eu/siacs/conversations/utils/UIHelper.java	2015-01-03 23:19:05 +01:00
lookshe	48717dd7d3	remaining part of my patch	2015-01-03 21:31:56 +01:00
lookshe	6e3e58e3c8	added smilies from patch. remaining changes will follow later	2015-01-03 17:43:42 +01:00