Increased version number to release

2025-09-01 06:35:09 +00:00 · 2014-03-02 20:17:27 +01:00
456 changed files with 7350 additions and 43847 deletions
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,3 +0,0 @@
-{
-  "phabricator.uri" : "https://phabricator.kde.org/project/profile/159/"
-}
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +0,0 @@
-*.bat text eol=crlf
--- a/.gitignore
+++ b/.gitignore
@@ -2,14 +2,6 @@ local.properties
 .gradle/
 .idea/
 out/
-gen/
-bin/
 build/
 target/
-classes/
-gradle
-*.iml
-*.keystore
-!debug.keystore
-.directory
-GPUCache/
+classes/
--- a/.gitlab/merge_request_templates/Bugfix.md
+++ b/.gitlab/merge_request_templates/Bugfix.md
@@ -1,32 +0,0 @@
-## Summary
-
-Add a description of your merge request here. What does your new feature do?
-
-Describe in detail what your patch does, why it does that, etc. Merge requests
-without an adequate description are difficult to review, and probably we will
-ask for more information!
-
-Please also keep this description up-to-date with any discussion that takes
-place so that reviewers can understand your intent. This is especially
-important if they didn't participate in the discussion.
-
-Make sure to remove this comment when you are done.
-
-Fill in the following lines as appropriate to automatically close GitLab issue or Bugzilla bugs
-Fixes <!-- Gitlab Issue Number -->
-BUG: <!-- bugzilla bug -->
-
-## Test Plan
-
-### Before:
-Add a quick discription of the (buggy) behavior of the app before this fix
-This section does not need to be too detailed because it should mostly be
-covered by the bug report and the summary. Just share the steps for how to
-reproduce the bug.
-
-### After:
-Add a more detailed description of how to exercise the new behavior, showing
-that the bug has been fixed. If any other behavior has been changed, share
-the steps to verify that the new behavior doesn't have any regressions.
-
-/label ~bugfix
--- a/.gitlab/merge_request_templates/Feature.md
+++ b/.gitlab/merge_request_templates/Feature.md
@@ -1,27 +0,0 @@
-## Summary
-
-Add a description of your merge request here. What does your new feature do?
-
-Describe in detail what your patch does, why it does that, etc. Merge requests
-without an adequate description are difficult to review, and probably we will
-ask for more information!
-
-Please also keep this description up-to-date with any discussion that takes
-place so that reviewers can understand your intent. This is especially
-important if they didn't participate in the discussion.
-
-Make sure to remove this comment when you are done.
-
-Implements <!-- GitLab Issue Number -->
-
-## Test Plan
-
-Add a description of how to test your patch here. Tell us how to use the new
-feature and what we should be seeing. If applicable, it is great to include
-screenshots, either here or in the Summary section.
-
-It can be difficult to understand a new feature from the text description in
-the summary, so put enough detail here that so that we can understand how to run
-the new feature and we can play with it ourselves to understand it.
-
-/label ~feature
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,403 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.kde.kdeconnect_tp"
-    android:versionCode="11421"
-    android:versionName="1.14.2">
-
-    <supports-screens
-        android:anyDensity="true"
-        android:largeScreens="true"
-        android:normalScreens="true"
-        android:smallScreens="true"
-        android:xlargeScreens="true" />
-
-    <uses-feature
-        android:name="android.hardware.telephony"
-        android:required="false" />
-
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <!-- <uses-permission android:name="android.permission.BLUETOOTH" /> -->
-    <!-- <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" /> -->
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
-    <uses-permission android:name="android.permission.READ_CONTACTS" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.VIBRATE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.DOWNLOAD_WITHOUT_NOTIFICATION" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.READ_CALL_LOG" />
-    <uses-permission android:name="android.permission.SEND_SMS" />
-    <uses-permission android:name="android.permission.READ_SMS" />
-    <uses-permission android:name="android.permission.WRITE_SMS" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" />
-    <uses-permission android:name="android.permission.RECEIVE_MMS" />
-    <uses-permission android:name="android.provider.Telephony.SMS_RECEIVED" />
-    <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES" />
-    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-
-
-
-    <application
-        android:icon="@drawable/icon"
-        android:label="KDE Connect"
-        android:supportsRtl="true"
-        android:allowBackup="false"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:theme="@style/KdeConnectTheme"
-        android:name="org.kde.kdeconnect.MyApplication">
-        <receiver
-            android:name="org.kde.kdeconnect.Plugins.SMSPlugin.SmsReceiver"
-            android:exported="true"
-            android:permission="android.permission.BROADCAST_SMS">
-            <intent-filter>
-                <action android:name="android.provider.Telephony.SMS_DELIVER" />
-            </intent-filter>
-            <intent-filter android:priority="999">
-                <action android:name="android.provider.Telephony.SMS_RECEIVED" />
-            </intent-filter>
-        </receiver>
-
-        <receiver
-            android:name="org.kde.kdeconnect.Plugins.SMSPlugin.SmsSentReceiver"
-            android:exported="true"
-            android:taskAffinity="${applicationId}.SMS_SENT" />
-
-        <receiver
-            android:name="com.android.mms.transaction.PushReceiver"
-            android:exported="true"
-            android:permission="android.permission.BROADCAST_WAP_PUSH">
-            <intent-filter>
-                <action android:name="android.provider.Telephony.WAP_PUSH_DELIVER" />
-
-                <data android:mimeType="application/vnd.wap.mms-message" />
-            </intent-filter>
-        </receiver>
-
-        <receiver
-            android:name="org.kde.kdeconnect.Plugins.SMSPlugin.DelegatingMmsReceivedReceiver"
-            android:enabled="true"
-            android:exported="true"
-            android:taskAffinity="com.klinker.android.messaging.MMS_RECEIVED" />
-
-        <receiver
-            android:name="org.kde.kdeconnect.Plugins.SMSPlugin.MmsSentReceiver"
-            android:exported="true"
-            android:enabled="true"
-            android:taskAffinity="com.klinker.android.messaging.MMS_SENT" />
-
-        <service
-            android:name="org.kde.kdeconnect.Plugins.SMSPlugin.HeadlessSmsSendService"
-            android:exported="true"
-            android:permission="android.permission.SEND_RESPOND_VIA_MESSAGE">
-            <intent-filter>
-                <action android:name="android.intent.action.RESPOND_VIA_MESSAGE" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:scheme="sms" />
-                <data android:scheme="smsto" />
-                <data android:scheme="mms" />
-                <data android:scheme="mmsto" />
-            </intent-filter>
-        </service>
-
-        <service
-            android:name="com.android.mms.transaction.TransactionService"
-            android:enabled="true"
-            android:exported="true" />
-
-        <service
-            android:name="org.kde.kdeconnect.BackgroundService"
-            android:enabled="true" />
-        <service
-            android:name="org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardService"
-            android:label="@string/remote_keyboard_service"
-            android:permission="android.permission.BIND_INPUT_METHOD">
-            <intent-filter>
-                <action android:name="android.view.InputMethod" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.view.im"
-                android:resource="@xml/remotekeyboardplugin_method" />
-        </service>
-
-        <activity
-            android:name="org.kde.kdeconnect.UserInterface.MainActivity"
-            android:label="KDE Connect"
-            android:theme="@style/KdeConnectTheme.NoActionBar">
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-                <action android:name="android.intent.action.SENDTO" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data android:scheme="sms" />
-                <data android:scheme="smsto" />
-                <data android:scheme="mms" />
-                <data android:scheme="mmsto" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-
-                <category android:name="android.intent.category.LAUNCHER" />
-                <category android:name="android.app.role.SMS"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="image/*" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="org.kde.kdeconnect.UserInterface.PluginSettingsActivity"
-            android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-        <activity
-            android:name="org.kde.kdeconnect.UserInterface.CustomDevicesActivity"
-            android:label="@string/custom_devices_settings"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.SharePlugin.SendFileActivity"
-            android:label="KDE Connect"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-
-        <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.PACKAGE_REPLACED" />
-
-                <data
-                    android:host="kdeconnect"
-                    android:path="/"
-                    android:scheme="package" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MY_PACKAGE_REPLACED"/>
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.BOOT_COMPLETED" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
-            </intent-filter>
-        </receiver>
-
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhoneActivity"
-            android:configChanges="orientation|screenSize"
-            android:excludeFromRecents="true"
-            android:label="@string/findmyphone_title"
-            android:launchMode="singleInstance" />
-
-        <receiver android:name="org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhoneReceiver">
-            <intent-filter>
-                <action android:name="org.kde.kdeconnect.Plugins.FindMyPhonePlugin.foundIt" />
-            </intent-filter>
-        </receiver>
-
-        <!-- Plugin-related activities and services -->
-
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.ClibpoardPlugin.ClipboardFloatingActivity"
-            android:theme="@style/Theme.Transparent"
-            android:excludeFromRecents="true"/>
-
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
-            android:label="@string/open_mpris_controls"
-            android:launchMode="singleTop"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-
-        <receiver android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisMediaNotificationReceiver">
-            <intent-filter>
-                <action android:name="android.intent.action.MEDIA_BUTTON" />
-            </intent-filter>
-        </receiver>
-
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandActivity"
-            android:label="@string/pref_plugin_runcommand"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandWidgetDeviceSelector"
-            android:excludeFromRecents="true"
-            android:label="@string/pref_plugin_runcommand"
-            android:launchMode="singleTask"
-            android:noHistory="true"
-            android:screenOrientation="user"
-            android:theme="@style/Theme.AppCompat.Light.Dialog" />
-
-        <service
-            android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandWidgetDataProviderService"
-            android:exported="false"
-            android:permission="android.permission.BIND_REMOTEVIEWS" />
-
-        <receiver
-            android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandWidget"
-            android:label="@string/pref_plugin_runcommand">
-            <intent-filter>
-                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="RUN_COMMAND_ACTION" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.appwidget.provider"
-                android:resource="@xml/remotecommandplugin_widget" />
-        </receiver>
-
-        <activity android:name="org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandUrlActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
-                <action android:name="android.nfc.action.NDEF_DISCOVERED" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-                <category android:name="android.intent.category.BROWSABLE" />
-
-                <data
-                    android:host="runcommand"
-                    android:scheme="kdeconnect" />
-            </intent-filter>
-        </activity>
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.BigscreenPlugin.BigscreenActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/pref_plugin_bigscreen"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadActivity"
-            android:label="@string/pref_plugin_mousepad"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.PresenterPlugin.PresenterActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
-            android:label="@string/pref_plugin_presenter"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareActivity"
-            android:label="KDE Connect">
-            <intent-filter>
-                <action android:name="android.intent.action.SEND" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="*/*" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.SEND_MULTIPLE" />
-
-                <category android:name="android.intent.category.DEFAULT" />
-
-                <data android:mimeType="*/*" />
-            </intent-filter>
-
-            <meta-data
-                android:name="android.service.chooser.chooser_target_service"
-                android:value="org.kde.kdeconnect.Plugins.SharePlugin.ShareChooserTargetService" />
-        </activity>
-
-        <receiver android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareBroadcastReceiver">
-            <intent-filter>
-                <action android:name="org.kde.kdeconnect.Plugins.SharePlugin.CancelShare" />
-            </intent-filter>
-        </receiver>
-
-        <provider
-            android:name="androidx.core.content.FileProvider"
-            android:authorities="org.kde.kdeconnect_tp.fileprovider"
-            android:exported="false"
-            android:grantUriPermissions="true">
-            <meta-data
-                android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/fileprovider_paths" />
-        </provider>
-
-        <service
-            android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationReceiver"
-            android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
-            <intent-filter>
-                <action android:name="android.service.notification.NotificationListenerService" />
-            </intent-filter>
-        </service>
-        <service
-            android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareChooserTargetService"
-            android:permission="android.permission.BIND_CHOOSER_TARGET_SERVICE">
-            <intent-filter>
-                <action android:name="android.service.chooser.ChooserTargetService" />
-            </intent-filter>
-        </service>
-
-        <activity
-            android:name="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity"
-            android:label="@string/title_activity_notification_filter"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.PluginSettingsActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" />
-        </activity>
-
-        <activity android:name="org.kde.kdeconnect.Plugins.PhotoPlugin.PhotoActivity" />
-
-        <activity
-            android:name="org.kde.kdeconnect.UserInterface.TrustedNetworksActivity"
-            android:label="@string/trusted_networks"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
-            <meta-data
-                android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
-        </activity>
-
-
-    </application>
-
-</manifest>
--- a/README.md
+++ b/README.md
@@ -1,37 +0,0 @@
-# KDE Connect - Android app
-
-KDE Connect is a multi-platform app that allows your devices to communicate (eg: your phone and your computer).
-
-## (Some) Features
- **Shared clipboard**: copy and paste between your phone and your computer (or any other device).
- **Notification sync**: Read and reply to your Android notifications from the desktop.
- **Share files and URLs** instantly from one device to another.
- **Multimedia remote control**: Use your phone as a remote for Linux media players.
- **Virtual touchpad**: Use your phone screen as your computer's touchpad and keyboard.
-
-All this without wires, over the already existing WiFi network, and using TLS encryption.
-
-## About this app
-
-This is a native Android port of the KDE Connect Qt app. You will find a more complete readme about KDE Connect [here](https://github.com/KDE/kdeconnect-kde).
-
-## How to install this app
-
-You can install this app from the [Play Store](https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp) as well as [F-Droid](https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp). Note you will also need to install the [desktop app](https://github.com/KDE/kdeconnect-kde) for it to work.
-
-## Contributing
-
-A lot of useful information, including how to get started working on KDE Connect and how to connect with the current developers, is on our [KDE Community Wiki page](https://community.kde.org/KDEConnect)
-
-For bug reporting, please use [KDE's Bugzilla](https://bugs.kde.org). Please do not use the issue tracker in GitLab since we want to keep everything in one place.
-
-To contribute patches, use [KDE Connect's Gitlab](https://invent.kde.org/kde/kdeconnect-android/).
-On Gitlab (as well as on our [old Phabricator](https://phabricator.kde.org/tag/kde_connect/)) you can find a task list with stuff to do and links to other relevant resources.
-It is a good idea to also subscribe to the [KDE Connect mailing list](https://mail.kde.org/mailman/listinfo/kdeconnect).
-
-Please know that all translations for all KDE apps are handled by the [localization team](https://l10n.kde.org/). If you would like to submit a translation, that should be done by working with the proper team for that language.
-
-## License
-[GNU GPL v2](https://www.gnu.org/licenses/gpl-2.0.html) and [GNU GPL v3](https://www.gnu.org/licenses/gpl-3.0.html)
-
-If you are reading this from Github, you should know that this is just a mirror of the [KDE Project repo](https://projects.kde.org/projects/extragear/network/kdeconnect-android/repository/).
--- a/StaticMessages.sh
+++ b/StaticMessages.sh
@@ -7,7 +7,7 @@ function export_pot_file # First parameter will be the path of the pot file we h
 {
 	potfile=$1
 	mkdir outdir
-	ANSI_COLORS_DISABLED=1 a2po export --android res/ --gettext outdir
+	a2po export --android src/main/res/ --gettext outdir
 	mv outdir/template.pot $potfile
 	rm -rf outdir
 }
@@ -15,13 +15,7 @@ function export_pot_file # First parameter will be the path of the pot file we h
 function import_po_files # First parameter will be a path that will contain several .po files with the format LANG.po
 {
 	podir=$1
-	# Android doesn't support languages with an @
-	find "$podir" -type f -name "*@*.po" -delete
-	# drop obsolete messages, as Babel cannot parse them -- see:
-	# https://github.com/python-babel/babel/issues/206
-	# https://github.com/python-babel/babel/issues/566
-	find "$podir" -name '*.po' -exec msgattrib --no-obsolete -o {} {} \;
-	ANSI_COLORS_DISABLED=1 a2po import --ignore-fuzzy --android res/ --gettext $podir
+	a2po import --android src/main/res/ --gettext $podir
 }


--- a/build.gradle
+++ b/build.gradle
@@ -1,201 +1,40 @@
-import com.android.build.gradle.AppExtension
-import com.android.build.gradle.api.ApkVariantOutput
-import com.android.build.gradle.api.ApplicationVariant
-
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-
 buildscript {
-    ext.kotlin_version = '1.3.72'
    repositories {
-        jcenter()
-        google()
+        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        classpath 'com.android.tools.build:gradle:0.7.+'
    }
 }

+apply plugin: 'android'
+
 android {
-    compileSdkVersion 29
+    compileSdkVersion 19
+    buildToolsVersion "19"
+
    defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 29
-        proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-
-        multiDexEnabled true
-    }
-    dexOptions {
-        javaMaxHeapSize "2g"
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-
-        // Flag to enable support for the new language APIs
-        coreLibraryDesugaringEnabled true
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            resources.srcDirs = ['resources']
-            res.srcDirs = ['res']
-            assets.srcDirs = ['assets']
-        }
-        test {
-            java.srcDirs = ['tests']
-        }
+        minSdkVersion 9
+        targetSdkVersion 19
    }
    packagingOptions {
-        merge "META-INF/DEPENDENCIES"
-        merge "META-INF/LICENSE"
-        merge "META-INF/NOTICE"
+        exclude "META-INF/DEPENDENCIES"
+        exclude "META-INF/NOTICE"
+        exclude "META-INF/LICENSE"
+        exclude "META-INF/LICENSE.txt"
+        exclude "META-INF/NOTICE.txt"
    }
-    lintOptions {
-        abortOnError false
-        checkReleaseBuilds false
-    }
-    signingConfigs {
-        debug {
-            storeFile file("debug.keystore")
-            storePassword 'android'
-            keyAlias 'androiddebugkey'
-            keyPassword 'android'
-        }
-    }
-    buildTypes {
-        debug {
-            minifyEnabled true
-            signingConfig signingConfigs.debug
-        }
-        // keep minifyEnabled false above for faster builds; set to 'true'
-        // when testing to make sure ProGuard/R8 is not deleting important stuff
-        release {
-            minifyEnabled true
-        }
-    }
-}
-
-/**
- * This is a special on-demand Gradle object.
- *
- * Its value will not be determined until someone calls one of the gitHashProvider.getXXX() methods.
- *
- * If it does not encounter an explicit 'return' statement, getHashProvider.isPresent() will return false.
- */
-Provider<String> gitHashProvider = project.provider {
-    Process gitCommand = null
-    try {
-        // This invokes 'git' immediately, but does not wait for it to finish
-        gitCommand = 'git rev-parse --short HEAD'.execute([], project.rootDir)
-    } catch (IOException ignored) {
-    }
-
-    if (gitCommand == null) {
-        logger.log(LogLevel.WARN, "Could not make use of the 'git' command-line tool. Output filenames will not be customized.")
-    } else if (gitCommand.waitFor() == 0) {
-        // This call to '::getText' (using the 'text' Groovy accessor syntax) collects the
-        // output stream
-        return '-' + gitCommand.text.trim()
-    } else {
-        logger.log(
-                LogLevel.WARN,
-                "Could not determine which commit is currently checked out -" +
-                        " did you download this code without the .git directory?"
-        )
-    }
-}
-
-// We know we can safely cast the 'android' type to the 'AppExtension' class because
-// we used the 'com.android.application' plugin at the top of the file.
-//
-// Note the use of the '::all' extension method; unlike '::each', it can detect every
-// object added to the collection, no matter in which build phase that happens.
-(android as AppExtension).applicationVariants.all { ApplicationVariant v ->
-    logger.log(LogLevel.INFO, "Found a variant called '${v.name}'.")
-    if (v.buildType.debuggable) {
-        // We're looking at variants made from android.buildTypes.debug! This one
-        // might have multiple outputs, but only one output will be an APK file.
-        v.outputs.matching { it instanceof ApkVariantOutput }.all {
-            // Default output filename is "${project.name}-${v.name}.apk". We want
-            // the Git commit short-hash to be added onto that default filename.
-            (it as ApkVariantOutput).outputFileName = "${project.name}-${v.name}${gitHashProvider.getOrElse("")}.apk"
-        }
-    }
-}
-
-ext {
-    coroutines_version = '1.3.6'
 }

 dependencies {
-
    repositories {
-        jcenter()
-        google()
-        /* Needed for org.apache.sshd debugging
-        maven {
-            url "https://jitpack.io"
-        }
-        */
+        mavenCentral()
    }
-
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.0.9'
-    implementation 'androidx.multidex:multidex:2.0.1'
-
-    implementation 'androidx.media:media:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.3.0'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.0.0'
-    implementation 'androidx.documentfile:documentfile:1.0.1'
-    implementation 'androidx.lifecycle:lifecycle-runtime:2.2.0'
-    implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"
-    implementation 'androidx.lifecycle:lifecycle-common-java8:2.2.0'
-    implementation 'androidx.gridlayout:gridlayout:1.0.0'
-    implementation 'com.google.android.material:material:1.1.0'
-    implementation 'com.jakewharton:disklrucache:2.0.2' //For caching album art bitmaps
-    implementation 'com.jaredrummler:android-device-names:1.1.9' //To get a human-friendly device name
-
-    implementation 'org.apache.sshd:sshd-core:0.14.0'
-    implementation 'org.apache.mina:mina-core:2.0.19' //For some reason, makes sshd-core:0.14.0 work without NIO, which isn't available until Android 8 (api 26)
-
-    //implementation('com.github.bright:slf4android:0.1.6') { transitive = true } // For org.apache.sshd debugging
-    implementation 'com.madgag.spongycastle:bcpkix-jdk15on:1.58.0.0' //For SSL certificate generation
-
-    //noinspection AnnotationProcessorOnCompilePath - c.f. https://issuetracker.google.com/issues/140881211
-    implementation 'com.jakewharton:butterknife:10.2.1'
-    annotationProcessor 'com.jakewharton:butterknife-compiler:10.0.0'
-
-    implementation 'org.atteo.classindex:classindex:3.6'
-    annotationProcessor 'org.atteo.classindex:classindex:3.6'
-
-    implementation 'com.klinkerapps:android-smsmms:5.2.6' //For SMS and MMS purposes
-
-    implementation 'commons-io:commons-io:2.7'
-    implementation 'org.apache.commons:commons-collections4:4.4'
-
-    // Kotlin
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutines_version"
-
-    // Testing
-    testImplementation 'junit:junit:4.12'
-    testImplementation 'org.powermock:powermock-core:2.0.0'
-    testImplementation 'org.powermock:powermock-module-junit4:2.0.0'
-    testImplementation 'org.powermock:powermock-api-mockito2:2.0.0'
-    testImplementation 'org.mockito:mockito-core:2.23.0'
-    testImplementation 'org.skyscreamer:jsonassert:1.3.0'
-}
-
-repositories {
-    google()
-    mavenCentral()
+    compile "com.android.support:support-v4:19.0.+"
+    compile "com.android.support:appcompat-v7:19.0.+"
+    compile "org.apache.mina:mina-core:2.0.+"
+    compile 'org.bouncycastle:bcprov-jdk16:1.45'
+    compile 'org.apache.sshd:sshd-core:0.8.0'
+    compile 'tomcat:tomcat-apr:5.5.+'
+    //compile fileTree(dir: 'libs', include: '*.jar')
 }
--- a/debug.keystore
+++ b/debug.keystore
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,3 +0,0 @@
-android.enableJetifier=true
-android.useAndroidX=true
-org.gradle.jvmargs=-Xmx4096m
--- a/gradle/wrapper/gradle-wrapper.jar
+++ b/gradle/wrapper/gradle-wrapper.jar
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Jun 23 12:30:12 CEST 2020
+#Sun Jan 12 12:44:14 MSK 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.9-all.zip
--- a/147
+++ b/147
@@ -1,20 +1,4 @@
-#!/usr/bin/env sh
-
-#
-# Copyright 2015 the original author or authors.
-#
-# 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
-#
-#      https://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.
-#
+#!/usr/bin/env bash

 ##############################################################################
 ##
@@ -22,6 +6,47 @@
 ##
 ##############################################################################

+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+    echo "$*"
+}
+
+die ( ) {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+esac
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
+
 # Attempt to set APP_HOME
 # Resolve links: $0 may be a link
 PRG="$0"
@@ -36,49 +61,9 @@ while [ -h "$PRG" ] ; do
    fi
 done
 SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
+cd "`dirname \"$PRG\"`/" >&-
 APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn () {
-    echo "$*"
-}
-
-die () {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
-esac
+cd "$SAVED" >&-

 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

@@ -105,7 +90,7 @@ location of your Java installation."
 fi

 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
    MAX_FD_LIMIT=`ulimit -H -n`
    if [ $? -eq 0 ] ; then
        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -125,11 +110,10 @@ if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi

-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    JAVACMD=`cygpath --unix "$JAVACMD"`

    # We build the pattern for arguments to be converted via cygpath
    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
@@ -154,30 +138,27 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
        else
            eval `echo args$i`="\"$arg\""
        fi
-        i=`expr $i + 1`
+        i=$((i+1))
    done
    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi

-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
 }
-APP_ARGS=`save "$@"`
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -24,17 +8,14 @@
@rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal

+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 set DIRNAME=%~dp0
 if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%

-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
-
@rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome

@@ -65,9 +46,10 @@ echo location of your Java installation.
 goto fail

 :init
-@rem Get command-line arguments, handling Windows variants
+@rem Get command-line arguments, handling Windowz variants

 if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_args

 :win9xME_args
@rem Slurp the command line arguments.
@@ -78,6 +60,11 @@ set _SKIP=2
 if "x%~1" == "x" goto execute

 set CMD_LINE_ARGS=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+set CMD_LINE_ARGS=%$

 :execute
@rem Setup the command line
--- a/icon.svg
+++ b/icon.svg
@@ -14,11 +14,8 @@
   height="274.43201"
   id="svg2"
   version="1.1"
-   inkscape:version="0.91 r"
-   sodipodi:docname="icon.svg"
-   inkscape:export-filename="/home/vaka/kdeconnect/kdeconnect-android/res/drawable-mdpi/icon.png"
-   inkscape:export-xdpi="15.741604"
-   inkscape:export-ydpi="15.741604">
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="kdeconnect.svg">
  <defs
     id="defs4">
    <linearGradient
@@ -68,6 +65,18 @@
         offset="1"
         id="stop4280" />
    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient4153">
+      <stop
+         style="stop-color:#000000;stop-opacity:1;"
+         offset="0"
+         id="stop4155" />
+      <stop
+         style="stop-color:#000000;stop-opacity:0"
+         offset="1"
+         id="stop4157" />
+    </linearGradient>
    <linearGradient
       id="linearGradient3994">
      <stop
@@ -507,6 +516,43 @@
       y2="967.36218"
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(-296.98485,-295.9747)" />
+    <filter
+       inkscape:collect="always"
+       id="filter3898"
+       x="-0.0093191492"
+       width="1.0186383"
+       y="-0.14599991"
+       height="1.2919998">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.91250003"
+         id="feGaussianBlur3900" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3902">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.91250003"
+         id="feGaussianBlur3904" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter3935">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.5499999"
+         id="feGaussianBlur3937" />
+    </filter>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3994"
+       id="linearGradient4000"
+       x1="-61.213001"
+       y1="-85.49823"
+       x2="238.787"
+       y2="424.50177"
+       gradientUnits="userSpaceOnUse" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient3994-1"
@@ -567,6 +613,52 @@
         offset="1"
         id="stop3998-2" />
    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4153"
+       id="linearGradient4159"
+       x1="130"
+       y1="1052.3622"
+       x2="130"
+       y2="1032.3622"
+       gradientUnits="userSpaceOnUse" />
+    <filter
+       inkscape:collect="always"
+       id="filter4182"
+       x="-0.0093191487"
+       width="1.0186383"
+       y="-0.146"
+       height="1.292">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.91249998"
+         id="feGaussianBlur4184" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter4186">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.91249998"
+         id="feGaussianBlur4188" />
+    </filter>
+    <filter
+       color-interpolation-filters="sRGB"
+       inkscape:collect="always"
+       id="filter3935-5">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.5499999"
+         id="feGaussianBlur3937-7" />
+    </filter>
+    <filter
+       inkscape:collect="always"
+       id="filter4253">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="0.54999983"
+         id="feGaussianBlur4255" />
+    </filter>
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient4276"
@@ -588,7 +680,7 @@
       gradientUnits="userSpaceOnUse"
       gradientTransform="translate(415.17269,-239.40615)" />
    <linearGradient
-       gradientTransform="matrix(1.838244,0,0,1.760204,-248.41104,-733.67334)"
+       gradientTransform="matrix(1.5765306,0,0,1.5765306,-240.12657,-563.0272)"
       inkscape:collect="always"
       xlink:href="#linearGradient4303-8"
       id="linearGradient4309-4"
@@ -609,6 +701,25 @@
         offset="1"
         id="stop4307-0" />
    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4022"
+       id="linearGradient4028"
+       x1="338.78699"
+       y1="-145.49823"
+       x2="388.78699"
+       y2="-25.498228"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5765306,0,0,1.5765306,-382.12995,246.43833)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient4022"
+       id="linearGradient4052"
+       x1="141.07115"
+       y1="130.60065"
+       x2="243.84538"
+       y2="130.60065"
+       gradientUnits="userSpaceOnUse" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient4123"
@@ -728,38 +839,45 @@
         offset="1"
         id="stop3998-0" />
    </linearGradient>
+    <filter
+       inkscape:collect="always"
+       id="filter4199">
+      <feGaussianBlur
+         inkscape:collect="always"
+         stdDeviation="2.555"
+         id="feGaussianBlur4201" />
+    </filter>
  </defs>
  <sodipodi:namedview
     id="base"
-     pagecolor="#ffffff"
+     pagecolor="#000000"
     bordercolor="#9d4f2f"
     borderopacity="1"
-     inkscape:pageopacity="0"
+     inkscape:pageopacity="0.51372549"
     inkscape:pageshadow="2"
-     inkscape:zoom="2"
-     inkscape:cx="118.88075"
-     inkscape:cy="143.06055"
+     inkscape:zoom="0.7"
+     inkscape:cx="237.10108"
+     inkscape:cy="152.16765"
     inkscape:document-units="px"
     inkscape:current-layer="layer1"
     showgrid="true"
     showguides="true"
     inkscape:guide-bbox="true"
-     inkscape:window-width="1920"
-     inkscape:window-height="1017"
-     inkscape:window-x="-4"
-     inkscape:window-y="0"
+     inkscape:window-width="1366"
+     inkscape:window-height="713"
+     inkscape:window-x="0"
+     inkscape:window-y="-3"
     inkscape:window-maximized="1"
     fit-margin-top="0"
     fit-margin-left="0"
     fit-margin-right="0"
-     fit-margin-bottom="0"
-     showborder="true">
+     fit-margin-bottom="0">
    <inkscape:grid
       type="xygrid"
       id="grid2985"
       empspacing="5"
       visible="true"
-       enabled="false"
+       enabled="true"
       snapvisiblegridlinesonly="true"
       originx="8.7869998px"
       originy="9.9302358px" />
@@ -767,6 +885,10 @@
       orientation="1,0"
       position="8.7869998,239.93024"
       id="guide2989" />
+    <sodipodi:guide
+       orientation="0,1"
+       position="201.787,265.93024"
+       id="guide2991" />
    <sodipodi:guide
       orientation="1,0"
       position="263.787,-0.0697642"
@@ -777,7 +899,11 @@
       id="guide2995" />
    <sodipodi:guide
       orientation="1,0"
-       position="263.787,296.98485"
+       position="118.787,309.93024"
+       id="guide4512" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="158.787,289.93024"
       id="guide4514" />
    <sodipodi:guide
       orientation="0,1"
@@ -785,8 +911,20 @@
       id="guide3939" />
    <sodipodi:guide
       orientation="0,1"
-       position="-434.64286,137.14286"
+       position="148.787,89.930236"
       id="guide3941" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="223.787,174.93024"
+       id="guide3942" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="203.787,179.93024"
+       id="guide3944" />
+    <sodipodi:guide
+       orientation="1,0"
+       position="63.787,39.930236"
+       id="guide4111" />
    <sodipodi:guide
       orientation="1,0"
       position="128.787,19.930236"
@@ -800,7 +938,7 @@
        <dc:format>image/svg+xml</dc:format>
        <dc:type
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title></dc:title>
+        <dc:title />
        <dc:creator>
          <cc:Agent>
            <dc:title>Malcer</dc:title>
@@ -814,31 +952,83 @@
     inkscape:groupmode="layer"
     id="layer1"
     transform="translate(8.7869998,-787.86042)">
+    <rect
+       style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter4199)"
+       id="rect3908-2"
+       width="255"
+       height="256"
+       x="-7.9314225e-07"
+       y="796.36218"
+       rx="10"
+       ry="9.0819159"
+       transform="matrix(1.0053352,0,0,1.0053352,0.03271549,-4.2160417)" />
+    <rect
+       style="opacity:0.2;fill:#b3b3b3;fill-opacity:1;stroke:none"
+       id="rect3908-8"
+       width="259"
+       height="260"
+       x="-2"
+       y="794.36218"
+       rx="12"
+       ry="11.000009" />
+    <rect
+       style="fill:url(#linearGradient4000);fill-opacity:1;stroke:none"
+       id="rect3908"
+       width="255"
+       height="256"
+       x="8.7869997"
+       y="8.5017672"
+       transform="translate(-8.7869998,787.86042)"
+       rx="10"
+       ry="9.0819159" />
+    <rect
+       style="opacity:0.2;fill:url(#linearGradient4159);fill-opacity:1;stroke:none"
+       id="rect3908-1"
+       width="255"
+       height="229.99998"
+       x="0"
+       y="822.36218"
+       rx="10"
+       ry="9.0819159" />
    <path
-       style="fill:#f5f5f5;fill-opacity:1;stroke:none"
-       d="m 64.090487,801.86214 128.677053,0 c 5.09194,0 9.19121,3.92526 9.19121,8.80103 l 0,44.00509 -11.02945,0 0,-40.48469 -125.000587,0 0,214.74493 125.000587,0 0,-174.26024 11.02945,0 0,184.82144 c 0,4.8757 -4.09927,8.801 -9.19121,8.801 l -128.677053,0 c -5.091955,0 -9.191239,-3.9253 -9.191239,-8.801 l 0,-228.82653 c 0,-4.87577 4.099284,-8.80103 9.191239,-8.80103 z"
+       style="opacity:0.1;fill:#000000;fill-opacity:1;stroke:none"
+       d="m 33.787,244.50177 115,-219.999999 115,139.999999 0,90 0,0 0,0 c 0,0 0,-10 0,0 0,10 -10.11244,10 -10.11244,10 l -204.88756,0 z"
+       id="path4311"
+       inkscape:connector-curvature="0"
+       transform="translate(-8.7869998,787.86042)"
+       sodipodi:nodetypes="cccccczccc" />
+    <path
+       style="fill:#ffffff;fill-opacity:1;stroke:none;opacity:0.2"
+       d="m 18.787,8.5017668 c 10,0 227,8.4e-6 235,4.2e-6 8,-4.2e-6 10,7 10,9 0,2 0,2 0,2 -1,-4 -5,-6 -8,-6 -82.05383,0 -156.925223,0 -239,0 -4,0 -7.014667,3.536667 -8.0000003,6 0,0 10e-8,-1 10e-8,-2 0,-1 0,-9.0000042 10.0000002,-9.0000042 z"
+       id="rect4116"
+       inkscape:connector-curvature="0"
+       sodipodi:nodetypes="zzzcccczz"
+       transform="translate(-8.7869998,787.86042)" />
+    <path
+       style="fill:#f2f2f2;fill-opacity:1;stroke:none"
+       d="m 27.883669,812.27851 110.357121,0 c 4.36699,0 7.88265,3.51567 7.88265,7.88266 l 0,39.41326 -9.45918,0 0,-36.2602 -107.204076,0 0,192.33677 107.204076,0 0,-156.07657 9.45918,0 0,165.53567 c 0,4.367 -3.51566,7.8827 -7.88265,7.8827 l -110.357121,0 c -4.367006,0 -7.882669,-3.5157 -7.882669,-7.8827 l 0,-204.94893 c 0,-4.36699 3.515663,-7.88266 7.882669,-7.88266 z"
       id="rect3099-1"
       inkscape:connector-curvature="0"
       sodipodi:nodetypes="sssccccccccssssss" />
    <rect
       style="fill:#2d2d2d;fill-opacity:1;stroke:none"
       id="rect3907-1"
-       width="125.0006"
-       height="214.7449"
-       x="65.928711"
-       y="814.18335"
+       width="107.20409"
+       height="192.33675"
+       x="29.460182"
+       y="823.31403"
       rx="0"
       ry="0" />
    <rect
       style="fill:#1a1a1a;fill-opacity:1;stroke:none"
       id="rect3946-5"
-       width="35.204079"
-       height="1.760206"
-       x="110.82697"
-       y="807.14258"
-       ry="0.88010299" />
+       width="31.530609"
+       height="1.5765324"
+       x="67.296921"
+       y="817.00793"
+       ry="0.78826618" />
    <g
-       transform="matrix(0.99703783,0,0,0.99703783,60.422321,868.29896)"
+       transform="matrix(0.80336174,0,0,0.80336174,28.27591,877.43019)"
       id="g3764-6-1"
       style="fill:#f2f2f2;fill-opacity:1">
      <g
@@ -858,23 +1048,20 @@
    </g>
    <path
       style="opacity:0.5;fill:url(#linearGradient4309-4);fill-opacity:1;stroke:none"
-       d="m 65.928713,814.18357 90.073947,0 15.61309,-1.06296 -88.937821,217.56809 -18.58746,0 z"
+       d="m 29.460184,823.31423 77.249996,0 13.39023,-0.95204 -76.27562,194.86531 -15.941137,0 z"
       id="rect3907-9-4"
       inkscape:connector-curvature="0"
       sodipodi:nodetypes="cccccc" />
-    <path
-       style="opacity:0.4;fill:#ffffff;fill-opacity:1;stroke:none"
-       d="m 72.876953,14.001953 c -5.091955,0 -9.191406,3.925011 -9.191406,8.800781 l 0,2 c 0,-4.87577 4.099451,-8.800781 9.191406,-8.800781 l 128.677737,0 c 5.09194,0 9.1914,3.925011 9.1914,8.800781 l 0,-2 c 0,-4.87577 -4.09946,-8.800781 -9.1914,-8.800781 z"
+    <g
       transform="translate(-8.7869998,787.86042)"
-       id="path4295"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="sscsscsss" />
-    <path
-       style="fill:#000000;fill-opacity:1;stroke:none;opacity:0.1"
-       d="m 63.685547,249.62891 0,2 c 0,4.8757 4.099451,8.80078 9.191406,8.80078 l 128.677737,0 c 5.09194,0 9.1914,-3.92508 9.1914,-8.80078 l 0,-2 c 0,4.8757 -4.09946,8.80078 -9.1914,8.80078 l -128.677737,0 c -5.091955,0 -9.191406,-3.92508 -9.191406,-8.80078 z"
-       id="path4300"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="csssscssc"
-       transform="translate(-8.7869998,787.86042)" />
+       style="font-size:144px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:url(#linearGradient4052);font-family:Nokia Pure Text;-inkscape-font-specification:Nokia Pure Text;stroke-width:7;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="text3247">
+      <path
+         d="m 175.48241,130.60064 c 0,-12.66854 -7.72782,-25.08374 -19.63624,-29.77109 -1.01349,-0.50675 -2.15367,-0.63344 -3.16714,-0.63344 -4.43399,0 -8.10788,3.54721 -8.10788,8.10788 0,9.62809 14.69552,6.96771 14.69552,22.29665 0,15.32892 -14.69552,12.66856 -14.69552,22.29665 0,4.56067 3.67389,8.10786 8.10788,8.10786 1.01347,0 2.15365,-0.12675 3.16714,-0.63341 11.90842,-4.81405 19.63624,-17.10257 19.63624,-29.7711 m 32.43149,0 c 0,-25.71712 -15.45564,-49.660734 -39.2725,-59.668882 -1.01349,-0.380054 -2.15365,-0.633418 -3.29383,-0.633418 -4.43399,0 -8.10787,3.673884 -8.10787,8.107876 0,3.547179 2.02697,5.95421 4.94073,7.474443 3.42051,1.773596 6.58766,3.293813 9.62811,5.574155 12.54186,9.121356 19.88962,23.690216 19.88962,39.145826 0,15.45561 -7.34776,30.02448 -19.88962,39.14582 -3.04045,2.28033 -6.2076,3.80056 -9.62811,5.57416 -2.91376,1.52023 -4.94073,3.92726 -4.94073,7.47444 0,4.43399 3.67388,8.10788 8.23456,8.10788 1.01349,0 2.15365,-0.25337 3.16714,-0.63344 23.81686,-10.00813 39.2725,-33.95173 39.2725,-59.66886 m 32.43149,0 c 0,-38.892415 -23.18348,-74.111022 -58.90875,-89.439944 -1.01349,-0.380071 -2.15365,-0.633435 -3.29383,-0.633435 -4.43398,0 -8.10786,3.673884 -8.10786,8.107877 0,3.673868 1.90028,5.700845 4.94072,7.474442 1.77359,1.013473 3.80057,1.646891 5.70086,2.66038 3.54718,1.900271 7.09439,4.053938 10.3882,6.460953 20.7764,15.328939 33.06492,39.525917 33.06492,65.369727 0,25.84382 -12.28852,50.04079 -33.06492,65.36973 -3.29381,2.40701 -6.84102,4.56066 -10.3882,6.46095 -1.90029,1.01349 -3.92727,1.64691 -5.70086,2.66039 -3.04044,1.7736 -4.94072,3.80058 -4.94072,7.47445 0,4.43399 3.67388,8.10787 8.10786,8.10787 1.14018,0 2.28034,-0.25338 3.29383,-0.63343 35.72527,-15.32892 58.90875,-50.54755 58.90875,-89.43996"
+         id="path3252"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="ccsssssccccssccsccssccccsscccscccsscc"
+         style="fill:url(#linearGradient4028);fill-opacity:1;stroke:url(#linearGradient4052);stroke-opacity:1;stroke-width:7;stroke-miterlimit:4;stroke-dasharray:none" />
+    </g>
  </g>
 </svg>
--- a/kdeconnect-android.iml
+++ b/kdeconnect-android.iml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="SELECTED_BUILD_VARIANT" value="debug" />
+        <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
+        <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugJava" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugTest" />
+        <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
+      </configuration>
+    </facet>
+    <facet type="android-gradle" name="Android-Gradle">
+      <configuration>
+        <option name="GRADLE_PROJECT_PATH" value=":" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/debug" />
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" type="java-test-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/.git" />
+      <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
+      <excludeFolder url="file://$MODULE_DIR$/build/apk" />
+      <excludeFolder url="file://$MODULE_DIR$/build/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/bundles" />
+      <excludeFolder url="file://$MODULE_DIR$/build/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/dependency-cache" />
+      <excludeFolder url="file://$MODULE_DIR$/build/incremental" />
+      <excludeFolder url="file://$MODULE_DIR$/build/libs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/res" />
+      <excludeFolder url="file://$MODULE_DIR$/build/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 19 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" exported="" name="sshd-core-0.8.0" level="project" />
+    <orderEntry type="library" exported="" name="appcompat-v7-19.0.1" level="project" />
+    <orderEntry type="library" exported="" name="tomcat-apr-5.5.15" level="project" />
+    <orderEntry type="library" exported="" name="slf4j-api-1.6.6" level="project" />
+    <orderEntry type="library" exported="" name="bcprov-jdk16-1.45" level="project" />
+    <orderEntry type="library" exported="" name="mina-core-2.0.7" level="project" />
+    <orderEntry type="library" exported="" name="support-v4-19.0.1" level="project" />
+  </component>
+</module>
+
--- a/proguard-rules.pro
+++ b/proguard-rules.pro
@@ -1,50 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in {SDKHOME}/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 *;
-#}
-
-dontobfuscate
-
-# Allow obfuscation of android.support.v7.internal.view.menu.**
-# to avoid problem on Samsung 4.2.2 devices with appcompat v21
-# see https://code.google.com/p/android/issues/detail?id=78377
-keepnames class !android.support.v7.internal.view.menu.**,android.support.v7.** {*;}
-
-dontwarn org.spongycastle.**
-dontwarn org.apache.sshd.**
-dontwarn org.apache.mina.**
-dontwarn org.slf4j.**
-dontwarn io.netty.**
-
-keepattributes SourceFile,LineNumberTable,Signature,*Annotation*
-
-keep class org.spongycastle.** {*;}
-
-# SSHd requires mina, and mina uses reflection so some classes would get deleted
-keep class org.apache.mina.** {*;}
-keep class org.apache.sshd.** {*;}
-
-keep class org.kde.kdeconnect.** {*;}
-
-dontwarn org.mockito.**
-dontwarn sun.reflect.**
-dontwarn android.test.**
-dontwarn java.lang.management.**
-dontwarn javax.**
-
-dontwarn android.net.ConnectivityManager
-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
-dontwarn android.net.LinkProperties
--- a/res/color/state_list_drawer_text.xml
+++ b/res/color/state_list_drawer_text.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#FFFFFF" android:state_checked="true" />
-    <item android:color="#000000" android:state_checked="false" />
-</selector>
-
--- a/res/drawable-hdpi/divider_horizontal_holo_light.9.png
+++ b/res/drawable-hdpi/divider_horizontal_holo_light.9.png
--- a/res/drawable-hdpi/drawer_shadow.9.png
+++ b/res/drawable-hdpi/drawer_shadow.9.png
--- a/res/drawable-hdpi/ic_notification.png
+++ b/res/drawable-hdpi/ic_notification.png
--- a/res/drawable-hdpi/icon.png
+++ b/res/drawable-hdpi/icon.png
--- a/res/drawable-mdpi/drawer_shadow.9.png
+++ b/res/drawable-mdpi/drawer_shadow.9.png
--- a/res/drawable-mdpi/ic_notification.png
+++ b/res/drawable-mdpi/ic_notification.png
--- a/res/drawable-mdpi/icon.png
+++ b/res/drawable-mdpi/icon.png
--- a/res/drawable-night/state_list_drawer_background.xml
+++ b/res/drawable-night/state_list_drawer_background.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/primary" android:state_checked="true" />
-    <item android:drawable="@color/darkStatusBarBackground" android:state_checked="false" />
-</selector>
--- a/res/drawable-v21/list_divider.xml
+++ b/res/drawable-v21/list_divider.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="?attr/dividerHorizontal"
-    android:insetLeft="16dp"
-    android:insetRight="16dp"/>
--- a/res/drawable-xhdpi/drawer_shadow.9.png
+++ b/res/drawable-xhdpi/drawer_shadow.9.png
--- a/res/drawable-xhdpi/ic_notification.png
+++ b/res/drawable-xhdpi/ic_notification.png
--- a/res/drawable-xhdpi/icon.png
+++ b/res/drawable-xhdpi/icon.png
--- a/res/drawable-xxhdpi/drawer_shadow.9.png
+++ b/res/drawable-xxhdpi/drawer_shadow.9.png
--- a/res/drawable-xxhdpi/ic_notification.png
+++ b/res/drawable-xxhdpi/ic_notification.png
--- a/res/drawable-xxhdpi/icon.png
+++ b/res/drawable-xxhdpi/icon.png
--- a/res/drawable-xxxhdpi/ic_notification.png
+++ b/res/drawable-xxxhdpi/ic_notification.png
--- a/res/drawable/button_round.xml
+++ b/res/drawable/button_round.xml
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/accent" />
-    <corners android:bottomRightRadius="2dip"
-        android:bottomLeftRadius="2dip"
-        android:topRightRadius="2dip"
-        android:topLeftRadius="2dip"/>
-</shape>
--- a/res/drawable/disableable_button.xml
+++ b/res/drawable/disableable_button.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_enabled="true" android:color="@color/primary" />
-    <item android:state_enabled="false" android:color="@color/disabled_grey" />
-</selector>
--- a/res/drawable/drawer_header.jpeg
+++ b/res/drawable/drawer_header.jpeg
--- a/res/drawable/ic_accept_pairing_24dp.xml
+++ b/res/drawable/ic_accept_pairing_24dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
-</vector>
--- a/res/drawable/ic_action_content_add_circle_outline_32dp.xml
+++ b/res/drawable/ic_action_content_add_circle_outline_32dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M13,7h-2v4L7,11v2h4v4h2v-4h4v-2h-4L13,7zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
-</vector>
--- a/res/drawable/ic_action_image_edit_24dp.xml
+++ b/res/drawable/ic_action_image_edit_24dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
--- a/res/drawable/ic_action_keyboard_24dp.xml
+++ b/res/drawable/ic_action_keyboard_24dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M20,5L4,5c-1.1,0 -1.99,0.9 -1.99,2L2,17c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2zM11,8h2v2h-2L11,8zM11,11h2v2h-2v-2zM8,8h2v2L8,10L8,8zM8,11h2v2L8,13v-2zM7,13L5,13v-2h2v2zM7,10L5,10L5,8h2v2zM16,17L8,17v-2h8v2zM16,13h-2v-2h2v2zM16,10h-2L14,8h2v2zM19,13h-2v-2h2v2zM19,10h-2L17,8h2v2z"/>
-</vector>
--- a/res/drawable/ic_action_refresh_24dp.xml
+++ b/res/drawable/ic_action_refresh_24dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
-</vector>
--- a/res/drawable/ic_add.xml
+++ b/res/drawable/ic_add.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
-    <path
-        android:pathData="M0 0h24v24H0z" />
-</vector>
--- a/res/drawable/ic_album_art_placeholder.xml
+++ b/res/drawable/ic_album_art_placeholder.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="192dp"
-        android:height="192dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#000000"
-        android:pathData="M12,3v10.55c-0.59,-0.34 -1.27,-0.55 -2,-0.55 -2.21,0 -4,1.79 -4,4s1.79,4 4,4 4,-1.79 4,-4V7h4V3h-6z"/>
-</vector>
--- a/res/drawable/ic_arrow_back_black_24dp.xml
+++ b/res/drawable/ic_arrow_back_black_24dp.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
-</vector>
--- a/res/drawable/ic_arrow_black.xml
+++ b/res/drawable/ic_arrow_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
-    android:viewportWidth="32"
-    android:viewportHeight="32"
-    android:width="32dp"
-    android:height="32dp">
-    <path
-        android:pathData="M8.990234 5c-0.5522847 0 -1 0.4477153 -1 1 0 0.5522847 0.4477153 1 1 1 0.5522847 0 1 -0.4477153 1 -1 0 -0.5522847 -0.4477153 -1 -1 -1zm2 4L11 29 16.841796 21.769531 26 21Z"
-        android:fillColor="#FF000000" />
-</vector>
--- a/res/drawable/ic_arrow_downward_black_24dp.xml
+++ b/res/drawable/ic_arrow_downward_black_24dp.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M20,12l-1.41,-1.41L13,16.17V4h-2v12.17l-5.58,-5.59L4,12l8,8 8,-8z"
-        android:fillColor="#010101"/>
-</vector>
--- a/res/drawable/ic_arrow_drop_down_24px.xml
+++ b/res/drawable/ic_arrow_drop_down_24px.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M7,10l5,5 5,-5z"/>
-</vector>
--- a/res/drawable/ic_arrow_forward_black_24dp.xml
+++ b/res/drawable/ic_arrow_forward_black_24dp.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
-</vector>
--- a/res/drawable/ic_arrow_upward_black_24dp.xml
+++ b/res/drawable/ic_arrow_upward_black_24dp.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,12l1.41,1.41L11,7.83V20h2V7.83l5.58,5.59L20,12l-8,-8 -8,8z"/>
-</vector>
--- a/res/drawable/ic_camera.xml
+++ b/res/drawable/ic_camera.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:width="24dp"
-    android:height="24dp">
-    <path
-        android:pathData="M15.2 12A3.2 3.2 0 0 1 12 15.2 3.2 3.2 0 0 1 8.8 12 3.2 3.2 0 0 1 12 8.8 3.2 3.2 0 0 1 15.2 12Z"
-        android:fillColor="#000000" />
-    <path
-        android:pathData="M9 2L7.17 4 4 4C2.9 4 2 4.9 2 6l0 12c0 1.1 0.9 2 2 2l16 0c1.1 0 2 -0.9 2 -2L22 6C22 4.9 21.1 4 20 4L16.83 4 15 2 9 2Zm3 15C9.24 17 7 14.76 7 12 7 9.24 9.24 7 12 7c2.76 0 5 2.24 5 5 0 2.76 -2.24 5 -5 5z"
-        android:fillColor="#000000" />
-</vector>
--- a/res/drawable/ic_delete.xml
+++ b/res/drawable/ic_delete.xml
@@ -1,7 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
-    android:width="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path android:fillColor="#FFF" android:pathData="M19,4H15.5L14.5,3H9.5L8.5,4H5V6H19M6,19A2,2 0 0,0 8,21H16A2,2 0 0,0 18,19V7H6V19Z" />
-</vector>
--- a/res/drawable/ic_device_laptop_32dp.xml
+++ b/res/drawable/ic_device_laptop_32dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="32dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20,18c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2H4C2.9,4 2,4.9 2,6v10c0,1.1 0.9,2 2,2H0v2h24v-2H20zM4,6h16v10H4V6z"/>
-</vector>
--- a/res/drawable/ic_device_phone_32dp.xml
+++ b/res/drawable/ic_device_phone_32dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="32dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M16,1L8,1C6.34,1 5,2.34 5,4v16c0,1.66 1.34,3 3,3h8c1.66,0 3,-1.34 3,-3L19,4c0,-1.66 -1.34,-3 -3,-3zM14,21h-4v-1h4v1zM17.25,18L6.75,18L6.75,4h10.5v14z"/>
-</vector>
--- a/res/drawable/ic_device_tablet_32dp.xml
+++ b/res/drawable/ic_device_tablet_32dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="32dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h18c1.1,0 1.99,-0.9 1.99,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM19,18L5,18L5,6h14v12z"/>
-</vector>
--- a/res/drawable/ic_device_tv_32dp.xml
+++ b/res/drawable/ic_device_tv_32dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="32dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h5v2h8v-2h5c1.1,0 1.99,-0.9 1.99,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,17L3,17L3,5h18v12z"/>
-</vector>
--- a/res/drawable/ic_error_outline_48dp.xml
+++ b/res/drawable/ic_error_outline_48dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="48dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M11,15h2v2h-2zM11,7h2v6h-2zM11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
-</vector>
--- a/res/drawable/ic_fast_forward_black.xml
+++ b/res/drawable/ic_fast_forward_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
-</vector>
--- a/res/drawable/ic_home_black_24dp.xml
+++ b/res/drawable/ic_home_black_24dp.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
-</vector>
--- a/res/drawable/ic_keyboard_hide_36dp.xml
+++ b/res/drawable/ic_keyboard_hide_36dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="36dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20,3L4,3c-1.1,0 -1.99,0.9 -1.99,2L2,15c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,5c0,-1.1 -0.9,-2 -2,-2zM11,6h2v2h-2L11,6zM11,9h2v2h-2L11,9zM8,6h2v2L8,8L8,6zM8,9h2v2L8,11L8,9zM7,11L5,11L5,9h2v2zM7,8L5,8L5,6h2v2zM16,15L8,15v-2h8v2zM16,11h-2L14,9h2v2zM16,8h-2L14,6h2v2zM19,11h-2L17,9h2v2zM19,8h-2L17,6h2v2zM12,23l4,-4L8,19l4,4z"/>
-</vector>
--- a/res/drawable/ic_keyboard_return_black_24dp.xml
+++ b/res/drawable/ic_keyboard_return_black_24dp.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,7v4H5.83l3.58,-3.59L8,6l-6,6 6,6 1.41,-1.41L5.83,13H21V7z"/>
-</vector>
--- a/res/drawable/ic_mic_black.xml
+++ b/res/drawable/ic_mic_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M 16.766667,8.7612589 v 2.5197071 c 0,2.182796 -2.138935,3.959544 -4.766667,3.959544 -2.6277329,0 -4.7666673,-1.776748 -4.7666673,-3.959544 V 8.7612589 H 5.4999999 v 2.5197071 c 0,2.732804 2.4587328,4.991913 5.6333321,5.345392 v 2.933663 H 8.0999999 v 1.439831 H 15.9 V 19.560021 H 12.866667 V 16.626358 C 16.041267,16.272879 18.5,14.01377 18.5,11.280966 V 8.7612589 Z M 12,13.800679 A 3.0333332,2.5197106 0 0 1 8.9666671,11.280966 V 5.5216304 a 3.0333332,2.5197106 0 1 1 6.0666649,0 V 11.280966 A 3.0333332,2.5197106 0 0 1 12,13.800679 Z"/>
-</vector>
--- a/res/drawable/ic_next_black.xml
+++ b/res/drawable/ic_next_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
-</vector>
--- a/res/drawable/ic_next_white.xml
+++ b/res/drawable/ic_next_white.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
-</vector>
--- a/res/drawable/ic_pause_black.xml
+++ b/res/drawable/ic_pause_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
-</vector>
--- a/res/drawable/ic_pause_white.xml
+++ b/res/drawable/ic_pause_white.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
-</vector>
--- a/res/drawable/ic_phonelink_36dp.xml
+++ b/res/drawable/ic_phonelink_36dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="36dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M4,6h18L22,4L4,4c-1.1,0 -2,0.9 -2,2v11L0,17v3h14v-3L4,17L4,6zM23,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L24,9c0,-0.55 -0.45,-1 -1,-1zM22,17h-4v-7h4v7z"/>
-</vector>
--- a/res/drawable/ic_phonelink_off_36dp.xml
+++ b/res/drawable/ic_phonelink_off_36dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="36dp" android:tint="?attr/colorControlNormal"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M22,6V4H6.82l2,2H22zM1.92,1.65L0.65,2.92l1.82,1.82C2.18,5.08 2,5.52 2,6v11H0v3h17.73l2.35,2.35 1.27,-1.27L3.89,3.62 1.92,1.65zM4,6.27L14.73,17H4V6.27zM23,8h-6c-0.55,0 -1,0.45 -1,1v4.18l2,2V10h4v7h-2.18l3,3H23c0.55,0 1,-0.45 1,-1V9c0,-0.55 -0.45,-1 -1,-1z"/>
-</vector>
--- a/res/drawable/ic_play_black.xml
+++ b/res/drawable/ic_play_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M8,5v14l11,-7z"/>
-</vector>
--- a/res/drawable/ic_play_white.xml
+++ b/res/drawable/ic_play_white.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M8,5v14l11,-7z"/>
-</vector>
--- a/res/drawable/ic_presenter_24dp.xml
+++ b/res/drawable/ic_presenter_24dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M21,3L3,3c-1.11,0 -2,0.89 -2,2v14c0,1.11 0.89,2 2,2h18c1.11,0 2,-0.89 2,-2L23,5c0,-1.11 -0.89,-2 -2,-2zM21,19.02L3,19.02L3,4.98h18v14.04zM10,12L8,12l4,-4 4,4h-2v4h-4v-4z"/>
-</vector>
--- a/res/drawable/ic_previous_black.xml
+++ b/res/drawable/ic_previous_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
-</vector>
--- a/res/drawable/ic_previous_white.xml
+++ b/res/drawable/ic_previous_white.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M6,6h2v12L6,18zM9.5,12l8.5,6L18,6z"/>
-</vector>
--- a/res/drawable/ic_reject_pairing_24dp.xml
+++ b/res/drawable/ic_reject_pairing_24dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
-</vector>
--- a/res/drawable/ic_rewind_black.xml
+++ b/res/drawable/ic_rewind_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
-</vector>
--- a/res/drawable/ic_settings_white_32dp.xml
+++ b/res/drawable/ic_settings_white_32dp.xml
@@ -1,5 +0,0 @@
-<vector android:height="32dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="32dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000" android:pathData="M19.1,12.9a2.8,2.8 0,0 0,0.1 -0.9,2.8 2.8,0 0,0 -0.1,-0.9l2.1,-1.6a0.7,0.7 0,0 0,0.1 -0.6L19.4,5.5a0.7,0.7 0,0 0,-0.6 -0.2l-2.4,1a6.5,6.5 0,0 0,-1.6 -0.9l-0.4,-2.6a0.5,0.5 0,0 0,-0.5 -0.4H10.1a0.5,0.5 0,0 0,-0.5 0.4L9.3,5.4a5.6,5.6 0,0 0,-1.7 0.9l-2.4,-1a0.4,0.4 0,0 0,-0.5 0.2l-2,3.4c-0.1,0.2 0,0.4 0.2,0.6l2,1.6a2.8,2.8 0,0 0,-0.1 0.9,2.8 2.8,0 0,0 0.1,0.9L2.8,14.5a0.7,0.7 0,0 0,-0.1 0.6l1.9,3.4a0.7,0.7 0,0 0,0.6 0.2l2.4,-1a6.5,6.5 0,0 0,1.6 0.9l0.4,2.6a0.5,0.5 0,0 0,0.5 0.4h3.8a0.5,0.5 0,0 0,0.5 -0.4l0.3,-2.6a5.6,5.6 0,0 0,1.7 -0.9l2.4,1a0.4,0.4 0,0 0,0.5 -0.2l2,-3.4c0.1,-0.2 0,-0.4 -0.2,-0.6ZM12,15.6A3.6,3.6 0,1 1,15.6 12,3.6 3.6,0 0,1 12,15.6Z"/>
-</vector>
--- a/res/drawable/ic_share_white.xml
+++ b/res/drawable/ic_share_white.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
-</vector>
--- a/res/drawable/ic_stop.xml
+++ b/res/drawable/ic_stop.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:pathData="M0 0h24v24H0z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M6 6h12v12H6z" />
-</vector>
--- a/res/drawable/ic_volume_black.xml
+++ b/res/drawable/ic_volume_black.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,9v6h4l5,5L12,4L7,9L3,9zM16.5,12c0,-1.77 -1.02,-3.29 -2.5,-4.03v8.05c1.48,-0.73 2.5,-2.25 2.5,-4.02zM14,3.23v2.06c2.89,0.86 5,3.54 5,6.71s-2.11,5.85 -5,6.71v2.06c4.01,-0.91 7,-4.49 7,-8.77s-2.99,-7.86 -7,-8.77z"/>
-</vector>
--- a/res/drawable/ic_volume_mute_black.xml
+++ b/res/drawable/ic_volume_mute_black.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#000000"
-        android:pathData="M7 9v6h4l5 5V4l-5 5H7z" />
-    <path
-        android:pathData="M0 0h24v24H0z" />
-</vector>
--- a/res/drawable/ic_warning.xml
+++ b/res/drawable/ic_warning.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
-</vector>
--- a/res/drawable/ic_wifi.xml
+++ b/res/drawable/ic_wifi.xml
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M1,9l2,2c4.97,-4.97 13.03,-4.97 18,0l2,-2C16.93,2.93 7.08,2.93 1,9zM9,17l3,3 3,-3c-1.65,-1.66 -4.34,-1.66 -6,0zM5,13l2,2c2.76,-2.76 7.24,-2.76 10,0l2,-2C15.14,9.14 8.87,9.14 5,13z"/>
-</vector>
--- a/res/drawable/list_divider.xml
+++ b/res/drawable/list_divider.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<inset
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:drawable="@drawable/divider_horizontal_holo_light"
-    android:insetLeft="16dp"
-    android:insetRight="16dp"/>
--- a/res/drawable/mpris_plugin_action_24dp.xml
+++ b/res/drawable/mpris_plugin_action_24dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M8,5v14l11,-7z"/>
-</vector>
--- a/res/drawable/run_command_plugin_icon_24dp.xml
+++ b/res/drawable/run_command_plugin_icon_24dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
-</vector>
--- a/res/drawable/share_plugin_action_24dp.xml
+++ b/res/drawable/share_plugin_action_24dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6L6,2zM13,9L13,3.5L18.5,9L13,9z"/>
-</vector>
--- a/res/drawable/state_list_drawer_background.xml
+++ b/res/drawable/state_list_drawer_background.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/primary" android:state_checked="true" />
-    <item android:drawable="@color/background_floating_material_light" android:state_checked="false" />
-</selector>
--- a/res/drawable/state_list_drawer_background_dark.xml
+++ b/res/drawable/state_list_drawer_background_dark.xml
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/primary" android:state_checked="true" />
-    <item android:drawable="@color/darkStatusBarBackground" android:state_checked="false" />
-</selector>
--- a/res/drawable/text_section_header.xml
+++ b/res/drawable/text_section_header.xml
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:width="1000dp" android:height="2dp" />
-    <solid android:color="#cecbce"/>
-</shape>
--- a/res/drawable/touchpad_plugin_action_24dp.xml
+++ b/res/drawable/touchpad_plugin_action_24dp.xml
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:fillColor="@android:color/white"
-      android:pathData="M9,11.24V7.5C9,6.12 10.12,5 11.5,5S14,6.12 14,7.5v3.74c1.21,-0.81 2,-2.18 2,-3.74C16,5.01 13.99,3 11.5,3S7,5.01 7,7.5C7,9.06 7.79,10.43 9,11.24zM18.84,15.87l-4.54,-2.26c-0.17,-0.07 -0.35,-0.11 -0.54,-0.11H13v-6C13,6.67 12.33,6 11.5,6S10,6.67 10,7.5v10.74c-3.6,-0.76 -3.54,-0.75 -3.67,-0.75c-0.31,0 -0.59,0.13 -0.79,0.33l-0.79,0.8l4.94,4.94C9.96,23.83 10.34,24 10.75,24h6.79c0.75,0 1.33,-0.55 1.44,-1.28l0.75,-5.27c0.01,-0.07 0.02,-0.14 0.02,-0.2C19.75,16.63 19.37,16.09 18.84,15.87z"/>
-</vector>
--- a/res/layout-land/activity_mpris.xml
+++ b/res/layout-land/activity_mpris.xml
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="horizontal"
-    android:paddingBottom="25dp"
-    android:paddingLeft="25dp"
-    android:paddingRight="25dp"
-    android:paddingTop="25dp">
-
-    <ImageView
-        android:id="@+id/album_art"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_marginRight="25dp"
-        android:layout_marginEnd="25dp"
-        android:layout_weight="1"
-        android:contentDescription="@string/mpris_coverart_description"
-        android:scaleType="fitCenter" />
-
-    <include
-        layout="@layout/mpris_control"
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1" />
-
-</LinearLayout>
--- a/res/layout-v21/custom_device_item.xml
+++ b/res/layout-v21/custom_device_item.xml
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/colorButtonNormal">
-
-
-    <TextView
-        android:id="@+id/deviceNameOrIPBackdrop"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:drawableEnd="@drawable/ic_delete"
-        android:drawableStart="@drawable/ic_delete"
-        android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
-        android:paddingStart="?android:attr/listPreferredItemPaddingLeft"/>
-
-    <FrameLayout
-        android:id="@+id/swipeableView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?android:colorBackground">
-
-        <TextView
-            android:id="@+id/deviceNameOrIP"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?android:selectableItemBackground"
-            android:gravity="center_vertical"
-            android:minHeight="?android:attr/listPreferredItemHeightSmall"
-            android:paddingEnd="?android:attr/listPreferredItemPaddingRight"
-            android:paddingStart="?android:attr/listPreferredItemPaddingLeft"
-            android:textAppearance="?android:attr/textAppearanceListItemSmall"
-            android:visibility="visible"
-            tools:text="192.168.0.1"/>
-
-    </FrameLayout>
-
-</FrameLayout>
--- a/res/layout-v23/pairing_explanation_not_trusted.xml
+++ b/res/layout-v23/pairing_explanation_not_trusted.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:clickable="false"
-    android:drawableStart="@drawable/ic_warning"
-    android:drawablePadding="8dp"
-    android:drawableTint="?attr/colorControlNormal"
-    android:paddingTop="16dp"
-    android:paddingBottom="12dp"
-    android:text="@string/on_non_trusted_message">
-
-</TextView>
--- a/res/layout-v23/pairing_explanation_text_no_wifi.xml
+++ b/res/layout-v23/pairing_explanation_text_no_wifi.xml
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?attr/selectableItemBackground"
-    android:clickable="true"
-    android:drawableStart="@drawable/ic_wifi"
-    android:drawablePadding="8dp"
-    android:drawableTint="?attr/colorControlNormal"
-    android:paddingTop="16dp"
-    android:paddingBottom="12dp"
-    android:text="@string/no_wifi">
-
-</TextView>
--- a/res/layout/activity_bigscreen.xml
+++ b/res/layout/activity_bigscreen.xml
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.gridlayout.widget.GridLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:grid="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    grid:useDefaultMargins="true">
-
-    <ImageButton
-        android:id="@+id/home_button"
-        grid:layout_column="0"
-        grid:layout_row="0"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_home"
-        app:srcCompat="@drawable/ic_home_black_24dp"
-        android:theme="@style/DisableableButton" />
-
-    <ImageButton
-        android:id="@+id/up_button"
-        grid:layout_column="1"
-        grid:layout_row="0"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_up"
-        app:srcCompat="@drawable/ic_arrow_upward_black_24dp"
-        android:theme="@style/DisableableButton" />
-
-    <ImageButton
-        android:id="@+id/mic_button"
-        grid:layout_column="2"
-        grid:layout_columnWeight="1"
-        grid:layout_row="0"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_mic"
-        app:srcCompat="@drawable/ic_mic_black"
-        android:theme="@style/DisableableButton" />
-
-    <ImageButton
-        android:id="@+id/left_button"
-        grid:layout_column="0"
-        grid:layout_row="1"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_left"
-        app:srcCompat="@drawable/ic_arrow_back_black_24dp"
-        android:theme="@style/DisableableButton" />
-
-    <ImageButton
-        android:id="@+id/select_button"
-        grid:layout_column="1"
-        grid:layout_row="1"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_select"
-        app:srcCompat="@drawable/ic_keyboard_return_black_24dp"
-        android:theme="@style/DisableableButton" />
-
-    <ImageButton
-        android:id="@+id/right_button"
-        grid:layout_column="2"
-        grid:layout_row="1"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_right"
-        app:srcCompat="@drawable/ic_arrow_forward_black_24dp"
-        android:theme="@style/DisableableButton" />
-
-    <ImageButton
-        android:id="@+id/down_button"
-        grid:layout_column="1"
-        grid:layout_row="2"
-        grid:layout_columnWeight="1"
-        grid:layout_rowWeight="1"
-        android:contentDescription="@string/bigscreen_down"
-        app:srcCompat="@drawable/ic_arrow_downward_black_24dp"
-        android:theme="@style/DisableableButton"  />
-</androidx.gridlayout.widget.GridLayout>
--- a/res/layout/activity_clipboard_floating.xml
+++ b/res/layout/activity_clipboard_floating.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <Button
-        android:id="@+id/floating_button"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:alpha="0"
-        android:text="@string/pref_plugin_clipboard" />
-</LinearLayout>
--- a/res/layout/activity_custom_devices.xml
+++ b/res/layout/activity_custom_devices.xml
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:listitem="@layout/custom_device_item"/>
-
-    <TextView
-        android:id="@+id/emptyListMessage"
-        style="@style/TextAppearance.AppCompat.Medium"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
-        android:gravity="center_horizontal"
-        android:text="@string/custom_device_list_help"
-        />
-
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/floatingActionButton"
-        style="@style/KdeConnectThemeBase"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:elevation="@dimen/fab_elevation"
-        app:srcCompat="@drawable/ic_add"/>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
--- a/res/layout/activity_device.xml
+++ b/res/layout/activity_device.xml
@@ -1,113 +0,0 @@
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context="org.kde.kdeconnect.UserInterface.DeviceFragment">
-
-    <LinearLayout
-        android:id="@+id/pairing_buttons"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:orientation="vertical"
-        android:padding="@dimen/activity_vertical_margin"
-        android:visibility="gone">
-
-        <ProgressBar
-            android:id="@+id/pair_progress"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:visibility="gone"/>
-
-        <TextView
-            android:id="@+id/pair_message"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="8dip"
-            android:text="@string/device_not_paired"
-            android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-        <Button
-            android:id="@+id/pair_button"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/button_round"
-            android:text="@string/request_pairing"
-            android:textColor="@android:color/white"/>
-
-
-        <LinearLayout
-            android:id="@+id/pair_request_buttons"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:visibility="gone">
-
-            <Button
-                android:id="@+id/accept_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:layout_weight="1"
-                android:background="@drawable/button_round"
-                android:text="@string/pairing_accept"
-                android:textColor="@android:color/white"/>
-
-            <Button
-                android:id="@+id/reject_button"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dip"
-                android:layout_weight="1"
-                android:background="@drawable/button_round"
-                android:text="@string/pairing_reject"
-                android:textColor="@android:color/white"/>
-
-        </LinearLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/error_message_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:padding="16dp"
-        android:visibility="gone">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/error_message_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:importantForAccessibility="no"
-            android:paddingEnd="8dip"
-            android:paddingLeft="0dip"
-            android:paddingRight="8dip"
-            android:paddingStart="0dip"
-            app:srcCompat="@drawable/ic_error_outline_48dp"
-            app:tint="?attr/colorHighContrast"
-            tools:ignore="UnusedAttribute"/>
-
-        <TextView
-            android:id="@+id/not_reachable_message"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:text="@string/unreachable_description"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:visibility="gone" />
-    </LinearLayout>
-
-
-    <ListView
-        android:id="@+id/buttons_list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fillViewport="true"
-        android:divider="@drawable/list_divider"
-        tools:context=".DeviceActivity"
-        tools:listitem="@layout/list_item_with_icon_entry"/>
-</LinearLayout>
--- a/res/layout/activity_main.xml
+++ b/res/layout/activity_main.xml
@@ -1,43 +0,0 @@
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                                           xmlns:app="http://schemas.android.com/apk/res-auto"
-                                           xmlns:tools="http://schemas.android.com/tools"
-                                           android:id="@+id/drawer_layout"
-                                           android:layout_width="match_parent"
-                                           android:layout_height="match_parent"
-                                           android:fitsSystemWindows="true">  <!-- fitSystemWindows to make the drawer slide below the Lollipop transparent status bar -->
-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:id="@+id/coordinatorLayout"
-        android:layout_height="match_parent"
-        android:layout_width="match_parent"
-        tools:context="org.kde.kdeconnect.UserInterface.MainActivity">
-
-        <com.google.android.material.appbar.AppBarLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:elevation="8dp"/>
-        </com.google.android.material.appbar.AppBarLayout>
-
-        <FrameLayout
-            android:id="@+id/container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
-
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/navigation_drawer"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        app:headerLayout="@layout/nav_header"
-        style="?attr/mainNavigationViewStyle" />
-
-</androidx.drawerlayout.widget.DrawerLayout>
--- a/Show More
+++ b/Show More