Bumping version again to release

- Now we store the "select all" as the default value for apps not in the DB
- This also means new apps, which makes sense
- We pre-fill the "select all" checkbox with the default value

Also, now we store true/false as integers 1/0 instead of as string

.arcconfig

@@ -0,0 +1,3 @@
+{
+  "phabricator.uri" : "https://phabricator.kde.org/project/profile/159/"
+}

.gitignore

@@ -8,7 +8,7 @@ build/
 target/
 classes/
 gradle
-gradlew
-gradlew.bat
 *.iml
 *.keystore
+.directory
+GPUCache/

AndroidManifest.xml

@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.kde.kdeconnect_tp"
-    android:versionCode="1000"
-    android:versionName="1.0">
-
-    <uses-sdk android:minSdkVersion="9"
-              android:targetSdkVersion="22" />
+    android:versionCode="11006"
+    android:versionName="1.10">
 
     <supports-screens
         android:anyDensity="true"
@@ -14,76 +11,100 @@
         android:smallScreens="true"
         android:xlargeScreens="true" />
 
-    <uses-feature android:name="android.hardware.telephony" android:required="false" />
+    <uses-feature
+        android:name="android.hardware.telephony"
+        android:required="false" />
 
     <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_WIFI_MULTICAST_STATE" />
-    <uses-permission android:name="android.permission.BATTERY_STATS" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" android:required="false" />
-    <uses-permission android:name="android.permission.RECEIVE_SMS" android:required="false" />
-    <!-- <uses-permission android:name="android.permission.SEND_SMS" android:required="false" /> -->
+    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.RECEIVE_SMS" />
+    <uses-permission android:name="android.permission.SEND_SMS" />
+    <uses-permission android:name="android.permission.READ_SMS" />
     <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" />
 
     <application
-        android:allowBackup="true"
         android:icon="@drawable/icon"
         android:label="KDE Connect"
-        android:theme="@style/KdeConnectTheme"
-        >
-
+        android:supportsRtl="true"
+        android:theme="@style/KdeConnectTheme">
         <service
             android:name="org.kde.kdeconnect.BackgroundService"
-            android:enabled="true" >
+            android:enabled="true" />
+        <service
+            android:name="org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardService"
+            android:label="KDE Connect Remote Keyboard"
+            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.MaterialActivity"
+            android:name="org.kde.kdeconnect.UserInterface.MainActivity"
             android:label="KDE Connect"
             android:theme="@style/KdeConnectTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
         <activity
-            android:name="org.kde.kdeconnect.UserInterface.SettingsActivity"
+            android:name="org.kde.kdeconnect.UserInterface.DeviceSettingsActivity"
             android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                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.MaterialActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                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.MaterialActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.MainActivity" />
         </activity>
         <activity
             android:name="org.kde.kdeconnect.UserInterface.PluginSettingsActivity"
             android:label="@string/device_menu_plugins"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.SettingsActivity" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceSettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.SettingsActivity" />
+                android:value="org.kde.kdeconnect.UserInterface.DeviceSettingsActivity" />
+        </activity>
+        <activity
+            android:name="org.kde.kdeconnect.Plugins.SharePlugin.ShareSettingsActivity"
+            android:label="@string/device_menu_plugins"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.DeviceSettingsActivity">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value="org.kde.kdeconnect.Plugins.SharePlugin.ShareSettingsActivity" />
         </activity>
 
-        <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver" >
+        <receiver android:name="org.kde.kdeconnect.KdeConnectBroadcastReceiver">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
 
@@ -101,59 +122,104 @@
             <intent-filter>
                 <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
             </intent-filter>
-            <!--
-            <intent-filter>
-                <action android:name="android.provider.Telephony.SMS_RECEIVED" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.PHONE_STATE" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.BATTERY_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">
-        </activity>
+            android:launchMode="singleInstance" />
 
         <!-- Plugin-related activities and services -->
 
         <activity
             android:name="org.kde.kdeconnect.Plugins.MprisPlugin.MprisActivity"
             android:label="@string/remote_control"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
-            >
+            android:launchMode="singleTop"
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                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/remote_control"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
-            >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                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.MousePadPlugin.MousePadActivity"
-            android:configChanges="orientation|keyboardHidden|screenSize"
             android:label="@string/remote_control"
-            android:parentActivityName="org.kde.kdeconnect.UserInterface.MaterialActivity"
-            android:windowSoftInputMode="stateHidden|adjustResize" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.MainActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
-                android:value="org.kde.kdeconnect.UserInterface.MaterialActivity" />
+                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"
-            >
+            android:label="KDE Connect">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
 
@@ -168,19 +234,41 @@
 
                 <data android:mimeType="*/*" />
             </intent-filter>
+
+            <meta-data
+                android:name="android.service.chooser.chooser_target_service"
+                android:value="org.kde.kdeconnect.Plugins.SharePlugin.ShareChooserTargetService" />
         </activity>
+
+        <provider
+            android:name="android.support.v4.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" >
+            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" >
+            android:parentActivityName="org.kde.kdeconnect.UserInterface.PluginSettingsActivity">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="org.kde.kdeconnect.UserInterface.PluginSettingsActivity" />
@@ -188,4 +276,4 @@
 
     </application>
 
-</manifest>
+</manifest>

README.md

@@ -4,20 +4,24 @@ KDE Connect is a multi-platform app that allows your devices to communicate (eg:
 
 ## (Some) Features
 - **Shared clipboard**: copy and paste between your phone and your computer (or any other device).
-- **Notification sync**: Read your Android notifications from the desktop.
+- **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.
+- **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 a secure, encrypted protocol.
+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/albertvaka/kdeconnect-kde).
+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/albertvaka/kdeconnect-kde) for it to work.
+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
+
+To contribute patches, use [KDE Connect's Phabricator](https://phabricator.kde.org/project/profile/159/). There you can also 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).
 
 ## 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)

build.gradle

@@ -1,32 +1,31 @@
 buildscript {
     repositories {
         jcenter()
+        google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:1.5.0'
+        classpath 'com.android.tools.build:gradle:3.2.1'
     }
 }
 
 apply plugin: 'com.android.application'
 
 android {
-    buildToolsVersion '23.0.2'
-    compileSdkVersion 23
+    compileSdkVersion 28
     defaultConfig {
-        minSdkVersion 9
-        targetSdkVersion 22 //Bumping to 23 means we have to support the new permissions model
-        multiDexEnabled true
+        minSdkVersion 14
+        targetSdkVersion 28
+        //multiDexEnabled true
+        //testInstrumentationRunner "com.android.test.runner.MultiDexTestRunner"
     }
     dexOptions {
-        javaMaxHeapSize "4g"
+        javaMaxHeapSize "2g"
     }
     compileOptions {
-        // Use Java 1.7, requires minSdk 8
-        //SSHD requires mina when running on JDK < 7
-        sourceCompatibility JavaVersion.VERSION_1_7
-        targetCompatibility JavaVersion.VERSION_1_7
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
-	sourceSets {
+    sourceSets {
         main {
             manifest.srcFile 'AndroidManifest.xml'
             java.srcDirs = ['src']
@@ -45,38 +44,46 @@ android {
         pickFirst "META-INF/BCKEY.SF"
         pickFirst "META-INF/BCKEY.DSA"
         pickFirst "META-INF/INDEX.LIST"
-        pickFirst "META-INF/io.netty.versions.properties"
     }
     lintOptions {
         abortOnError false
         checkReleaseBuilds false
     }
     buildTypes {
-        release { //keep on 'releae', set to 'all' when testing to make sure proguard is not deleting important stuff
+        debug {
+            minifyEnabled false
+            useProguard false
+        }
+        release { //keep on 'release' for faster builds, set to 'all' when testing to make sure proguard is not deleting important stuff
             minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'),'proguard-rules.pro'
+            useProguard true
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
 }
 
 dependencies {
+
     repositories {
-        mavenCentral()
+        jcenter()
+        google()
     }
-    compile 'com.android.support:support-v4:23.2.1'
-    compile 'com.android.support:appcompat-v7:23.2.1'
-    compile 'com.android.support:design:23.2.1'
 
-    compile 'org.apache.sshd:sshd-core:0.8.0' //0.9 seems to fail on Android 6 and 1.+ requires java.nio.file, which doesn't exist in Android
-    //compile 'org.bouncycastle:bcprov-jdk15on:1.54'
+    implementation 'com.android.support:support-media-compat:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support:preference-v7:28.0.0'
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.jakewharton:disklrucache:2.0.2' //For caching album art bitmaps
 
-    compile 'com.madgag.spongycastle:pkix:1.54.0.0'
-    compile 'io.netty:netty-handler:4.1.0.CR3'
+    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+
 
-    androidTestCompile 'org.mockito:mockito-core:1.10.19'
-    // Because mockito has some problems with dex environment
-    androidTestCompile 'com.google.dexmaker:dexmaker:1.1'
-    androidTestCompile 'com.google.dexmaker:dexmaker-mockito:1.1'
+    implementation 'com.madgag.spongycastle:bcpkix-jdk15on:1.58.0.0' //For SSL certificate generation
+
+    // Testing
+    androidTestImplementation 'org.mockito:mockito-core:1.10.19'
+    androidTestImplementation 'com.google.dexmaker:dexmaker-mockito:1.1'// Because mockito has some problems with dex environment
+    androidTestImplementation 'org.skyscreamer:jsonassert:1.3.0'
+    testImplementation 'junit:junit:4.12'
 
-    //compile fileTree(include: '*.jar', dir: 'libs')
 }

gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip

gradlew

@@ -0,0 +1,160 @@
+#!/usr/bin/env bash
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# 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
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+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
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# 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`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        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" ;;
+    esac
+fi
+
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

gradlew.bat

@@ -0,0 +1,90 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@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 Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@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.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+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
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

proguard-rules.pro

@@ -24,7 +24,6 @@
 -keepnames class !android.support.v7.internal.view.menu.**,android.support.v7.** {*;}
 
 -dontwarn org.spongycastle.**
--dontwarn org.bouncycastle.**
 -dontwarn org.apache.sshd.**
 -dontwarn org.apache.mina.**
 -dontwarn org.slf4j.**
@@ -33,6 +32,14 @@
 -keepattributes SourceFile,LineNumberTable,Signature,*Annotation*
 
 -keep class org.spongycastle.** {*;}
--keep class org.bouncycastle.** {*;}
+
+# 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.**

res/drawable/disableable_button.xml

@@ -0,0 +1,5 @@
+<?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>

res/drawable/ic_add.xml

@@ -0,0 +1,13 @@
+<?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>

res/drawable/ic_album_art_placeholder.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_fast_forward_black.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_next_black.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_next_white.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_pause_black.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_pause_white.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_play_black.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_play_white.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_previous_black.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_previous_white.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_rewind_black.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_share_white.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_stop.xml

@@ -0,0 +1,13 @@
+<?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>

res/drawable/ic_volume_black.xml

@@ -0,0 +1,9 @@
+<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>

res/drawable/ic_volume_mute_black.xml

@@ -0,0 +1,13 @@
+<?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>

res/drawable/state_list_drawer_background_dark.xml

@@ -0,0 +1,5 @@
+<?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>

res/layout-land/activity_mpris.xml

@@ -0,0 +1,27 @@
+<?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>

res/layout/activity_device.xml

@@ -1,94 +1,120 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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"
     android:padding="@dimen/activity_vertical_margin"
-    tools:context=".DeviceFragment"
-    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:orientation="vertical"
-        android:id="@+id/pairing_buttons"
-        android:layout_gravity="center">
+        android:layout_gravity="center"
+        android:visibility="gone"
+        android:orientation="vertical">
 
         <ProgressBar
-            android:visibility="gone"
+            android:id="@+id/pair_progress"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:id="@+id/pair_progress" />
+            android:visibility="gone" />
 
         <TextView
+            android:id="@+id/pair_message"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dip"
-            android:textAppearance="?android:attr/textAppearanceMedium"
             android:text="@string/device_not_paired"
-            android:id="@+id/pair_message"
-            android:layout_gravity="left|center_vertical"
-        />
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <Button
             android:id="@+id/pair_button"
-            android:background="@drawable/button_round"
-            android:textColor="@android:color/white"
             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"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:visibility="gone"
-            android:id="@+id/pair_request"
-            android:layout_gravity="center">
+            android:layout_gravity="center"
+            android:visibility="gone">
 
             <Button
-                android:background="@drawable/button_round"
-                android:textColor="@android:color/white"
-                android:layout_margin="4dip"
                 android:id="@+id/accept_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/pairing_accept"
+                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:background="@drawable/button_round"
-                android:textColor="@android:color/white"
-                android:layout_margin="4dip"
                 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:layout_weight="1" />
+                android:textColor="@android:color/white" />
 
         </LinearLayout>
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/unpair_message"
-        android:visibility="gone"
+    <LinearLayout
+        android:id="@+id/error_message_container"
         android:layout_width="match_parent"
-        android:drawableStart="@drawable/ic_error_outline_black_48dp"
-        android:drawableLeft="@drawable/ic_error_outline_black_48dp"
-        android:drawablePadding="8dip"
         android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:text="@string/unreachable_description"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        />
+        android:orientation="horizontal"
+        android:gravity="center"
+        android:visibility="gone" >
+
+        <android.support.v7.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"
+            android:src="@drawable/ic_error_outline_black_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" />
+
+        <TextView
+            android:id="@+id/on_data_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:text="@string/on_data_message"
+            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"
-        tools:context=".DeviceActivity"
-        />
+        tools:context=".DeviceActivity" />
 
 </LinearLayout>

res/layout/activity_find_my_phone.xml

@@ -2,25 +2,22 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
     tools:context="org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhoneActivity">
 
 
-
     <Button
+        android:id="@+id/bFindMyPhone"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:text="@string/findmyphone_found"
-        android:textSize="50dp"
-        android:id="@+id/bFindMyPhone"
         android:layout_alignParentBottom="true"
         android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true" />
-
-
+        android:layout_alignParentStart="true"
+        android:text="@string/findmyphone_found"
+        android:textSize="50sp" />
 
 
 </RelativeLayout>

res/layout/activity_list.xml

@@ -1,11 +0,0 @@
-<ListView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingLeft="16dip"
-    android:paddingRight="16dip"
-    tools:context=".MainActivity"
-    android:id="@+id/listView1"
-    android:addStatesFromChildren="true"
-    android:orientation="vertical">
-</ListView>

res/layout/activity_main.xml

@@ -1,45 +1,37 @@
-<android.support.v4.widget.DrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<android.support.v4.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"
-    tools:context="org.kde.kdeconnect.UserInterface.MaterialActivity">  <!-- fitSystemWindows to make the drawer slide below the Lollipop transparent status bar -->
+    tools:context="org.kde.kdeconnect.UserInterface.MainActivity">  <!-- fitSystemWindows to make the drawer slide below the Lollipop transparent status bar -->
 
     <LinearLayout
-        android:layout_height="match_parent"
         android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
         <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
             android:elevation="8dp"
-            android:background="?attr/colorPrimary" />
+            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
         <FrameLayout
             android:id="@+id/container"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-        </FrameLayout>
+            android:layout_height="match_parent" />
 
     </LinearLayout>
 
     <android.support.design.widget.NavigationView
         android:id="@+id/navigation_drawer"
-        android:background="@drawable/state_list_drawer_background"
-        app:itemBackground="@drawable/state_list_drawer_background"
-        app:itemTextColor="@color/state_list_drawer_text"
-        app:itemIconTint="@color/state_list_drawer_text"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="start"
         app:headerLayout="@layout/nav_header"
-        />
+        style="?attr/mainNavigationViewStyle" />
 
 </android.support.v4.widget.DrawerLayout>

res/layout/activity_mousepad.xml

@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:keepScreenOn="true"
-    android:orientation="vertical"
+    android:id="@+id/mousepad_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/mousepad_view">
+    android:keepScreenOn="true"
+    android:orientation="vertical">
 
     <TextView
+        style="@android:style/TextAppearance.Medium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/mousepad_info"
-        android:gravity="center"
-        style="@android:style/TextAppearance.Medium"
         android:layout_centerInParent="true"
-        android:padding="12dip" />
+        android:gravity="center"
+        android:padding="12dip"
+        android:text="@string/mousepad_info" />
 
     <view
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:id="@+id/keyListener"
         class="org.kde.kdeconnect.Plugins.MousePadPlugin.KeyListenerView"
-        android:id="@+id/keyListener" />
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
 </RelativeLayout>

res/layout/activity_mpris.xml

@@ -0,0 +1,31 @@
+<?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="vertical"
+    android:paddingBottom="15dp"
+    android:paddingLeft="25dp"
+    android:paddingRight="25dp"
+    android:paddingTop="25dp">
+
+    <ImageView
+        android:id="@+id/album_art"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_marginBottom="25dp"
+        android:layout_weight="4"
+        android:contentDescription="@string/mpris_coverart_description"
+        android:scaleType="fitCenter" />
+
+    <include
+        layout="@layout/mpris_control"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <fragment android:name="org.kde.kdeconnect.Plugins.SystemvolumePlugin.SystemvolumeFragment"
+        android:id="@+id/systemvolume_fragment"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"/>
+
+</LinearLayout>

res/layout/activity_notification_filter.xml

@@ -1,22 +1,31 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
-    android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context="org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationFilterActivity">
 
     <TextView
-        android:text="@string/filter_apps_info"
+        android:id="@+id/tFilter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingBottom="5dp"
-        android:id="@+id/tFilter"/>
+        android:paddingBottom="16dp"
+        android:paddingLeft="@dimen/activity_horizontal_margin"
+        android:paddingRight="@dimen/activity_horizontal_margin"
+        android:paddingTop="@dimen/activity_vertical_margin"
+        android:text="@string/filter_apps_info" />
+
+    <ProgressBar
+        android:id="@+id/spinner"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="64dip" />
 
     <ListView
+        android:id="@+id/lvFilterApps"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:id="@+id/lvFilterApps"
-        android:layout_below="@id/tFilter"/>
+        android:visibility="gone" />
 
-</RelativeLayout>
+</LinearLayout>

res/layout/activity_presenter.xml

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/mpris_control_view"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_gravity="center"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <Space
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.25" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dip"
+        android:layout_gravity="center"
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@+id/previous_button"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
+            android:contentDescription="@string/mpris_rew"
+            android:src="@drawable/ic_previous_black"
+            android:theme="@style/DisableableButton" />
+
+        <ImageButton
+            android:id="@+id/next_button"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
+            android:contentDescription="@string/mpris_ff"
+            android:src="@drawable/ic_next_black"
+            android:theme="@style/DisableableButton" />
+
+    </LinearLayout>
+
+    <TextView
+        style="@android:style/TextAppearance.Medium"
+        android:padding="12dip"
+        android:id="@+id/textView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.25"
+        android:gravity="center"
+        android:text="@string/presenter_lock_tip" />
+
+</LinearLayout>

res/layout/activity_runcommand.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.design.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">
+
+    <ListView
+        android:id="@+id/runcommandslist"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_margin="4dp"
+        android:addStatesFromChildren="true"
+        android:orientation="vertical" />
+
+    <android.support.design.widget.FloatingActionButton
+        android:id="@+id/add_command_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom|end"
+        android:layout_margin="16dp"
+        android:src="@drawable/ic_action_image_edit"
+        app:backgroundTint="@color/primary"
+        app:layout_anchor="@id/runcommandslist"
+        app:layout_anchorGravity="bottom|end" />
+
+    <TextView
+        android:id="@+id/addcomand_explanation"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:padding="30dp"
+        android:text="@string/addcommand_explanation"
+        android:textAlignment="center"
+        android:textSize="16sp" />
+
+</android.support.design.widget.CoordinatorLayout>

res/layout/custom_ip_list.xml

@@ -1,36 +1,35 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
+    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:orientation="vertical">
+    android:paddingTop="@dimen/activity_vertical_margin">
 
     <ListView
+        android:id="@android:id/list"
         android:layout_width="fill_parent"
         android:layout_height="0dp"
-        android:id="@android:id/list"
-        android:layout_weight="1"
-    />
+        android:layout_weight="1" />
 
     <TextView
-            android:layout_width="fill_parent"
-            android:layout_height="100dp"
-            android:text="@string/custom_dev_list_help"/>
+        android:layout_width="fill_parent"
+        android:layout_height="100dp"
+        android:text="@string/custom_dev_list_help" />
 
     <EditText
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionSend"
-            android:hint="@string/add_host_hint"
-            android:id="@+id/ip_edittext"/>
+        android:id="@+id/ip_edittext"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/add_host_hint"
+        android:imeOptions="actionSend" />
 
     <Button
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/add_host"
-            android:id="@android:id/button1"/>
+        android:id="@android:id/button1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/add_host" />
 
 
 </LinearLayout>

res/layout/devices_list.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/refresh_list_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/devices_list"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:addStatesFromChildren="true"
+        android:divider="@null"
+        android:dividerHeight="0dp"
+        android:orientation="vertical"
+        android:paddingLeft="16dip"
+        android:paddingRight="16dip"
+        tools:context=".MainActivity" />
+
+</android.support.v4.widget.SwipeRefreshLayout>

res/layout/list_item_category.xml

@@ -1,34 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:orientation="vertical">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
 
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-        android:drawableBottom="@drawable/text_section_header"
-        android:textStyle="bold"
+        android:id="@+id/list_item_category_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
         android:layout_marginTop="8dp"
-        android:textColor="?android:textColorSecondary"
+        android:drawableBottom="@drawable/text_section_header"
         android:drawablePadding="4dp"
-        android:textSize="14sp"
-        android:textAllCaps="true"
         android:paddingLeft="8dip"
         android:paddingRight="8dip"
-        android:layout_height="wrap_content"
-        android:layout_width="match_parent"
-        android:id="@+id/list_item_category_text"
-        />
+        android:textAllCaps="true"
+        android:textColor="?android:textColorSecondary"
+        android:textSize="14sp"
+        android:textStyle="bold" />
 
     <TextView
+        android:id="@+id/list_item_category_empty_placeholder"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:layout_margin="10dip"
-        android:visibility="gone"
-        android:textAppearance="?android:attr/textAppearanceSmall"
         android:text="@string/device_list_empty"
-        android:id="@+id/list_item_category_empty_placeholder"
-        android:layout_gravity="center" />
-
+        android:textAppearance="?android:attr/textAppearanceSmall"
+        android:visibility="gone" />
 
 </LinearLayout>

res/layout/list_item_entry.xml

@@ -1,37 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-  <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
-    android:baselineAligned="false"
     android:layout_height="wrap_content"
-    android:paddingLeft="12dip"
-    android:paddingStart="12dip"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingEnd="?android:attr/scrollbarSize"
     android:background="@drawable/abc_list_selector_holo_dark"
-    android:orientation="vertical">
+    android:baselineAligned="false"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="vertical"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingLeft="12dip"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="12dip"
+    android:id="@+id/list_item_entry">
     <!-- We should use android:background="@android:/listChoiceBackgroundIndicator"
          instead of abc_list_selector_holo_dark but that's only supported from API11 -->
 
-    <TextView android:id="@+id/list_item_entry_title"
+    <TextView
+        android:id="@+id/list_item_entry_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textAppearance="?android:attr/textAppearanceLarge"
         android:ellipsize="marquee"
         android:fadingEdge="horizontal"
-        android:text="" />
+        android:singleLine="true"
+        android:text=""
+        android:textAppearance="?android:attr/textAppearanceLarge" />
 
-    <TextView android:id="@+id/list_item_entry_summary"
+    <TextView
+        android:id="@+id/list_item_entry_summary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
         android:singleLine="true"
-        android:visibility="gone"
+        android:text=""
+        android:textAppearance="?android:attr/textAppearanceSmall"
         android:textColor="@android:color/darker_gray"
-        android:text="" />
-
+        android:visibility="gone" />
 
 </LinearLayout>

res/layout/list_item_systemvolume.xml

@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout 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"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/systemvolume_label"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium" />
+
+    <LinearLayout
+        android:id="@+id/systemvolume_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="8dip"
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@+id/systemvolume_mute"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:background="@android:color/transparent"
+            android:contentDescription="@string/mute"
+            android:scaleType="fitXY"
+            android:src="@drawable/ic_volume_black"
+            app:tint="?attr/colorHighContrast" />
+
+        <SeekBar
+            android:id="@+id/systemvolume_seek"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_weight="1"
+            android:max="100" />
+
+    </LinearLayout>
+
+
+</LinearLayout>

res/layout/list_item_with_button_entry.xml

@@ -1,73 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:baselineAligned="false"
-    android:layout_height="wrap_content"
-    android:paddingLeft="12dip"
-    android:paddingStart="12dip"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:orientation="horizontal">
-
-        <ImageView android:id="@+id/list_item_entry_icon"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:src="@drawable/ic_device_laptop"
-            android:layout_weight="0" />
-
-    <LinearLayout
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_weight="1"
-            android:layout_height="wrap_content">
-
-        <TextView android:id="@+id/list_item_entry_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:layout_marginLeft="8dip"
-                android:layout_marginStart="8dip"
-                android:singleLine="true"
-                android:textAppearance="?android:attr/textAppearanceMedium"
-                android:ellipsize="marquee"
-                android:fadingEdge="horizontal"
-                android:text=""/>
-
-
-        <TextView android:id="@+id/list_item_entry_summary"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:singleLine="true"
-                android:textColor="#CC2222"
-                android:visibility="gone"
-                android:text="" />
-
-        </LinearLayout>
-
-
-    <ProgressBar
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:id="@+id/progressBar"
-        android:layout_weight="0"
-        android:indeterminate="true" />
-
-    <Button
-        android:layout_width="wrap_content"
-        android:minWidth="128dip"
-        android:layout_height="wrap_content"
-        android:text="@string/request_pairing"
-        android:padding="8dip"
-        android:background="@drawable/button_round"
-        android:textColor="#FFFFFF"
-        android:id="@+id/entry_pair_button"
-        android:layout_weight="0"
-        android:nestedScrollingEnabled="false" />
-
-</LinearLayout>
-
-

res/layout/list_item_with_icon_entry.xml

@@ -1,52 +1,59 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="fill_parent"
-    android:baselineAligned="false"
     android:layout_height="wrap_content"
-    android:paddingLeft="12dip"
-    android:paddingStart="12dip"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:gravity="center_vertical"
-    android:paddingRight="?android:attr/scrollbarSize"
-    android:paddingEnd="?android:attr/scrollbarSize"
-    android:clickable="true"
     android:background="@drawable/abc_list_selector_holo_dark"
-    android:orientation="horizontal">
+    android:baselineAligned="false"
+    android:clickable="true"
+    android:focusable="true"
+    android:gravity="center_vertical"
+    android:minHeight="?android:attr/listPreferredItemHeight"
+    android:orientation="horizontal"
+    android:paddingEnd="?android:attr/scrollbarSize"
+    android:paddingLeft="12dip"
+    android:paddingRight="?android:attr/scrollbarSize"
+    android:paddingStart="12dip">
 
-    <ImageView android:id="@+id/list_item_entry_icon"
+    <android.support.v7.widget.AppCompatImageView
+        android:id="@+id/list_item_entry_icon"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical"
-        android:src="@drawable/ic_device_laptop"
-        />
+        android:contentDescription="@string/device_icon_description"
+        app:tint="?attr/colorControlNormal"
+        android:src="@drawable/ic_device_laptop" />
 
     <LinearLayout
         android:layout_width="wrap_content"
-        android:orientation="vertical"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
 
-        <TextView android:id="@+id/list_item_entry_title"
+        <TextView
+            android:id="@+id/list_item_entry_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginLeft="8dip"
             android:layout_marginStart="8dip"
-            android:singleLine="true"
-            android:textAppearance="?android:attr/textAppearanceMedium"
             android:ellipsize="marquee"
             android:fadingEdge="horizontal"
-            android:text="" />
+            android:singleLine="true"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
-        <TextView android:id="@+id/list_item_entry_summary"
+        <TextView
+            android:id="@+id/list_item_entry_summary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="8dip"
             android:layout_marginStart="8dip"
-            android:textAppearance="?android:attr/textAppearanceSmall"
             android:singleLine="true"
+            android:text=""
+            android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="#CC2222"
-            android:visibility="gone"
-            android:text="" />
+            android:visibility="gone" />
 
     </LinearLayout>
 

res/layout/mpris_control.xml

@@ -2,185 +2,171 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical"
+    android:id="@+id/mpris_control_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:id="@+id/mpris_control_view"
+    android:layout_gravity="center"
     android:gravity="center"
-    android:paddingLeft="30dip"
-    android:paddingTop="5dip"
-    android:paddingRight="30dip"
-    android:paddingBottom="5dip">
+    android:orientation="vertical">
 
     <TextView
+        android:id="@+id/no_players"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
+        android:layout_gravity="center_horizontal"
         android:text="@string/no_players_connected"
-        android:id="@+id/no_players"
-        android:layout_gravity="center_horizontal" />
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
     <Spinner
+        android:id="@+id/player_spinner"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/player_spinner"
-        android:layout_gravity="center"
-    />
+        android:layout_gravity="center" />
 
     <TextView
+        android:id="@+id/now_playing_textview"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:id="@+id/now_playing_textview"
+        android:layout_gravity="center"
         android:ellipsize="marquee"
+        android:gravity="center"
         android:marqueeRepeatLimit="marquee_forever"
+        android:padding="8dip"
         android:scrollHorizontally="true"
         android:singleLine="true"
-        android:gravity="center"
-        android:padding="8dip"
-        android:layout_gravity="center"
-    />
+        android:textAppearance="?android:attr/textAppearanceMedium" />
 
-    <org.kde.kdeconnect.UserInterface.MaxWidthImageButton
-        android:layout_width="fill_parent"
-        android:layout_height="75dip"
-        app:maxWidth="300dip"
+    <ImageButton
         android:id="@+id/play_button"
-        android:src="@android:drawable/ic_media_play"
-        android:contentDescription="@string/mpris_play"
+        android:layout_width="fill_parent"
+        android:layout_height="75dp"
         android:layout_gravity="center"
         android:layout_weight="0"
-        android:clickable="false"
         android:adjustViewBounds="false"
-        android:baselineAlignBottom="true" />
+        android:baselineAlignBottom="true"
+        android:clickable="false"
+        android:contentDescription="@string/mpris_play"
+        android:src="@drawable/ic_play_black"
+        android:theme="@style/DisableableButton" />
 
     <LinearLayout
-        android:orientation="horizontal"
         android:layout_width="match_parent"
         android:layout_height="60dip"
         android:layout_gravity="center"
-    >
+        android:orientation="horizontal">
 
         <ImageButton
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
             android:id="@+id/prev_button"
-            android:src="@android:drawable/ic_media_previous"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
             android:contentDescription="@string/mpris_previous"
-            android:layout_weight="0.25"
-        />
+            android:src="@drawable/ic_previous_black"
+            android:theme="@style/DisableableButton" />
 
         <ImageButton
-            android:layout_width="match_parent"
-            android:layout_height="fill_parent"
             android:id="@+id/rew_button"
-            android:src="@android:drawable/ic_media_rew"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
             android:contentDescription="@string/mpris_rew"
-            android:layout_weight="0.25"
-        />
+            android:src="@drawable/ic_rewind_black"
+            android:theme="@style/DisableableButton" />
 
         <ImageButton
+            android:id="@+id/stop_button"
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
+            android:layout_weight="0.25"
+            android:contentDescription="@string/mpris_stop"
+            android:src="@drawable/ic_stop"
+            android:theme="@style/DisableableButton" />
+
+
+        <ImageButton
             android:id="@+id/ff_button"
-            android:src="@android:drawable/ic_media_ff"
-            android:contentDescription="@string/mpris_ff"
-            android:layout_weight="0.25"
-        />
-
-        <ImageButton
             android:layout_width="match_parent"
             android:layout_height="fill_parent"
-            android:id="@+id/next_button"
-            android:src="@android:drawable/ic_media_next"
-            android:contentDescription="@string/mpris_next"
             android:layout_weight="0.25"
-        />
+            android:contentDescription="@string/mpris_ff"
+            android:src="@drawable/ic_fast_forward_black"
+            android:theme="@style/DisableableButton" />
+
+        <ImageButton
+            android:id="@+id/next_button"
+            android:layout_width="match_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="0.25"
+            android:contentDescription="@string/mpris_next"
+            android:src="@drawable/ic_next_black"
+            android:theme="@style/DisableableButton" />
 
     </LinearLayout>
 
     <LinearLayout
-        android:orientation="horizontal"
+        android:id="@+id/progress_slider"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:id="@+id/progress_slider">
+        android:orientation="horizontal">
 
         <TextView
+            android:id="@+id/progress_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:id="@+id/progress_textview"
-            android:singleLine="true"
+            android:layout_gravity="center"
             android:gravity="center"
             android:padding="8dip"
-            android:layout_gravity="center"
-            android:text="00:00" />
+            android:singleLine="true"
+            android:text="00:00"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <SeekBar
+            android:id="@+id/positionSeek"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/positionSeek"
-            android:layout_weight="1"
-            android:layout_gravity="center" />
+            android:layout_gravity="center"
+            android:layout_weight="1" />
 
         <TextView
+            android:id="@+id/time_textview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:id="@+id/time_textview"
-            android:singleLine="true"
+            android:layout_gravity="center"
             android:gravity="center"
             android:padding="8dip"
-            android:layout_gravity="center"
-            android:text="00:00" />
+            android:singleLine="true"
+            android:text="00:00"
+            android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
 
     <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/volume_layout"
-            android:layout_gravity="center"
-        android:layout_marginTop="8dip">
+        android:id="@+id/volume_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_marginTop="8dip"
+        android:orientation="horizontal">
 
-        <ImageView
+        <android.support.v7.widget.AppCompatImageView
+            android:id="@+id/imageView"
             android:layout_width="30dip"
             android:layout_height="30dip"
-            android:maxWidth="30dip"
-            android:layout_marginRight="10dip"
             android:layout_marginEnd="10dip"
-            android:id="@+id/imageView"
+            android:layout_marginRight="10dip"
             android:layout_weight="0"
-            android:layout_gravity="left|center_vertical"
             android:contentDescription="@string/mpris_volume"
-            android:src="@drawable/ic_volume"
-        />
+            android:maxWidth="30dip"
+            android:src="@drawable/ic_volume_black"
+            app:tint="?attr/colorHighContrast" />
 
 
         <SeekBar
+            android:id="@+id/volume_seek"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:id="@+id/volume_seek"
-            android:layout_weight="1"
-            android:max="100"
             android:layout_gravity="center"
-        />
+            android:layout_weight="1"
+            android:max="100" />
 
     </LinearLayout>
-
-    <!--
-        <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/pause_button"
-                android:src="@android:drawable/ic_media_pause"
-                android:layout_gravity="center"/>
-
-        <ImageButton
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:id="@+id/pause_button"
-                android:src="@android:drawable/ic_media_stop"
-                android:layout_gravity="center"/>
-    -->
 </LinearLayout>

res/layout/nav_dark_mode_switch.xml

@@ -0,0 +1,18 @@
+<android.support.v7.widget.SwitchCompat
+    android:id="@+id/dark_theme"
+    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:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:paddingBottom="16dp"
+    android:paddingEnd="48dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="48dp"
+    android:paddingStart="16dp"
+    android:paddingTop="4dp"
+    android:text="@string/dark_theme"
+    android:textColor="@android:color/white"
+    app:switchPadding="12dp"
+    tools:background="@drawable/drawer_header"
+    />

res/layout/nav_header.xml

@@ -3,56 +3,34 @@
     android:layout_width="match_parent"
     android:layout_height="160dp"
     android:background="@drawable/drawer_header"
-    android:orientation="vertical"
-    android:gravity="bottom">
-
+    android:gravity="bottom"
+    android:orientation="vertical">
 
     <TextView
+        android:id="@+id/kdeconnect_label"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="KDE Connect"
-        android:textColor="#FFF"
-        android:textStyle="bold"
-        android:layout_above="@+id/device_name"
-        android:id="@+id/kdeconnect_label"
+        android:paddingEnd="48dp"
         android:paddingLeft="16dp"
+        android:paddingRight="48dp"
         android:paddingStart="16dp"
         android:paddingTop="8dp"
-        android:paddingRight="48dp"
-        android:paddingEnd="48dp"
-        />
+        android:text="@string/kde_connect"
+        android:textColor="#FFF"
+        android:textStyle="bold" />
 
     <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="My device"
         android:id="@+id/device_name"
-        android:layout_marginBottom="0dp"
-        android:textColor="#fff"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentStart="true"
-        android:paddingBottom="16dp"
-        android:paddingTop="4dp"
-        android:paddingRight="48dp"
-        android:paddingEnd="48dp"
-        android:paddingStart="16dp"
-        android:paddingLeft="16dp" />
-
-    <!--
-    <ImageView
-        android:src="@drawable/ic_action_image_edit"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentEnd="true"
-        android:clickable="true"
-        android:background="@drawable/abc_list_selector_holo_dark"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="@string/rename_device"
-        android:id="@+id/rename"
-    />
-    -->
+        android:layout_marginBottom="0dp"
+        android:paddingBottom="16dp"
+        android:paddingEnd="48dp"
+        android:paddingLeft="16dp"
+        android:paddingRight="48dp"
+        android:paddingStart="16dp"
+        android:paddingTop="4dp"
+        android:text="My device"
+        android:textColor="#fff" />
 
 </LinearLayout>