New material things

app-pro/build.gradle

@@ -20,14 +20,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 20
+    compileSdkVersion 21
-    buildToolsVersion '20.0.0'
+    buildToolsVersion '21.0.2'
 
     defaultConfig {
         applicationId "com.maskyn.fileeditorpro"
         minSdkVersion 11
-        targetSdkVersion 19
+        targetSdkVersion 21
-        versionCode 29
+        versionCode 31
         versionName "1.12"
     }
 

app/build.gradle

@@ -19,32 +19,34 @@
 
 buildscript {
     repositories {
-        maven { url 'http://download.crashlytics.com/maven' }
+        mavenCentral()
+        maven { url 'https://maven.fabric.io/repo' }
     }
 
     dependencies {
-        classpath 'com.crashlytics.tools.gradle:crashlytics-gradle:1.+'
+        classpath 'io.fabric.tools:gradle:1.+'
     }
 
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'crashlytics'
+apply plugin: 'io.fabric'
 
 repositories {
-    maven { url 'http://download.crashlytics.com/maven' }
+    mavenCentral()
+    maven { url 'https://maven.fabric.io/repo' }
 }
 
 
 
 android {
-    compileSdkVersion 20
+    compileSdkVersion 21
-    buildToolsVersion '20.0.0'
+    buildToolsVersion '21.0.2'
     defaultConfig {
         applicationId "com.maskyn.fileeditor"
         minSdkVersion 11
-        targetSdkVersion 19
+        targetSdkVersion 21
-        versionCode 30
+        versionCode 31
         versionName "1.13"
     }
     compileOptions {
@@ -69,6 +71,8 @@ android {
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile project(':libraries:sharedCode')
-    compile 'com.google.android.gms:play-services:5.0.89'
+    compile 'com.google.android.gms:play-services:6.1.11'
-    compile 'com.crashlytics.android:crashlytics:1.+'
+    compile('com.crashlytics.sdk.android:crashlytics:2.+@aar') {
+        transitive = true;
+    }
 }

app/src/main/java/com/maskyn/fileeditor/HomeActivity.java

@@ -23,6 +23,7 @@ import android.os.Bundle;
 
 import com.crashlytics.android.Crashlytics;
 
+import io.fabric.sdk.android.Fabric;
 import sharedcode.turboeditor.activity.BaseHomeActivity;
 import sharedcode.turboeditor.preferences.PreferenceHelper;
 import sharedcode.turboeditor.util.ProCheckUtils;
@@ -36,7 +37,7 @@ public class HomeActivity extends BaseHomeActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         if(PreferenceHelper.getSendErrorReports(this))
-            Crashlytics.start(this);
+            Fabric.with(this, new Crashlytics());
         // setup the ads
         if(!ProCheckUtils.isPro(this))
             adsHelper = new AdsHelper(this);

build.gradle

@@ -24,7 +24,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.12.+'
+        classpath 'com.android.tools.build:gradle:0.13.+'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

build/intermediates/dex-cache/cache.xml

@@ -2,23 +2,17 @@
 <pre-dex-items>
 
     <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\eventbus-2.2.1-32e81c5612ed132ff771b5425053d87f4f6c68c5.jar"
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\commons-io-2.4-63b64e68cd19031cd252ac65a3ef94421c1bf0f4.jar"
-        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\de.greenrobot\eventbus\2.2.1\a18ff12a9ab5ae52fd30d42f134517997568231e\eventbus-2.2.1.jar"
+        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.4\b1b6ea3b7e4aa4f492509a4952029cd8e48019ad\commons-io-2.4.jar"
         jumboMode="false"
-        revision="20.0.0"
+        revision="21.0.2"
-        sha1="a18ff12a9ab5ae52fd30d42f134517997568231e"/>
+        sha1="b1b6ea3b7e4aa4f492509a4952029cd8e48019ad"/>
     <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-9b612f0cb16e63277808158fe971bb4f40c98d29.jar"
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\classes-4dd6beddde59ff8bd6c22bd0d65ac974f7e489d2.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\classes.jar"
         jumboMode="false"
-        revision="19.1.0"
+        revision="21.0.2"
-        sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
+        sha1="4291d7fc866f70dc187c66c7063f806100c4d879"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\library-2.4.0-6b043a8574fb97c742ca3065362b2a29e8f870bc.jar"
-        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\com.nineoldandroids\library\2.4.0\e9b63380f3a242dbdbf103a2355ad7e43bad17cb\library-2.4.0.jar"
-        jumboMode="false"
-        revision="19.1.0"
-        sha1="e9b63380f3a242dbdbf103a2355ad7e43bad17cb"/>
     <item
         dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\commons-io-2.4-63b64e68cd19031cd252ac65a3ef94421c1bf0f4.jar"
         jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.4\b1b6ea3b7e4aa4f492509a4952029cd8e48019ad\commons-io-2.4.jar"
@@ -26,71 +20,41 @@
         revision="20.0.0"
         sha1="b1b6ea3b7e4aa4f492509a4952029cd8e48019ad"/>
     <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\classes-da434e33e14290126d2ad09adf85ad0bbd76f025.jar"
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\release\classes-579a5ce52888f504a812e0f68758a11f20a21c15.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\FloatingActionButton\unspecified\classes.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\classes.jar"
         jumboMode="false"
         revision="20.0.0"
-        sha1="2f3117da0016b1126fafe7fb332a45d2f910d76c"/>
+        sha1="a593d4ce7ccdfa1eac8d97a82db64f23614b59a1"/>
     <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-sources-58cfedaebe3b94ec0eaa2ede4e66aae8dbe309b0.jar"
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-40c5f3698ba688207904eaae4b4b57dbf850297e.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3-sources.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.crashlytics.sdk.android\answers\1.0.0\classes.jar"
         jumboMode="false"
-        revision="19.1.0"
+        revision="21.0.2"
-        sha1="77979eaa98f90806f984155f44f63cc1fb60ac25"/>
+        sha1="a8c73f3b98c2732c03ea09378ca322b56dea153a"/>
     <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-9db20cdcb8ae72104757d81297c98978c65bd91b.jar"
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\commons-lang3-3.1-84728078c80f2c8637e0c3fe426ad61433c75bb6.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
+        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\org.apache.commons\commons-lang3\3.1\905075e6c80f206bbe6cf1e809d2caa69f420c76\commons-lang3-3.1.jar"
         jumboMode="false"
-        revision="20.0.0"
+        revision="21.0.2"
-        sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
+        sha1="905075e6c80f206bbe6cf1e809d2caa69f420c76"/>
     <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-sources-436707958bb47977373cb4a2d842cdbf635fd840.jar"
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-52b3d51bec6ecfeacbc105275c0e6a98b8869b1b.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3-sources.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.crashlytics.sdk.android\crashlytics\2.0.0\classes.jar"
         jumboMode="false"
-        revision="20.0.0"
+        revision="21.0.2"
-        sha1="77979eaa98f90806f984155f44f63cc1fb60ac25"/>
+        sha1="832029c6f15447b2cb64ca4f8cf12172c9091857"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-515446996fed08836a9331ef47b508a0383ffa22.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\RootCommands\unspecified\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="e3bacad84e40c773d40010a5520810920887a920"/>
     <item
         dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-9b612f0cb16e63277808158fe971bb4f40c98d29.jar"
         jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
         jumboMode="false"
         revision="20.0.0"
         sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\support-v4-19.0.1-f87b13e7ed00736c2050eda75093bf42b0503c64.jar"
-        jar="C:\Users\Vlad\AppData\Local\Android\android-sdk\extras\android\m2repository\com\android\support\support-v4\19.0.1\support-v4-19.0.1.jar"
-        jumboMode="false"
-        revision="19.1.0"
-        sha1="587da9a481ffd341d2fa091704489b89845ddacd"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\support-annotations-20.0.0-be727b9c9ce08c6ee055559b9506b675c13db989.jar"
-        jar="C:\Users\Vlad\AppData\Local\Android\android-sdk\extras\android\m2repository\com\android\support\support-annotations\20.0.0\support-annotations-20.0.0.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="9d9013e9ff35fc3756411e62873c363c70c638fa"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\release\classes-3e47e18f46719c7bf296f4b49ff03aaa3d406ba6.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\classes.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="a593d4ce7ccdfa1eac8d97a82db64f23614b59a1"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\release\crashlytics-1.1.13-7bbec76a44aa9cc3279ec6bff22b2c929a8abf67.jar"
-        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\com.crashlytics.android\crashlytics\1.1.13\e821eafa1bf489a26bdb71f95078c26785b37a1\crashlytics-1.1.13.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="0e821eafa1bf489a26bdb71f95078c26785b37a1"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-sources-58cfedaebe3b94ec0eaa2ede4e66aae8dbe309b0.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3-sources.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="77979eaa98f90806f984155f44f63cc1fb60ac25"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-65b2b356e3f2da4b67e00aba70923d6321852204.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
     <item
         dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\support-v4-19.0.1-f87b13e7ed00736c2050eda75093bf42b0503c64.jar"
         jar="C:\Users\Vlad\AppData\Local\Android\android-sdk\extras\android\m2repository\com\android\support\support-v4\19.0.1\support-v4-19.0.1.jar"
@@ -98,95 +62,11 @@
         revision="20.0.0"
         sha1="587da9a481ffd341d2fa091704489b89845ddacd"/>
     <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\support-v4-19.1.0-cf7033c44b86e758f85990185111614bac3ecfa8.jar"
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\classes-c9a98cf79b48106440348a9fa210060d1b8b2647.jar"
-        jar="C:\Users\Vlad\AppData\Local\Android\android-sdk\extras\android\m2repository\com\android\support\support-v4\19.1.0\support-v4-19.1.0.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\RootCommands\unspecified\classes.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="85f201b380937e61a9dce6ca90ccf6872abbfb67"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\classes-a52f37b7ca7cde7ab02ff10bba80d1c496284125.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\FloatingActionButton\unspecified\classes.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="2f3117da0016b1126fafe7fb332a45d2f910d76c"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\classes-bfc447e4dbe83598b94dbdc8e38492cbbda6ebb2.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\RootCommands\unspecified\classes.jar"
         jumboMode="false"
         revision="20.0.0"
         sha1="cdecd8167dfb75d5785decb911fc4516445dd6a6"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\library-2.4.0-6b043a8574fb97c742ca3065362b2a29e8f870bc.jar"
-        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\com.nineoldandroids\library\2.4.0\e9b63380f3a242dbdbf103a2355ad7e43bad17cb\library-2.4.0.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="e9b63380f3a242dbdbf103a2355ad7e43bad17cb"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\eventbus-2.2.1-32e81c5612ed132ff771b5425053d87f4f6c68c5.jar"
-        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\de.greenrobot\eventbus\2.2.1\a18ff12a9ab5ae52fd30d42f134517997568231e\eventbus-2.2.1.jar"
-        jumboMode="false"
-        revision="19.1.0"
-        sha1="a18ff12a9ab5ae52fd30d42f134517997568231e"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\release\classes-579a5ce52888f504a812e0f68758a11f20a21c15.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\classes.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="a593d4ce7ccdfa1eac8d97a82db64f23614b59a1"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-30cc9565ecef1e8ae8577530d7ddd41993d192d7.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\RootCommands\unspecified\classes.jar"
-        jumboMode="false"
-        revision="19.1.0"
-        sha1="cb3d22565863773944a8c15de408e864e34d6da1"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-24b647622164ce26bc5d0be361e05056efc68e13.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-91de6979bb6be1b46cde32b462c23831eadd01d4.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-30cc9565ecef1e8ae8577530d7ddd41993d192d7.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\RootCommands\unspecified\classes.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="85e7b55f468c5591965a5171179d3858b46822a9"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-515446996fed08836a9331ef47b508a0383ffa22.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\RootCommands\unspecified\classes.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="85e7b55f468c5591965a5171179d3858b46822a9"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-bcfe21eb1248db73c27c811996e28274cf39b024.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\classes.jar"
-        jumboMode="false"
-        revision="19.1.0"
-        sha1="8203f36efafa2a6ef438b83fc86b9bdc469e7368"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\commons-lang3-3.1-84728078c80f2c8637e0c3fe426ad61433c75bb6.jar"
-        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\org.apache.commons\commons-lang3\3.1\905075e6c80f206bbe6cf1e809d2caa69f420c76\commons-lang3-3.1.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="905075e6c80f206bbe6cf1e809d2caa69f420c76"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-82d5b6cab7f16bad663de7c7008673037efb0e1b.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\FloatingActionButton\unspecified\classes.jar"
-        jumboMode="false"
-        revision="19.1.0"
-        sha1="2e2f6526f3c5fb34230d14e52bdc24addb67ea9f"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\release\classes-4dd6beddde59ff8bd6c22bd0d65ac974f7e489d2.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\classes.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="84a25d78b651ad8b1fb73e463fde4d34a4e79ca6"/>
     <item
         dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\classes-2ad27a3265673aeeb8f40e4322d8e19509329c96.jar"
         jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
@@ -194,41 +74,47 @@
         revision="20.0.0"
         sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
     <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-bcfe21eb1248db73c27c811996e28274cf39b024.jar"
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\library-2.4.0-6b043a8574fb97c742ca3065362b2a29e8f870bc.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\classes.jar"
+        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\com.nineoldandroids\library\2.4.0\e9b63380f3a242dbdbf103a2355ad7e43bad17cb\library-2.4.0.jar"
         jumboMode="false"
-        revision="20.0.0"
+        revision="19.1.0"
-        sha1="84a25d78b651ad8b1fb73e463fde4d34a4e79ca6"/>
+        sha1="e9b63380f3a242dbdbf103a2355ad7e43bad17cb"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-82d5b6cab7f16bad663de7c7008673037efb0e1b.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\FloatingActionButton\unspecified\classes.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="df1a8540495d6724b8582db31fcdd49b04d8b707"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-7a329e7f23515542bf02d96773d08da1d2333a7b.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\FloatingActionButton\unspecified\classes.jar"
-        jumboMode="false"
-        revision="20.0.0"
-        sha1="df1a8540495d6724b8582db31fcdd49b04d8b707"/>
     <item
         dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-65b2b356e3f2da4b67e00aba70923d6321852204.jar"
         jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
         jumboMode="false"
-        revision="19.1.0"
-        sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
-    <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-2e38d54a78dd518320bb6abe3d8931a19ff26792.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
-        jumboMode="false"
         revision="20.0.0"
         sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
     <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\classes-0a2ec632e1127b260f2b888ca5539fd41a1a638b.jar"
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-82d5b6cab7f16bad663de7c7008673037efb0e1b.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\FloatingActionButton\unspecified\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="a1fbf4d4c1f1e1fe357b9ed1de15f4eea2217274"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-7a329e7f23515542bf02d96773d08da1d2333a7b.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\FloatingActionButton\unspecified\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="a1fbf4d4c1f1e1fe357b9ed1de15f4eea2217274"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-d44090b77791e486eccbc4d8859b00a83623bf2b.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.google.android.gms\play-services\6.1.11\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="0f700f6802ba1a1f1fa7ac26d5db0666a89d75a6"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-sources-436707958bb47977373cb4a2d842cdbf635fd840.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3-sources.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="77979eaa98f90806f984155f44f63cc1fb60ac25"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-30cc9565ecef1e8ae8577530d7ddd41993d192d7.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\RootCommands\unspecified\classes.jar"
         jumboMode="false"
         revision="20.0.0"
-        sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
+        sha1="85e7b55f468c5591965a5171179d3858b46822a9"/>
     <item
         dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\classes-a8678f35ea62f18f2f7b60a15203aa6c74b5e559.jar"
         jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\com.google.android.gms\play-services\5.0.89\classes.jar"
@@ -236,11 +122,41 @@
         revision="20.0.0"
         sha1="d71573c9c5ea98a8db47ad6ff993a63d492b3bfa"/>
     <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-579992e349b2c32e50f8907b9538ad0aa6df57b4.jar"
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-sources-58cfedaebe3b94ec0eaa2ede4e66aae8dbe309b0.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.google.android.gms\play-services\5.0.89\classes.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3-sources.jar"
+        jumboMode="false"
+        revision="19.1.0"
+        sha1="77979eaa98f90806f984155f44f63cc1fb60ac25"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-2e38d54a78dd518320bb6abe3d8931a19ff26792.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
         jumboMode="false"
         revision="20.0.0"
-        sha1="d71573c9c5ea98a8db47ad6ff993a63d492b3bfa"/>
+        sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-9b612f0cb16e63277808158fe971bb4f40c98d29.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
+        jumboMode="false"
+        revision="19.1.0"
+        sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-9db20cdcb8ae72104757d81297c98978c65bd91b.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\library-2.4.0-6b043a8574fb97c742ca3065362b2a29e8f870bc.jar"
+        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\com.nineoldandroids\library\2.4.0\e9b63380f3a242dbdbf103a2355ad7e43bad17cb\library-2.4.0.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="e9b63380f3a242dbdbf103a2355ad7e43bad17cb"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\commons-lang3-3.1-84728078c80f2c8637e0c3fe426ad61433c75bb6.jar"
+        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\org.apache.commons\commons-lang3\3.1\905075e6c80f206bbe6cf1e809d2caa69f420c76\commons-lang3-3.1.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="905075e6c80f206bbe6cf1e809d2caa69f420c76"/>
     <item
         dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\commons-io-2.4-63b64e68cd19031cd252ac65a3ef94421c1bf0f4.jar"
         jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\commons-io\commons-io\2.4\b1b6ea3b7e4aa4f492509a4952029cd8e48019ad\commons-io-2.4.jar"
@@ -248,10 +164,208 @@
         revision="19.1.0"
         sha1="b1b6ea3b7e4aa4f492509a4952029cd8e48019ad"/>
     <item
-        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\classes-c9a98cf79b48106440348a9fa210060d1b8b2647.jar"
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\classes-bfc447e4dbe83598b94dbdc8e38492cbbda6ebb2.jar"
-        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\RootCommands\unspecified\classes.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\RootCommands\unspecified\classes.jar"
         jumboMode="false"
         revision="20.0.0"
         sha1="cdecd8167dfb75d5785decb911fc4516445dd6a6"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-91de6979bb6be1b46cde32b462c23831eadd01d4.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\library-2.4.0-6b043a8574fb97c742ca3065362b2a29e8f870bc.jar"
+        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\com.nineoldandroids\library\2.4.0\e9b63380f3a242dbdbf103a2355ad7e43bad17cb\library-2.4.0.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="e9b63380f3a242dbdbf103a2355ad7e43bad17cb"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-65b2b356e3f2da4b67e00aba70923d6321852204.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
+        jumboMode="false"
+        revision="19.1.0"
+        sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-9b612f0cb16e63277808158fe971bb4f40c98d29.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-sources-58cfedaebe3b94ec0eaa2ede4e66aae8dbe309b0.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3-sources.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="77979eaa98f90806f984155f44f63cc1fb60ac25"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\eventbus-2.2.1-32e81c5612ed132ff771b5425053d87f4f6c68c5.jar"
+        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\de.greenrobot\eventbus\2.2.1\a18ff12a9ab5ae52fd30d42f134517997568231e\eventbus-2.2.1.jar"
+        jumboMode="false"
+        revision="19.1.0"
+        sha1="a18ff12a9ab5ae52fd30d42f134517997568231e"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-24b647622164ce26bc5d0be361e05056efc68e13.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\classes-da434e33e14290126d2ad09adf85ad0bbd76f025.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\FloatingActionButton\unspecified\classes.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="2f3117da0016b1126fafe7fb332a45d2f910d76c"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\classes-0a2ec632e1127b260f2b888ca5539fd41a1a638b.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\com.github.gabrielemariotti.changeloglib\library\1.5.1\classes.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="74a89f0f8b56d9f11d70b8d8134cf4109f4797dc"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-33698a085ac2060587beda19b5b3900d3dffd1e7.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.android.support\support-v4\21.0.0\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="686344a780033e4ba22b926cd225f8d4941247e6"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\support-v4-19.1.0-cf7033c44b86e758f85990185111614bac3ecfa8.jar"
+        jar="C:\Users\Vlad\AppData\Local\Android\android-sdk\extras\android\m2repository\com\android\support\support-v4\19.1.0\support-v4-19.1.0.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="85f201b380937e61a9dce6ca90ccf6872abbfb67"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\internal_impl-21.0.0-74269e33561519e0fdabab9550f16a5986255be9.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.android.support\support-v4\21.0.0\libs\internal_impl-21.0.0.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="1609e6d42d0480b0f4188e2c29f75388fa12a8f0"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\eventbus-2.2.1-32e81c5612ed132ff771b5425053d87f4f6c68c5.jar"
+        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\de.greenrobot\eventbus\2.2.1\a18ff12a9ab5ae52fd30d42f134517997568231e\eventbus-2.2.1.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="a18ff12a9ab5ae52fd30d42f134517997568231e"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-30cc9565ecef1e8ae8577530d7ddd41993d192d7.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\RootCommands\unspecified\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="e3bacad84e40c773d40010a5520810920887a920"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-bcfe21eb1248db73c27c811996e28274cf39b024.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\classes.jar"
+        jumboMode="false"
+        revision="19.1.0"
+        sha1="8203f36efafa2a6ef438b83fc86b9bdc469e7368"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\release\crashlytics-1.1.13-7bbec76a44aa9cc3279ec6bff22b2c929a8abf67.jar"
+        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\com.crashlytics.android\crashlytics\1.1.13\e821eafa1bf489a26bdb71f95078c26785b37a1\crashlytics-1.1.13.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="0e821eafa1bf489a26bdb71f95078c26785b37a1"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\support-annotations-21.0.0-7b7e20ddbdfce40d4a29c1e68c2dbbc5bb512ab5.jar"
+        jar="C:\Users\Vlad\AppData\Local\Android\android-sdk\extras\android\m2repository\com\android\support\support-annotations\21.0.0\support-annotations-21.0.0.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="1a578b9607b36266c63d43a4fa0ab5664dbe911e"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-fb4f15a411cfb0bffc51b68ad64a4794d3d67ae4.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\com.android.support\appcompat-v7\21.0.0\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="95fd37732ec852e99f07eeb516a3650172f1d136"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-bcfe21eb1248db73c27c811996e28274cf39b024.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\classes.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="991591ff9dbe9e472a47cf66fe6c120f89a68eaa"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-82d5b6cab7f16bad663de7c7008673037efb0e1b.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\FloatingActionButton\unspecified\classes.jar"
+        jumboMode="false"
+        revision="19.1.0"
+        sha1="2e2f6526f3c5fb34230d14e52bdc24addb67ea9f"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-65b2b356e3f2da4b67e00aba70923d6321852204.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="591d72211acc0b909b79c840e0b3ed9a0982d807"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app\build\intermediates\pre-dexed\debug\eventbus-2.2.1-32e81c5612ed132ff771b5425053d87f4f6c68c5.jar"
+        jar="C:\Users\Vlad\.gradle\caches\modules-2\files-2.1\de.greenrobot\eventbus\2.2.1\a18ff12a9ab5ae52fd30d42f134517997568231e\eventbus-2.2.1.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="a18ff12a9ab5ae52fd30d42f134517997568231e"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-e4e5a16633bd011fd3d270f1bcdf565f2bd9f2b3.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.crashlytics.sdk.android\beta\1.0.0\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="068f232cbc319d814ad6ad01fd0ed0ac6d6c5414"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-39edd57531ecc124992725bca5e8b42be236e3ec.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\io.fabric.sdk.android\fabric\1.0.0\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="20a6dfbe395a3557a58a3d9f4460c15b0ce04d1e"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\debug\classes-a52f37b7ca7cde7ab02ff10bba80d1c496284125.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\FloatingActionButton\unspecified\classes.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="2f3117da0016b1126fafe7fb332a45d2f910d76c"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\juniversalchardet-1.0.3-sources-58cfedaebe3b94ec0eaa2ede4e66aae8dbe309b0.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\libs\juniversalchardet-1.0.3-sources.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="77979eaa98f90806f984155f44f63cc1fb60ac25"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-82d5b6cab7f16bad663de7c7008673037efb0e1b.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\FloatingActionButton\unspecified\classes.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="df1a8540495d6724b8582db31fcdd49b04d8b707"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-30cc9565ecef1e8ae8577530d7ddd41993d192d7.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\RootCommands\unspecified\classes.jar"
+        jumboMode="false"
+        revision="19.1.0"
+        sha1="cb3d22565863773944a8c15de408e864e34d6da1"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\pre-dexed\debug\classes-aa4ad551e94dc47c364b1b7f46bb2eb1b6ceed85.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app\build\intermediates\exploded-aar\com.android.support\appcompat-v7\21.0.0\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="95fd37732ec852e99f07eeb516a3650172f1d136"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\classes-e90e1f4e06d0f5aa27166f2f8f5fcea319efbd95.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\com.android.support\support-v4\21.0.0\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="686344a780033e4ba22b926cd225f8d4941247e6"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\release\classes-bcfe21eb1248db73c27c811996e28274cf39b024.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\turbo-editor.libraries\sharedCode\unspecified\classes.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="4291d7fc866f70dc187c66c7063f806100c4d879"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\pre-dexed\release\classes-3e47e18f46719c7bf296f4b49ff03aaa3d406ba6.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\TurboMaterialEditor\app-pro\build\intermediates\exploded-aar\TurboMaterialEditor.libraries\sharedCode\unspecified\classes.jar"
+        jumboMode="false"
+        revision="20.0.0"
+        sha1="a593d4ce7ccdfa1eac8d97a82db64f23614b59a1"/>
+    <item
+        dex="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\pre-dexed\debug\internal_impl-21.0.0-b15535acecaec42d04239e17e0a03ab072a43104.jar"
+        jar="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\app-pro\build\intermediates\exploded-aar\com.android.support\support-v4\21.0.0\libs\internal_impl-21.0.0.jar"
+        jumboMode="false"
+        revision="21.0.2"
+        sha1="1609e6d42d0480b0f4188e2c29f75388fa12a8f0"/>
 
 </pre-dex-items>

gradle/wrapper/gradle-wrapper.properties

@@ -1,25 +1,6 @@
-#
+#Wed Oct 22 18:10:25 CEST 2014
-# Copyright (C) 2014 Vlad Mihalachi
-#
-# This file is part of Turbo Editor.
-#
-# Turbo Editor is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Turbo Editor is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-
-#Wed Apr 10 15:27:10 PDT 2013
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.1-all.zip

libraries/FloatingActionButton/build.gradle

@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 android {
-    compileSdkVersion 20
+    compileSdkVersion 21
-    buildToolsVersion '20.0.0'
+    buildToolsVersion '21.0.2'
 
     defaultConfig {
         applicationId 'com.faizmalkani.floatingactionbutton'
         minSdkVersion 7
-        targetSdkVersion 19
+        targetSdkVersion 21
         versionName "1.0"
         versionCode 1
     }
@@ -22,6 +22,10 @@ android {
             assets.srcDirs = ['assets']
         }
     }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
+    }
 }
 
 dependencies {

libraries/FloatingActionButton/build/generated/source/buildConfig/debug/com/faizmalkani/floatingactionbutton/BuildConfig.java

@@ -5,9 +5,14 @@ package com.faizmalkani.floatingactionbutton;
 
 public final class BuildConfig {
   public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton";
+  public static final String APPLICATION_ID = "com.faizmalkani.floatingactionbutton";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
   public static final int VERSION_CODE = 1;
   public static final String VERSION_NAME = "1.0";
+  /**
+   * @deprecated Use {@link #APPLICATION_ID}
+   */
+  @Deprecated
+  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton";
 }

libraries/FloatingActionButton/build/generated/source/buildConfig/release/com/faizmalkani/floatingactionbutton/BuildConfig.java

@@ -5,9 +5,14 @@ package com.faizmalkani.floatingactionbutton;
 
 public final class BuildConfig {
   public static final boolean DEBUG = false;
-  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton";
+  public static final String APPLICATION_ID = "com.faizmalkani.floatingactionbutton";
   public static final String BUILD_TYPE = "release";
   public static final String FLAVOR = "";
   public static final int VERSION_CODE = 1;
   public static final String VERSION_NAME = "1.0";
+  /**
+   * @deprecated Use {@link #APPLICATION_ID}
+   */
+  @Deprecated
+  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton";
 }

libraries/FloatingActionButton/build/generated/source/buildConfig/test/debug/com/faizmalkani/floatingactionbutton/test/BuildConfig.java

@@ -5,9 +5,14 @@ package com.faizmalkani.floatingactionbutton.test;
 
 public final class BuildConfig {
   public static final boolean DEBUG = Boolean.parseBoolean("true");
-  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton.test";
+  public static final String APPLICATION_ID = "com.faizmalkani.floatingactionbutton.test";
   public static final String BUILD_TYPE = "debug";
   public static final String FLAVOR = "";
   public static final int VERSION_CODE = 1;
   public static final String VERSION_NAME = "1.0";
+  /**
+   * @deprecated Use {@link #APPLICATION_ID}
+   */
+  @Deprecated
+  public static final String PACKAGE_NAME = "com.faizmalkani.floatingactionbutton.test";
 }

libraries/FloatingActionButton/build/generated/source/r/debug/com/faizmalkani/floatingactionbutton/R.java

@@ -17,7 +17,7 @@ theme attribute (in the form
 "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
 containing a value of this type.
          */
-        public static int color=0x7f010001;
+        public static int colour=0x7f010001;
         /** <p>Must be an integer value, such as "<code>100</code>".
 <p>This may also be a reference to a resource (in the form
 "<code>@[<i>package</i>:]<i>type</i>:<i>name</i></code>") or
@@ -66,14 +66,14 @@ containing a value of this type.
            <colgroup align="left" />
            <colgroup align="left" />
            <tr><th>Attribute</th><th>Description</th></tr>
-           <tr><td><code>{@link #FloatingActionButton_color com.faizmalkani.floatingactionbutton:color}</code></td><td></td></tr>
+           <tr><td><code>{@link #FloatingActionButton_colour com.faizmalkani.floatingactionbutton:colour}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_drawable com.faizmalkani.floatingactionbutton:drawable}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowColor com.faizmalkani.floatingactionbutton:shadowColor}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowDx com.faizmalkani.floatingactionbutton:shadowDx}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowDy com.faizmalkani.floatingactionbutton:shadowDy}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowRadius com.faizmalkani.floatingactionbutton:shadowRadius}</code></td><td></td></tr>
            </table>
-           @see #FloatingActionButton_color
+           @see #FloatingActionButton_colour
            @see #FloatingActionButton_drawable
            @see #FloatingActionButton_shadowColor
            @see #FloatingActionButton_shadowDx
@@ -85,7 +85,7 @@ containing a value of this type.
             0x7f010004, 0x7f010005
         };
         /**
-          <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#color}
+          <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#colour}
           attribute's value can be found in the {@link #FloatingActionButton} array.
 
 
@@ -96,9 +96,9 @@ containing a value of this type.
 theme attribute (in the form
 "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
 containing a value of this type.
-          @attr name com.faizmalkani.floatingactionbutton:color
+          @attr name com.faizmalkani.floatingactionbutton:colour
         */
-        public static final int FloatingActionButton_color = 1;
+        public static int FloatingActionButton_colour = 1;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#drawable}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -112,7 +112,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:drawable
         */
-        public static final int FloatingActionButton_drawable = 0;
+        public static int FloatingActionButton_drawable = 0;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowColor}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -126,7 +126,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowColor
         */
-        public static final int FloatingActionButton_shadowColor = 5;
+        public static int FloatingActionButton_shadowColor = 5;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDx}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -140,7 +140,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowDx
         */
-        public static final int FloatingActionButton_shadowDx = 3;
+        public static int FloatingActionButton_shadowDx = 3;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDy}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -154,7 +154,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowDy
         */
-        public static final int FloatingActionButton_shadowDy = 4;
+        public static int FloatingActionButton_shadowDy = 4;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowRadius}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -168,6 +168,6 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowRadius
         */
-        public static final int FloatingActionButton_shadowRadius = 2;
+        public static int FloatingActionButton_shadowRadius = 2;
     };
 }

libraries/FloatingActionButton/build/generated/source/r/release/com/faizmalkani/floatingactionbutton/R.java

@@ -17,7 +17,7 @@ theme attribute (in the form
 "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
 containing a value of this type.
          */
-        public static int color=0x7f010001;
+        public static int colour=0x7f010001;
         /** <p>Must be an integer value, such as "<code>100</code>".
 <p>This may also be a reference to a resource (in the form
 "<code>@[<i>package</i>:]<i>type</i>:<i>name</i></code>") or
@@ -66,14 +66,14 @@ containing a value of this type.
            <colgroup align="left" />
            <colgroup align="left" />
            <tr><th>Attribute</th><th>Description</th></tr>
-           <tr><td><code>{@link #FloatingActionButton_color com.faizmalkani.floatingactionbutton:color}</code></td><td></td></tr>
+           <tr><td><code>{@link #FloatingActionButton_colour com.faizmalkani.floatingactionbutton:colour}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_drawable com.faizmalkani.floatingactionbutton:drawable}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowColor com.faizmalkani.floatingactionbutton:shadowColor}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowDx com.faizmalkani.floatingactionbutton:shadowDx}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowDy com.faizmalkani.floatingactionbutton:shadowDy}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowRadius com.faizmalkani.floatingactionbutton:shadowRadius}</code></td><td></td></tr>
            </table>
-           @see #FloatingActionButton_color
+           @see #FloatingActionButton_colour
            @see #FloatingActionButton_drawable
            @see #FloatingActionButton_shadowColor
            @see #FloatingActionButton_shadowDx
@@ -85,7 +85,7 @@ containing a value of this type.
             0x7f010004, 0x7f010005
         };
         /**
-          <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#color}
+          <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#colour}
           attribute's value can be found in the {@link #FloatingActionButton} array.
 
 
@@ -96,9 +96,9 @@ containing a value of this type.
 theme attribute (in the form
 "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
 containing a value of this type.
-          @attr name com.faizmalkani.floatingactionbutton:color
+          @attr name com.faizmalkani.floatingactionbutton:colour
         */
-        public static final int FloatingActionButton_color = 1;
+        public static int FloatingActionButton_colour = 1;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#drawable}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -112,7 +112,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:drawable
         */
-        public static final int FloatingActionButton_drawable = 0;
+        public static int FloatingActionButton_drawable = 0;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowColor}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -126,7 +126,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowColor
         */
-        public static final int FloatingActionButton_shadowColor = 5;
+        public static int FloatingActionButton_shadowColor = 5;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDx}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -140,7 +140,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowDx
         */
-        public static final int FloatingActionButton_shadowDx = 3;
+        public static int FloatingActionButton_shadowDx = 3;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDy}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -154,7 +154,7 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowDy
         */
-        public static final int FloatingActionButton_shadowDy = 4;
+        public static int FloatingActionButton_shadowDy = 4;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowRadius}
           attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -168,6 +168,6 @@ theme attribute (in the form
 containing a value of this type.
           @attr name com.faizmalkani.floatingactionbutton:shadowRadius
         */
-        public static final int FloatingActionButton_shadowRadius = 2;
+        public static int FloatingActionButton_shadowRadius = 2;
     };
 }

libraries/FloatingActionButton/build/generated/source/r/test/debug/com/faizmalkani/floatingactionbutton/R.java

@@ -8,7 +8,7 @@ package com.faizmalkani.floatingactionbutton;
 
 public final class R {
 	public static final class attr {
-		public static final int color = 0x7f010001;
+		public static final int colour = 0x7f010001;
 		public static final int drawable = 0x7f010000;
 		public static final int shadowColor = 0x7f010005;
 		public static final int shadowDx = 0x7f010003;
@@ -17,7 +17,7 @@ public final class R {
 	}
 	public static final class styleable {
 		public static final int[] FloatingActionButton = { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005 };
-		public static final int FloatingActionButton_color = 1;
+		public static final int FloatingActionButton_colour = 1;
 		public static final int FloatingActionButton_drawable = 0;
 		public static final int FloatingActionButton_shadowColor = 5;
 		public static final int FloatingActionButton_shadowDx = 3;

libraries/FloatingActionButton/build/generated/source/r/test/debug/com/faizmalkani/floatingactionbutton/test/R.java

@@ -17,7 +17,7 @@ theme attribute (in the form
 "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
 containing a value of this type.
          */
-        public static final int color=0x7f010001;
+        public static final int colour=0x7f010001;
         /** <p>Must be an integer value, such as "<code>100</code>".
 <p>This may also be a reference to a resource (in the form
 "<code>@[<i>package</i>:]<i>type</i>:<i>name</i></code>") or
@@ -66,14 +66,14 @@ containing a value of this type.
            <colgroup align="left" />
            <colgroup align="left" />
            <tr><th>Attribute</th><th>Description</th></tr>
-           <tr><td><code>{@link #FloatingActionButton_color com.faizmalkani.floatingactionbutton.test:color}</code></td><td></td></tr>
+           <tr><td><code>{@link #FloatingActionButton_colour com.faizmalkani.floatingactionbutton.test:colour}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_drawable com.faizmalkani.floatingactionbutton.test:drawable}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowColor com.faizmalkani.floatingactionbutton.test:shadowColor}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowDx com.faizmalkani.floatingactionbutton.test:shadowDx}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowDy com.faizmalkani.floatingactionbutton.test:shadowDy}</code></td><td></td></tr>
            <tr><td><code>{@link #FloatingActionButton_shadowRadius com.faizmalkani.floatingactionbutton.test:shadowRadius}</code></td><td></td></tr>
            </table>
-           @see #FloatingActionButton_color
+           @see #FloatingActionButton_colour
            @see #FloatingActionButton_drawable
            @see #FloatingActionButton_shadowColor
            @see #FloatingActionButton_shadowDx
@@ -85,7 +85,7 @@ containing a value of this type.
             0x7f010004, 0x7f010005
         };
         /**
-          <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.test.R.attr#color}
+          <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.test.R.attr#colour}
           attribute's value can be found in the {@link #FloatingActionButton} array.
 
 
@@ -96,9 +96,9 @@ containing a value of this type.
 theme attribute (in the form
 "<code>?[<i>package</i>:][<i>type</i>:]<i>name</i></code>")
 containing a value of this type.
-          @attr name com.faizmalkani.floatingactionbutton.test:color
+          @attr name com.faizmalkani.floatingactionbutton.test:colour
         */
-        public static final int FloatingActionButton_color = 1;
+        public static final int FloatingActionButton_colour = 1;
         /**
           <p>This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.test.R.attr#drawable}
           attribute's value can be found in the {@link #FloatingActionButton} array.

libraries/FloatingActionButton/build/intermediates/bundles/debug/AndroidManifest.xml

@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="7"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <application android:allowBackup="true" >
     </application>

libraries/FloatingActionButton/build/intermediates/bundles/debug/R.txt

@@ -1,11 +1,11 @@
-int attr color 0x7f010001
+int attr colour 0x7f010001
 int attr drawable 0x7f010000
 int attr shadowColor 0x7f010005
 int attr shadowDx 0x7f010003
 int attr shadowDy 0x7f010004
 int attr shadowRadius 0x7f010002
 int[] styleable FloatingActionButton { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005 }
-int styleable FloatingActionButton_color 1
+int styleable FloatingActionButton_colour 1
 int styleable FloatingActionButton_drawable 0
 int styleable FloatingActionButton_shadowColor 5
 int styleable FloatingActionButton_shadowDx 3

libraries/FloatingActionButton/build/intermediates/bundles/debug/res/values/values.xml

@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <declare-styleable name="FloatingActionButton"><attr format="integer" name="drawable"/><attr format="color" name="colour"/><attr format="float" name="shadowRadius"/><attr format="float" name="shadowDx"/><attr format="float" name="shadowDy"/><attr format="integer" name="shadowColor"/></declare-styleable>
-    <!-- From: file:/C:/Users/Vlad/Documents/AndroidStudioProjects/turbo-editor/libraries/FloatingActionButton/res/values/attrs.xml -->
-    <eat-comment />
-
-    <declare-styleable name="FloatingActionButton">
-        <attr name="drawable" format="integer" />
-        <attr name="color" format="color" />
-        <attr name="shadowRadius" format="float" />
-        <attr name="shadowDx" format="float" />
-        <attr name="shadowDy" format="float" />
-        <attr name="shadowColor" format="integer" />
-    </declare-styleable>
-
 </resources>

libraries/FloatingActionButton/build/intermediates/bundles/release/AndroidManifest.xml

@@ -6,7 +6,7 @@
 
     <uses-sdk
         android:minSdkVersion="7"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <application android:allowBackup="true" >
     </application>

libraries/FloatingActionButton/build/intermediates/bundles/release/R.txt

@@ -1,11 +1,11 @@
-int attr color 0x7f010001
+int attr colour 0x7f010001
 int attr drawable 0x7f010000
 int attr shadowColor 0x7f010005
 int attr shadowDx 0x7f010003
 int attr shadowDy 0x7f010004
 int attr shadowRadius 0x7f010002
 int[] styleable FloatingActionButton { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005 }
-int styleable FloatingActionButton_color 1
+int styleable FloatingActionButton_colour 1
 int styleable FloatingActionButton_drawable 0
 int styleable FloatingActionButton_shadowColor 5
 int styleable FloatingActionButton_shadowDx 3

libraries/FloatingActionButton/build/intermediates/bundles/release/res/values/values.xml

@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <declare-styleable name="FloatingActionButton"><attr format="integer" name="drawable"/><attr format="color" name="colour"/><attr format="float" name="shadowRadius"/><attr format="float" name="shadowDx"/><attr format="float" name="shadowDy"/><attr format="integer" name="shadowColor"/></declare-styleable>
-    <!-- From: file:/C:/Users/Vlad/Documents/AndroidStudioProjects/turbo-editor/libraries/FloatingActionButton/res/values/attrs.xml -->
-    <eat-comment />
-
-    <declare-styleable name="FloatingActionButton">
-        <attr name="drawable" format="integer" />
-        <attr name="color" format="color" />
-        <attr name="shadowRadius" format="float" />
-        <attr name="shadowDx" format="float" />
-        <attr name="shadowDy" format="float" />
-        <attr name="shadowColor" format="integer" />
-    </declare-styleable>
-
 </resources>

libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/debug/merger.xml

@@ -1,11 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="2" >
+<merger version="3"><dataSet config="main"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\assets"/></dataSet><dataSet config="debug"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\debug\assets"/></dataSet></merger>
-
-    <dataSet config="main" >
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\assets" />
-    </dataSet>
-    <dataSet config="debug" >
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\debug\assets" />
-    </dataSet>
-
-</merger>

libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/release/merger.xml

@@ -1,11 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="2" >
+<merger version="3"><dataSet config="main"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\assets"/></dataSet><dataSet config="release"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\release\assets"/></dataSet></merger>
-
-    <dataSet config="main" >
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\assets" />
-    </dataSet>
-    <dataSet config="release" >
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\release\assets" />
-    </dataSet>
-
-</merger>

libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/test/debug/merger.xml

@@ -1,11 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="2" >
+<merger version="3"><dataSet config="debug"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\intermediates\bundles\debug\assets"/></dataSet><dataSet config="main"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\androidTest\assets"/></dataSet></merger>
-
-    <dataSet config="debug" >
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\intermediates\bundles\debug\assets" />
-    </dataSet>
-    <dataSet config="main" >
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\androidTest\assets" />
-    </dataSet>
-
-</merger>

libraries/FloatingActionButton/build/intermediates/incremental/mergeResources/test/debug/merger.xml

@@ -1,38 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="2" >
+<merger version="3"><dataSet config="debug"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\intermediates\bundles\debug\res"><file path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\intermediates\bundles\debug\res\values\values.xml" qualifiers=""><declare-styleable name="FloatingActionButton"><attr format="integer" name="drawable"/><attr format="color" name="colour"/><attr format="float" name="shadowRadius"/><attr format="float" name="shadowDx"/><attr format="float" name="shadowDy"/><attr format="integer" name="shadowColor"/></declare-styleable></file></source></dataSet><dataSet config="main"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\androidTest\res"/><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\rs\test\debug"/><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\generated\test\debug"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="FloatingActionButton"><attr format="integer" name="drawable"/><attr format="color" name="colour"/><attr format="float" name="shadowRadius"/><attr format="float" name="shadowDx"/><attr format="float" name="shadowDy"/><attr format="integer" name="shadowColor"/></declare-styleable></configuration></mergedItems></merger>
-
-    <dataSet config="debug" >
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\intermediates\bundles\debug\res" >
-            <file
-                path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\intermediates\bundles\debug\res\values\values.xml"
-                qualifiers="" >
-                <declare-styleable name="FloatingActionButton" >
-                    <attr
-                        name="drawable"
-                        format="integer" />
-                    <attr
-                        name="color"
-                        format="color" />
-                    <attr
-                        name="shadowRadius"
-                        format="float" />
-                    <attr
-                        name="shadowDx"
-                        format="float" />
-                    <attr
-                        name="shadowDy"
-                        format="float" />
-                    <attr
-                        name="shadowColor"
-                        format="integer" />
-                </declare-styleable>
-            </file>
-        </source>
-    </dataSet>
-    <dataSet config="main" >
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\androidTest\res" />
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\rs\test\debug" />
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\generated\test\debug" />
-    </dataSet>
-
-</merger>

libraries/FloatingActionButton/build/intermediates/incremental/packageResources/debug/merger.xml

@@ -1,38 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="2" >
+<merger version="3"><dataSet config="main"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\res"><file path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\res\values\attrs.xml" qualifiers=""><declare-styleable name="FloatingActionButton">
-
+        <attr format="integer" name="drawable"/>
-    <dataSet config="main" >
+        <attr format="color" name="colour"/>
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\res" >
+        <attr format="float" name="shadowRadius"/>
-            <file
+        <attr format="float" name="shadowDx"/>
-                path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\res\values\attrs.xml"
+        <attr format="float" name="shadowDy"/>
-                qualifiers="" >
+        <attr format="integer" name="shadowColor"/>
-                <declare-styleable name="FloatingActionButton" >
+    </declare-styleable></file></source><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\rs\debug"/><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\generated\debug"/></dataSet><dataSet config="debug"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\debug\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="FloatingActionButton"><attr format="integer" name="drawable"/><attr format="color" name="colour"/><attr format="float" name="shadowRadius"/><attr format="float" name="shadowDx"/><attr format="float" name="shadowDy"/><attr format="integer" name="shadowColor"/></declare-styleable></configuration></mergedItems></merger>
-                    <attr
-                        name="drawable"
-                        format="integer" />
-                    <attr
-                        name="color"
-                        format="color" />
-                    <attr
-                        name="shadowRadius"
-                        format="float" />
-                    <attr
-                        name="shadowDx"
-                        format="float" />
-                    <attr
-                        name="shadowDy"
-                        format="float" />
-                    <attr
-                        name="shadowColor"
-                        format="integer" />
-                </declare-styleable>
-            </file>
-        </source>
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\rs\debug" />
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\generated\debug" />
-    </dataSet>
-    <dataSet config="debug" >
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\debug\res" />
-    </dataSet>
-
-</merger>

libraries/FloatingActionButton/build/intermediates/incremental/packageResources/release/merger.xml

@@ -1,38 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merger version="2" >
+<merger version="3"><dataSet config="main"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\res"><file path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\res\values\attrs.xml" qualifiers=""><declare-styleable name="FloatingActionButton">
-
+        <attr format="integer" name="drawable"/>
-    <dataSet config="main" >
+        <attr format="color" name="colour"/>
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\res" >
+        <attr format="float" name="shadowRadius"/>
-            <file
+        <attr format="float" name="shadowDx"/>
-                path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\res\values\attrs.xml"
+        <attr format="float" name="shadowDy"/>
-                qualifiers="" >
+        <attr format="integer" name="shadowColor"/>
-                <declare-styleable name="FloatingActionButton" >
+    </declare-styleable></file></source><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\rs\release"/><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\generated\release"/></dataSet><dataSet config="release"><source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\release\res"/></dataSet><mergedItems><configuration qualifiers=""><declare-styleable name="FloatingActionButton"><attr format="integer" name="drawable"/><attr format="color" name="colour"/><attr format="float" name="shadowRadius"/><attr format="float" name="shadowDx"/><attr format="float" name="shadowDy"/><attr format="integer" name="shadowColor"/></declare-styleable></configuration></mergedItems></merger>
-                    <attr
-                        name="drawable"
-                        format="integer" />
-                    <attr
-                        name="color"
-                        format="color" />
-                    <attr
-                        name="shadowRadius"
-                        format="float" />
-                    <attr
-                        name="shadowDx"
-                        format="float" />
-                    <attr
-                        name="shadowDy"
-                        format="float" />
-                    <attr
-                        name="shadowColor"
-                        format="integer" />
-                </declare-styleable>
-            </file>
-        </source>
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\rs\release" />
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\build\generated\res\generated\release" />
-    </dataSet>
-    <dataSet config="release" >
-        <source path="C:\Users\Vlad\Documents\AndroidStudioProjects\turbo-editor\libraries\FloatingActionButton\src\release\res" />
-    </dataSet>
-
-</merger>

libraries/FloatingActionButton/build/intermediates/manifests/test/debug/AndroidManifest.xml

@@ -4,7 +4,7 @@
 
     <uses-sdk
         android:minSdkVersion="7"
-        android:targetSdkVersion="19" />
+        android:targetSdkVersion="21" />
 
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"

libraries/FloatingActionButton/build/intermediates/manifests/tmp/manifestMerger1672337899454975879.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.faizmalkani.floatingactionbutton.test">
+
+    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="21" />
+
+    <application>
+        <uses-library android:name="android.test.runner" />
+    </application>
+
+    <instrumentation android:name="android.test.InstrumentationTestRunner"
+                     android:targetPackage="com.faizmalkani.floatingactionbutton.test"
+                     android:handleProfiling="false"
+                     android:functionalTest="false"
+                     android:label="Tests for com.faizmalkani.floatingactionbutton.test"/>
+</manifest>

libraries/FloatingActionButton/build/intermediates/res/test/debug/values/values.xml

@@ -1,16 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
+    <declare-styleable name="FloatingActionButton"><attr format="integer" name="drawable"/><attr format="color" name="colour"/><attr format="float" name="shadowRadius"/><attr format="float" name="shadowDx"/><attr format="float" name="shadowDy"/><attr format="integer" name="shadowColor"/></declare-styleable>
-    <!-- From: file:/C:/Users/Vlad/Documents/AndroidStudioProjects/turbo-editor/libraries/FloatingActionButton/build/intermediates/bundles/debug/res/values/values.xml -->
-    <eat-comment />
-
-    <declare-styleable name="FloatingActionButton">
-        <attr name="drawable" format="integer" />
-        <attr name="color" format="color" />
-        <attr name="shadowRadius" format="float" />
-        <attr name="shadowDx" format="float" />
-        <attr name="shadowDy" format="float" />
-        <attr name="shadowColor" format="integer" />
-    </declare-styleable>
-
 </resources>

libraries/FloatingActionButton/build/intermediates/symbols/test/debug/R.txt

@@ -1,11 +1,11 @@
-int attr color 0x7f010001
+int attr colour 0x7f010001
 int attr drawable 0x7f010000
 int attr shadowColor 0x7f010005
 int attr shadowDx 0x7f010003
 int attr shadowDy 0x7f010004
 int attr shadowRadius 0x7f010002
 int[] styleable FloatingActionButton { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005 }
-int styleable FloatingActionButton_color 1
+int styleable FloatingActionButton_colour 1
 int styleable FloatingActionButton_drawable 0
 int styleable FloatingActionButton_shadowColor 5
 int styleable FloatingActionButton_shadowDx 3

libraries/FloatingActionButton/res/values/attrs.xml

@@ -3,7 +3,7 @@
 
     <declare-styleable name="FloatingActionButton">
         <attr name="drawable" format="integer"/>
-        <attr name="color" format="color"/>
+        <attr name="colour" format="color"/>
         <attr name="shadowRadius" format="float"/>
         <attr name="shadowDx" format="float"/>
         <attr name="shadowDy" format="float"/>

libraries/FloatingActionButton/src/com/faizmalkani/floatingactionbutton/FloatingActionButton.java

@@ -52,7 +52,7 @@ public class FloatingActionButton extends View {
         super(context, attrs, defStyleAttr);
 
         TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.FloatingActionButton);
-        mColor = a.getColor(R.styleable.FloatingActionButton_color, Color.WHITE);
+        mColor = a.getColor(R.styleable.FloatingActionButton_colour, Color.WHITE);
         mButtonPaint.setStyle(Paint.Style.FILL);
         mButtonPaint.setColor(mColor);
         float radius, dx, dy;

libraries/RootCommands/build.gradle

@@ -15,12 +15,16 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 20
+    compileSdkVersion 21
-    buildToolsVersion '20.0.0'
+    buildToolsVersion '21.0.2'
 
     defaultConfig {
         minSdkVersion 7
-        targetSdkVersion 19
+        targetSdkVersion 21
+    }
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_7
+        targetCompatibility JavaVersion.VERSION_1_7
     }
 }
 

libraries/sharedCode/build.gradle

@@ -24,13 +24,13 @@ android {
         disable 'MissingTranslation', 'ExtraTranslation'
     }
 
-    compileSdkVersion 20
+    compileSdkVersion 21
-    buildToolsVersion '20.0.0'
+    buildToolsVersion '21.0.2'
 
     defaultConfig {
         applicationId "sharedcode.turboeditor"
         minSdkVersion 11
-        targetSdkVersion 19
+        targetSdkVersion 21
         versionCode 1
         versionName "1.0"
     }
@@ -66,7 +66,10 @@ dependencies {
     //    compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
     compile 'org.apache.commons:commons-lang3:3.1'
     compile files('libs/juniversalchardet-1.0.3.jar')
-    compile 'com.android.support:support-v4:19.0.+'
+    compile ("com.android.support:appcompat-v7:21.+") {
+        exclude group: 'com.android.support', module: 'support-v4'
+    }
+    compile 'com.android.support:support-v4:21.+'
     compile 'com.github.gabrielemariotti.changeloglib:library:1.5.1'
     compile 'commons-io:commons-io:2.4'
     compile 'com.android.support:support-annotations:20.0.0'

libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/BaseHomeActivity.java

@@ -19,8 +19,6 @@
 
 package sharedcode.turboeditor.activity;
 
-import android.app.ActionBar;
-import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.ActivityNotFoundException;
 import android.content.Context;
@@ -36,12 +34,18 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.preference.PreferenceManager;
-import android.support.v4.app.ActionBarDrawerToggle;
+import android.support.annotation.Nullable;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.widget.ShareActionProvider;
+import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.InputType;
 import android.text.Selection;
 import android.text.Spannable;
 import android.text.TextPaint;
+import android.text.TextUtils;
 import android.text.TextWatcher;
 import android.text.method.KeyListener;
 import android.text.style.ForegroundColorSpan;
@@ -54,13 +58,16 @@ import android.view.MenuItem;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
 import android.widget.EditText;
 import android.widget.HorizontalScrollView;
+import android.widget.ListView;
 import android.widget.Toast;
 
 import com.faizmalkani.floatingactionbutton.FloatingActionButton;
 
 import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.ArrayUtils;
 import org.sufficientlysecure.rootcommands.Shell;
 import org.sufficientlysecure.rootcommands.Toolbox;
 
@@ -73,6 +80,7 @@ import java.util.regex.Pattern;
 
 import de.greenrobot.event.EventBus;
 import sharedcode.turboeditor.R;
+import sharedcode.turboeditor.adapter.AdapterDrawer;
 import sharedcode.turboeditor.fragment.ChangelogDialog;
 import sharedcode.turboeditor.fragment.FileInfoDialog;
 import sharedcode.turboeditor.fragment.FindTextDialog;
@@ -108,11 +116,12 @@ import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChan
 import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.THEME_CHANGE;
 import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.WRAP_CONTENT;
 
-public abstract class BaseHomeActivity extends Activity implements FindTextDialog
+public abstract class BaseHomeActivity extends ActionBarActivity implements FindTextDialog
         .SearchDialogInterface, GoodScrollView.ScrollInterface, PageSystem.PageSystemInterface,
-        PageSystemButtons.PageButtonsInterface, SeekbarDialog.ISeekbarDialog, SaveFileDialog.ISaveDialog {
+        PageSystemButtons.PageButtonsInterface, SeekbarDialog.ISeekbarDialog, SaveFileDialog.ISaveDialog,
+        AdapterView.OnItemClickListener, AdapterDrawer.Callbacks{
 
-    //region EDITOR VARIABLES
+    //region VARIABLES
     static final int
             ID_SELECT_ALL = android.R.id.selectAll;
     static final int ID_CUT = android.R.id.cut;
@@ -160,9 +169,18 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
     private PageSystem pageSystem;
     private PageSystemButtons pageSystemButtons;
     private String currentEncoding = "UTF-8";
+    private Toolbar toolbar;
+
+    /*
+    Navigation Drawer
+     */
+    private AdapterDrawer arrayAdapter;
+    private LinkedList<File> files;
+    private ListView listView;
     //endregion
 
     //region Activity facts
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         // set the windows background
@@ -171,6 +189,8 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
         super.onCreate(savedInstanceState);
         // setup the layout
         setContentView(R.layout.activity_home);
+        toolbar = (Toolbar) findViewById(R.id.my_awesome_toolbar);
+        setSupportActionBar(toolbar);
         // setup the navigation drawer
         setupNavigationDrawer();
         // reset text editor
@@ -181,7 +201,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
             // Open
             mDrawerLayout.openDrawer(Gravity.START);
             // Set the default title
-            getActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
+            getSupportActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
         }
         // parse the intent
         parseIntent(getIntent());
@@ -201,6 +221,8 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
         super.onResume();
         // Register the Event Bus for events
         EventBus.getDefault().registerSticky(this);
+        // Refresh the list view
+        refreshList();
     }
 
     @Override
@@ -289,7 +311,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
                 hideTextEditor();
 
                 // Set the default title
-                getActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
+                getSupportActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
 
                 EventBus.getDefault().post(new EventBusEvents.ClosedAFile());
 
@@ -311,13 +333,15 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
             String path = "";
             if (requestCode == SELECT_FILE_CODE) {
                 path = data.getStringExtra("path");
+                if(TextUtils.isEmpty(path))
+                    path = AccessStorageApi.getPath(getBaseContext(), data.getData());
             }
 
             if (requestCode == KITKAT_OPEN_REQUEST_CODE) {
                 path = AccessStorageApi.getPath(getBaseContext(), data.getData());
             }
 
-            if (!path.isEmpty()) {
+            if (!TextUtils.isEmpty(path)) {
                 File file = new File(path);
                 if (file.isFile() && file.exists()) {
                     EventBus.getDefault().postSticky(new EventBusEvents.NewFileToOpen(new File
@@ -327,6 +351,15 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
 
         }
     }
+
+    @Override
+    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        // Path of the file selected
+        String filePath = files.get(position).getAbsolutePath();
+        // Send the event that a file was selected
+        EventBus.getDefault().post(new EventBusEvents.NewFileToOpen(new File(filePath)));
+    }
+
     //endregion
 
     //region MENU
@@ -343,11 +376,6 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
 
-        ActionBar ab = getActionBar();
-        if (ab == null)
-            return false;
-
-
         if (fileOpened && searchingText) {
             MenuItem imReplace = menu.findItem(R.id.im_replace);
             MenuItem imPrev = menu.findItem(R.id.im_previous_item);
@@ -379,6 +407,16 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
                 imUndo.setVisible(false);
                 imRedo.setVisible(false);
             }
+
+            MenuItem item = (MenuItem) menu.findItem(R.id.im_share);
+            ShareActionProvider shareAction = (ShareActionProvider) MenuItemCompat
+                    .getActionProvider(item);
+            File f = new File(sFilePath);
+            Intent shareIntent = new Intent();
+            shareIntent.setAction(Intent.ACTION_SEND);
+            shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(f));
+            shareIntent.setType("text/plain");
+            shareAction.setShareIntent(shareIntent);
         }
 
         return true;
@@ -388,7 +426,8 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
     public boolean onOptionsItemSelected(MenuItem item) {
         int i = item.getItemId();
         if (mDrawerToggle.onOptionsItemSelected(item)) {
-            mDrawerLayout.closeDrawer(Gravity.RIGHT);
+            Toast.makeText(getBaseContext(), "drawer click", Toast.LENGTH_SHORT).show();
+            mDrawerLayout.closeDrawer(Gravity.END);
             return true;
         } else if (i == R.id.im_save) {
             saveTheFile();
@@ -432,15 +471,6 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
                 //
             }
 
-        } else if (i == R.id.im_share) {
-            File f = new File(sFilePath);
-            Intent shareIntent = new Intent();
-            shareIntent.setAction(Intent.ACTION_SEND);
-            shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(f));
-            shareIntent.setType("text/plain");
-
-            startActivity(Intent.createChooser(shareIntent, getString(R.string.share)));
-
         } else if (i == R.id.im_info) {
             FileInfoDialog dialogFrag = FileInfoDialog.newInstance(sFilePath);
 
@@ -543,25 +573,22 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
      */
     private void setupNavigationDrawer() {
         mDrawerLayout = (CustomDrawerLayout) findViewById(R.id.drawer_layout);
-        /* Action Bar */
+        /* Action Bar
-        final ActionBar ab = getActionBar();
+        final ActionBar ab = toolbar;
         ab.setDisplayHomeAsUpEnabled(true);
-        ab.setHomeButtonEnabled(true);
+        ab.setHomeButtonEnabled(true);*/
         /* Navigation drawer */
         mDrawerToggle =
                 new ActionBarDrawerToggle(
                         this,
                         mDrawerLayout,
-                        R.drawable.ic_drawer,
+                        toolbar,
                         R.string.nome_app_turbo_editor,
                         R.string.nome_app_turbo_editor) {
 
-                    /**
-                     * {@inheritDoc}
-                     */
                     @Override
                     public void onDrawerOpened(View drawerView) {
-                        invalidateOptionsMenu();
+                        supportInvalidateOptionsMenu();
                         try {
                             closeKeyBoard();
                         } catch (NullPointerException e) {
@@ -569,17 +596,21 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
                         }
                     }
 
-                    /**
-                     * {@inheritDoc}
-                     */
                     @Override
                     public void onDrawerClosed(View view) {
-                        invalidateOptionsMenu();
+                        supportInvalidateOptionsMenu();
                     }
                 };
         /* link the mDrawerToggle to the Drawer Layout */
         mDrawerLayout.setDrawerListener(mDrawerToggle);
 //mDrawerLayout.setFocusableInTouchMode(false);
+
+        listView = (ListView) findViewById(android.R.id.list);
+        listView.setEmptyView(findViewById(android.R.id.empty));
+        files = new LinkedList<>();
+        arrayAdapter = new AdapterDrawer(this, files, this);
+        listView.setAdapter(arrayAdapter);
+        listView.setOnItemClickListener(this);
     }
 
     private void setupTextEditor() {
@@ -696,7 +727,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
     }
 
     public void updateTextSyntax() {
-        if (!PreferenceHelper.getSyntaxHiglight(getBaseContext()) || mEditor.hasSelection() ||
+        if (!PreferenceHelper.getSyntaxHighlight(getBaseContext()) || mEditor.hasSelection() ||
                 updateHandler == null || colorRunnable_duringEditing == null)
             return;
 
@@ -704,6 +735,48 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
         updateHandler.removeCallbacks(colorRunnable_duringScroll);
         updateHandler.postDelayed(colorRunnable_duringEditing, SYNTAX_DELAY_MILLIS_LONG);
     }
+
+    private void refreshList(){
+        refreshList(null, false, false);
+    }
+
+    private void refreshList(@Nullable String path, boolean add, boolean delete) {
+        int max_recent_files = 15;
+        if(add)
+            max_recent_files--;
+
+        // File paths saved in preferences
+        String[] savedPaths = PreferenceHelper.getSavedPaths(this);
+        int first_index_of_array = savedPaths.length > max_recent_files ? savedPaths.length - max_recent_files : 0;
+        savedPaths = ArrayUtils.subarray(savedPaths, first_index_of_array, savedPaths.length);
+        // File names for the list
+        files.clear();
+        // StringBuilder that will contain the file paths
+        StringBuilder sb = new StringBuilder();
+        // for cycle to convert paths to names
+
+        for(int i = 0; i < savedPaths.length; i++){
+            String savedPath = savedPaths[i];
+            File file = new File(savedPath);
+            // Check that the file exist
+            if (file.exists()) {
+                if(path != null && path.equals(savedPath) && delete)
+                    continue;
+                else {
+                    files.addFirst(file);
+                    sb.append(savedPath).append(",");
+                }
+            }
+        }
+        if(path != null && !path.isEmpty() && add && !ArrayUtils.contains(savedPaths, path)) {
+            sb.append(path).append(",");
+            files.addFirst(new File(path));
+        }
+        // save list without empty or non existed files
+        PreferenceHelper.setSavedPaths(this, sb);
+        // Set adapter
+        arrayAdapter.notifyDataSetChanged();
+    }
     //endregion
 
     //region EVENTBUS
@@ -718,8 +791,8 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
 
         new AsyncTask<Void, Void, Void>() {
 
-            File file;
+            File file = event.getFile();
-            String message;
+            String message = "";
             String fileText;
             String encoding;
             ProgressDialog progressDialog;
@@ -729,8 +802,6 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
                 super.onPreExecute();
                 // Close the drawer
                 mDrawerLayout.closeDrawer(Gravity.START);
-                file = event.getFile();
-                message = "";
                 progressDialog = new ProgressDialog(BaseHomeActivity.this);
                 progressDialog.setMessage(getString(R.string.please_wait));
                 progressDialog.show();
@@ -742,7 +813,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
                 try {
                     boolean isRoot = false;
 
-                    if (!file.exists()) {
+                    if (!file.exists() || !file.isFile()) {
                         fileText = event.getFileText();
                         return null;
                     }
@@ -811,15 +882,20 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
 
                     String name = FilenameUtils.getName(sFilePath);
                     if (name.isEmpty())
-                        getActionBar().setTitle("*");
+                        getSupportActionBar().setTitle(R.string.new_file);
                     else
-                        getActionBar().setTitle(name);
+                        getSupportActionBar().setTitle(name);
 
+                    if(!name.isEmpty()) {
+                        refreshList(sFilePath, true, false);
+                    }
                 }
 
             }
         }.execute();
 
+        EventBus.getDefault().removeStickyEvent(event);
+
     }
 
     public void onEvent(EventBusEvents.SavedAFile event) {
@@ -833,7 +909,8 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
         } catch (NullPointerException e) {
             e.printStackTrace();
         }
-        // Get intent, action and MIME type
+
+        /*// Get intent, action and MIME type
         final Intent intent = getIntent();
         final String action = intent.getAction();
         final String type = intent.getType();
@@ -847,7 +924,10 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
             setResult(Activity.RESULT_OK, returnIntent);
             // finish the activity
             finish();
-        }
+        }*/
+
+        refreshList(event.getPath(), true, false);
+        arrayAdapter.selectView(event.getPath());
 
         displayInterstitial();
     }
@@ -862,7 +942,9 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
         //
         mDrawerLayout.openDrawer(Gravity.LEFT);
         //
-        getActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
+        getSupportActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
+        //
+        supportInvalidateOptionsMenu();
         // Replace fragment
         hideTextEditor();
     }
@@ -965,14 +1047,22 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
             }
         }
     }
+
+    public void onEvent(EventBusEvents.AFileIsSelected event) {
+        arrayAdapter.selectView(event.getPath());
+
+        EventBus.getDefault().removeStickyEvent(event);
+    }
+
+    public void onEvent(EventBusEvents.ClosedAFile event) {
+        arrayAdapter.selectView("");
+    }
     //endregion
 
     //region Calls from the layout
     public void OpenFile(View view) {
-
         Intent subActivity = new Intent(BaseHomeActivity.this, SelectFileActivity.class);
         subActivity.putExtra("action", SelectFileActivity.Actions.SelectFile);
-
         AnimationUtils.startActivityWithScale(this, subActivity, true, SELECT_FILE_CODE, view);
     }
 
@@ -1093,7 +1183,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
     public void onScrollChanged(int l, int t, int oldl, int oldt) {
         pageSystemButtons.updateVisibility(Math.abs(t) > 10);
 
-        if (!PreferenceHelper.getSyntaxHiglight(getBaseContext()) || (mEditor.hasSelection() &&
+        if (!PreferenceHelper.getSyntaxHighlight(getBaseContext()) || (mEditor.hasSelection() &&
                 !searchingText) || updateHandler == null || colorRunnable_duringScroll == null)
             return;
 
@@ -1139,8 +1229,16 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
         mEditor.canSaveFile = false;
         if(openNewFile)
             onEvent(new EventBusEvents.NewFileToOpen(new File(pathOfNewFile)));
+        else
+            onEvent(new EventBusEvents.CannotOpenAFile());
     }
 
+    @Override
+    public void CancelItem(int position, boolean andCloseOpenedFile) {
+        refreshList(files.get(position).getAbsolutePath(), false, true);
+        if (andCloseOpenedFile)
+            EventBus.getDefault().post(new EventBusEvents.CannotOpenAFile());
+    }
     //endregion
 
     public static class Editor extends EditText {
@@ -1645,7 +1743,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
             disableTextChangedListener();
             modified = false;
 
-            if (PreferenceHelper.getSyntaxHiglight(getContext()))
+            if (PreferenceHelper.getSyntaxHighlight(getContext()))
                 setText(highlight(textToUpdate == null ? getEditableText() : Editable.Factory
                         .getInstance().newEditable(textToUpdate), textToUpdate != null));
             else

libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/LicensesActivity.java

@@ -20,6 +20,7 @@
 package sharedcode.turboeditor.activity;
 
 import android.app.Activity;
+import android.app.FragmentManager;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;

libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/SelectFileActivity.java

@@ -19,11 +19,13 @@
 
 package sharedcode.turboeditor.activity;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.SearchView;
+import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -32,7 +34,6 @@ import android.widget.AdapterView;
 import android.widget.Filter;
 import android.widget.ListView;
 import android.widget.PopupMenu;
-import android.widget.SearchView;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -61,7 +62,7 @@ import sharedcode.turboeditor.util.AlphanumComparator;
 import sharedcode.turboeditor.util.Build;
 import sharedcode.turboeditor.util.ThemeUtils;
 
-public class SelectFileActivity extends Activity implements SearchView.OnQueryTextListener, AdapterView.OnItemClickListener, EditTextDialog.EditDialogListener {
+public class SelectFileActivity extends ActionBarActivity implements SearchView.OnQueryTextListener, AdapterView.OnItemClickListener, EditTextDialog.EditDialogListener {
     private String currentFolder = PreferenceHelper.SD_CARD_ROOT;
     private ListView listView;
     private boolean wantAFile = true;
@@ -78,7 +79,10 @@ public class SelectFileActivity extends Activity implements SearchView.OnQueryTe
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_select_file);
 
-        getActionBar().setDisplayHomeAsUpEnabled(true);
+        Toolbar toolbar = (Toolbar) findViewById(R.id.my_awesome_toolbar);
+        setSupportActionBar(toolbar);
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         final Actions action = (Actions) getIntent().getExtras().getSerializable("action");
         wantAFile = action == Actions.SelectFile;

libraries/sharedCode/src/main/java/sharedcode/turboeditor/adapter/AdapterDrawer.java

@@ -30,7 +30,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import java.io.File;
-import java.util.ArrayList;
+import java.util.List;
 
 import sharedcode.turboeditor.R;
 
@@ -41,11 +41,11 @@ public class AdapterDrawer extends
     // Layout Inflater
     private final LayoutInflater inflater;
     // List of file details
-    private final ArrayList<File> files;
+    private final List<File> files;
     private String selectedPath = "";
 
     public AdapterDrawer(Context context,
-                         ArrayList<File> files,
+                         List<File> files,
                          Callbacks callbacks) {
         super(context, R.layout.item_file_list, files);
         this.files = files;
@@ -80,13 +80,9 @@ public class AdapterDrawer extends
             });
 
             if (TextUtils.equals(selectedPath, files.get(position).getAbsolutePath())) {
-                hold.nameLabel.setTypeface(hold.nameLabel.getTypeface(), Typeface.BOLD);
+                hold.nameLabel.setTypeface(null, Typeface.BOLD);
-                convertView.setBackgroundColor((convertView.getResources()
-                        .getColor(R.color.item_selected)));
             } else {
-                hold.nameLabel.setTypeface(hold.nameLabel.getTypeface(), Typeface.NORMAL);
+                hold.nameLabel.setTypeface(null, Typeface.NORMAL);
-                convertView.setBackgroundColor((convertView.getResources()
-                        .getColor(android.R.color.transparent)));
             }
 
         } else {
@@ -105,12 +101,8 @@ public class AdapterDrawer extends
 
             if (TextUtils.equals(selectedPath, files.get(position).getAbsolutePath())) {
                 hold.nameLabel.setTypeface(null, Typeface.BOLD);
-                convertView.setBackgroundColor((convertView.getResources()
-                        .getColor(R.color.item_selected)));
             } else {
                 hold.nameLabel.setTypeface(null, Typeface.NORMAL);
-                convertView.setBackgroundColor((convertView.getResources()
-                        .getColor(android.R.color.transparent)));
             }
         }
         return convertView;

libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/EditTextDialog.java

@@ -32,6 +32,7 @@ import android.widget.EditText;
 import android.widget.TextView;
 
 import sharedcode.turboeditor.R;
+import sharedcode.turboeditor.views.DialogHelper;
 
 // ...
 public class EditTextDialog extends DialogFragment implements TextView.OnEditorActionListener {
@@ -55,22 +56,25 @@ public class EditTextDialog extends DialogFragment implements TextView.OnEditorA
     public Dialog onCreateDialog(Bundle savedInstanceState) {
 
         final Actions action = (Actions) getArguments().getSerializable("action");
-        final String hint;
+        final String title;
         switch (action) {
             case NewFile:
-                hint = getString(R.string.file);
+                title = getString(R.string.file);
                 break;
             case NewFolder:
-                hint = getString(R.string.folder);
+                title = getString(R.string.folder);
                 break;
             default:
-                hint = null;
+                title = null;
                 break;
         }
 
-        final View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_fragment_edittext, null);
+        View view = new DialogHelper.Builder(getActivity())
+                .setTitle(title)
+                .setView(R.layout.dialog_fragment_edittext)
+                .createSkeletonView();
         this.mEditText = (EditText) view.findViewById(android.R.id.edit);
-        this.mEditText.setHint(hint);
+        this.mEditText.setHint(R.string.name);
 
         // Show soft keyboard automatically
         this.mEditText.setText(getArguments().getString("hint"));

libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/EncodingDialog.java

@@ -23,12 +23,12 @@ import android.app.AlertDialog;
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.os.Bundle;
+import android.support.v7.widget.SwitchCompat;
 import android.view.View;
 import android.widget.AdapterView;
 import android.widget.ArrayAdapter;
 import android.widget.CompoundButton;
 import android.widget.ListView;
-import android.widget.Switch;
 
 import org.mozilla.universalchardet.Constants;
 
@@ -77,7 +77,7 @@ public class EncodingDialog extends DialogFragment implements AdapterView.OnItem
 
         final View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_encoding_list, null);
         list = (ListView) view.findViewById(android.R.id.list);
-        Switch autoencoding = (Switch) view.findViewById(android.R.id.checkbox);
+        SwitchCompat autoencoding = (SwitchCompat) view.findViewById(android.R.id.checkbox);
         autoencoding.setChecked(PreferenceHelper.getAutoEncoding(getActivity()));
 
         autoencoding.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {

libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/FileInfoDialog.java

@@ -34,6 +34,7 @@ import java.util.Date;
 
 import sharedcode.turboeditor.R;
 import sharedcode.turboeditor.adapter.AdapterTwoItem;
+import sharedcode.turboeditor.views.DialogHelper;
 
 // ...
 public class FileInfoDialog extends DialogFragment {
@@ -49,7 +50,12 @@ public class FileInfoDialog extends DialogFragment {
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
 
-        final View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_fragment_file_info, null);
+        View view = new DialogHelper.Builder(getActivity())
+                .setTitle(R.string.info)
+                .setView(R.layout.dialog_fragment_file_info)
+                .createSkeletonView();
+        //final View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_fragment_file_info, null);
+
         ListView list = (ListView) view.findViewById(android.R.id.list);
 
         File file = new File(getArguments().getString("filePath"));
@@ -76,8 +82,8 @@ public class FileInfoDialog extends DialogFragment {
 
         list.setAdapter(new AdapterTwoItem(getActivity(), lines1, lines2));
 
+
         return new AlertDialog.Builder(getActivity())
-                //.setTitle(title)
                 .setView(view)
                 .setPositiveButton(android.R.string.ok,
                         new DialogInterface.OnClickListener() {

libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/NavigationDrawer.java

@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2014 Vlad Mihalachi
- *
- * This file is part of Turbo Editor.
- *
- * Turbo Editor is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Turbo Editor is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package sharedcode.turboeditor.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ListView;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import de.greenrobot.event.EventBus;
-import sharedcode.turboeditor.R;
-import sharedcode.turboeditor.adapter.AdapterDrawer;
-import sharedcode.turboeditor.preferences.PreferenceHelper;
-import sharedcode.turboeditor.util.EventBusEvents;
-
-
-public class NavigationDrawer extends Fragment implements AdapterView.OnItemClickListener, AdapterDrawer.Callbacks {
-
-
-    private AdapterDrawer arrayAdapter;
-    private ArrayList<File> files;
-    private ListView listView;
-
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // Our custom layout
-        View rootView = inflater.inflate(R.layout.fragment_navigation_drawer, container, false);
-        listView = (ListView) rootView.findViewById(android.R.id.list);
-        listView.setEmptyView(rootView.findViewById(android.R.id.empty));
-        files = new ArrayList<>();
-        arrayAdapter = new AdapterDrawer(getActivity(), files, this);
-        listView.setAdapter(arrayAdapter);
-        return rootView;
-    }
-
-
-    @Override
-    public void onViewCreated(View view, Bundle savedInstanceState) {
-        super.onViewCreated(view, savedInstanceState);
-        listView.setOnItemClickListener(this);
-    }
-
-
-    @Override
-    public void onResume() {
-        super.onResume();
-        // Register the Event Bus for events
-        EventBus.getDefault().registerSticky(this);
-        // Refresh the list view
-        refreshList();
-    }
-
-
-    @Override
-    public void onPause() {
-        super.onPause();
-        // Unregister the Event Bus
-        EventBus.getDefault().unregister(this);
-    }
-
-    @Override
-    public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-        // File paths saved in preferences
-        String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
-        // Path of the file selected
-        String filePath = savedPaths[position];
-        // Send the event that a file was selected
-        EventBus.getDefault().post(new EventBusEvents.NewFileToOpen(new File(filePath)));
-    }
-
-    public void onEvent(EventBusEvents.AFileIsSelected event) {
-        arrayAdapter.selectView(event.getPath());
-
-        EventBus.getDefault().removeStickyEvent(event);
-    }
-
-    public void onEvent(EventBusEvents.NewFileToOpen event) {
-
-        // File paths saved in preferences
-        String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
-        String selectedPath = event.getFile().getAbsolutePath();
-        boolean pathAlreadyExist = false;
-        for (String savedPath : savedPaths) {
-            // We don't need to save the file path twice
-            if (savedPath.equals(selectedPath)) {
-                pathAlreadyExist = true;
-            }
-        }
-        // Add the path if it wasn't added before
-        if (!pathAlreadyExist)
-            addPath(selectedPath);
-
-        EventBus.getDefault().removeStickyEvent(event);
-    }
-
-    public void onEvent(EventBusEvents.SavedAFile event) {
-        if (addPath(event.getPath())) {
-            arrayAdapter.selectView(event.getPath());
-        }
-    }
-
-    public void onEvent(EventBusEvents.ClosedAFile event) {
-        arrayAdapter.selectView("");
-    }
-
-    private boolean addPath(String path) {
-        // File paths saved in preferences
-        String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
-        // StringBuilder
-        StringBuilder sb = new StringBuilder();
-        boolean pathAlreadyExist = false;
-        for (String savedPath : savedPaths) {
-            // Append the file path and a comma
-            sb.append(savedPath).append(",");
-            if (savedPath.equals(path))
-                pathAlreadyExist = true;
-        }
-        // Append new path
-        if (!pathAlreadyExist)
-            sb.append(path);
-        // Put the string and commit
-        PreferenceHelper.setSavedPaths(getActivity(), sb);
-        // Update list
-        refreshList();
-
-        return pathAlreadyExist == false;
-    }
-
-    private void removePath(String path) {
-        // File paths saved in preferences
-        String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
-        // StringBuilder
-        StringBuilder sb = new StringBuilder();
-        // for cycle
-        for (String savedPath : savedPaths) {
-            if (path.equals(savedPath)) continue;
-            sb.append(savedPath).append(",");
-        }
-        // Put the string and commit
-        PreferenceHelper.setSavedPaths(getActivity(), sb);
-        // Update list
-        refreshList();
-    }
-
-    private void refreshList() {
-        // File paths saved in preferences
-        String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
-        // File names for the list
-        files.clear();
-        // StringBuilder that will contain the file paths
-        StringBuilder sb = new StringBuilder();
-        // for cycle to convert paths to names
-        for (String path : savedPaths) {
-            File file = new File(path);
-            // Check that the file exist
-            if (file.exists()) {
-                files.add(file);
-                sb.append(path).append(",");
-            }
-        }
-        // save list without empty or non existed files
-        PreferenceHelper.setSavedPaths(getActivity(), sb);
-        // Set adapter
-        arrayAdapter.notifyDataSetChanged();
-    }
-
-    @Override
-    public void CancelItem(int position, boolean andCloseOpenedFile) {
-        String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
-        removePath(savedPaths[position]);
-        if (andCloseOpenedFile)
-            EventBus.getDefault().post(new EventBusEvents.CannotOpenAFile());
-    }
-}

libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/ExtraSettingsActivity.java

@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 2014 Vlad Mihalachi
- *
- * This file is part of Turbo Editor.
- *
- * Turbo Editor is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Turbo Editor is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package sharedcode.turboeditor.preferences;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import de.greenrobot.event.EventBus;
-import sharedcode.turboeditor.R;
-import sharedcode.turboeditor.util.EventBusEvents;
-import sharedcode.turboeditor.util.ThemeUtils;
-
-/**
- * A {@link PreferenceActivity} that presents a set of application settings. On
- * handset devices, settings are presented as a single list. On tablets,
- * settings are split by category, with category headers shown to the left of
- * the list of settings.
- * <p/>
- * See <a href="http://developer.android.com/design/patterns/settings.html">
- * Android Design: Settings</a> for design guidelines and the <a
- * href="http://developer.android.com/guide/topics/ui/settings.html">Settings
- * API Guide</a> for more information on developing a Settings UI.
- */
-public class ExtraSettingsActivity extends PreferenceActivity {
-    /**
-     * Determines whether to always show the simplified settings UI, where
-     * settings are presented in a single list. When false, settings are shown
-     * as a master/detail two-pane view on tablets. When true, a single pane is
-     * shown on tablets.
-     */
-    private static final boolean ALWAYS_SIMPLE_PREFS = true;
-    boolean encodingChanged = false,
-            themeChanged = false,
-            keyboardSuggestionsChanged = false;
-    /**
-     * A preference value change listener that updates the preference's summary
-     * to reflect its new value.
-     */
-    private Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener() {
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object value) {
-            String stringValue = value.toString();
-
-            if (preference instanceof ListPreference) {
-                // For list preferences, look up the correct display value in
-                // the preference's 'entries' list.
-                ListPreference listPreference = (ListPreference) preference;
-                int index = listPreference.findIndexOfValue(stringValue);
-
-                // Set the summary to reflect the new value.
-                preference.setSummary(
-                        index >= 0
-                                ? listPreference.getEntries()[index]
-                                : null);
-
-            }
-            switch (preference.getKey()) {
-                case "light_theme":
-                    themeChanged = !themeChanged;
-                    break;
-                case "suggestion_active":
-                    keyboardSuggestionsChanged = !keyboardSuggestionsChanged;
-                    break;
-                case "editor_encoding":
-                    encodingChanged = true;
-                    break;
-
-            }
-            return true;
-        }
-    };
-
-    /**
-     * Helper method to determine if the device has an extra-large screen. For
-     * example, 10" tablets are extra-large.
-     */
-    private static boolean isXLargeTablet(Context context) {
-        return (context.getResources().getConfiguration().screenLayout
-                & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
-    }
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        ThemeUtils.setTheme(this);
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-
-        setupSimplePreferencesScreen();
-    }
-
-    /**
-     * Shows the simplified settings UI if the device configuration if the
-     * device configuration dictates that a simplified, single-pane UI should be
-     * shown.
-     */
-    private void setupSimplePreferencesScreen() {
-        if (!isSimplePreferences(this)) {
-            return;
-        }
-
-        // In the simplified UI, fragments are not used at all and we instead
-        // use the older PreferenceActivity APIs.
-
-        // Add 'general' preferences.
-        addPreferencesFromResource(R.xml.extra_options);
-
-        // Bind the summaries of EditText/List/Dialog/Ringtone preferences to
-        // their values. When their values change, their summaries are updated
-        // to reflect the new value, per the Android Design guidelines.
-        bindPreferenceSummaryToValue(findPreference("editor_encoding"));
-
-        String[] checkBoxPreferences = {"light_theme", "suggestion_active"};
-        for (String key : checkBoxPreferences) {
-            // Set the listener to watch for value changes.
-            findPreference(key).setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
-        }
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean onIsMultiPane() {
-        return isXLargeTablet(this) && !isSimplePreferences(this);
-    }
-
-    /**
-     * Determines whether the simplified settings UI should be shown. This is
-     * true if this is forced via {@link #ALWAYS_SIMPLE_PREFS}, or the device
-     * doesn't have newer APIs like {@link PreferenceFragment}, or the device
-     * doesn't have an extra-large screen. In these cases, a single-pane
-     * "simplified" settings UI should be shown.
-     */
-    private boolean isSimplePreferences(Context context) {
-        return ALWAYS_SIMPLE_PREFS
-                || Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB
-                || !isXLargeTablet(context);
-    }
-
-    @Override
-    protected void onDestroy() {
-        List<EventBusEvents.APreferenceValueWasChanged.Type> listOfChanges = new ArrayList<>();
-        if (themeChanged) {
-            listOfChanges.add(EventBusEvents.APreferenceValueWasChanged.Type.THEME_CHANGE);
-        }
-        if (keyboardSuggestionsChanged) {
-            listOfChanges.add(EventBusEvents.APreferenceValueWasChanged.Type.TEXT_SUGGESTIONS);
-        }
-        if (encodingChanged) {
-            listOfChanges.add(EventBusEvents.APreferenceValueWasChanged.Type.ENCODING);
-        }
-
-
-        if (listOfChanges.size() > 0) {
-            EventBus.getDefault().postSticky(new EventBusEvents.APreferenceValueWasChanged(listOfChanges));
-        }
-        super.onDestroy();
-    }
-
-    /**
-     * Binds a preference's summary to its value. More specifically, when the
-     * preference's value is changed, its summary (line of text below the
-     * preference title) is updated to reflect the value. The summary is also
-     * immediately updated upon calling this method. The exact display format is
-     * dependent on the type of preference.
-     *
-     * @see #sBindPreferenceSummaryToValueListener
-     */
-    private void bindPreferenceSummaryToValue(Preference preference) {
-        // Set the listener to watch for value changes.
-        preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
-
-        // Trigger the listener immediately with the preference's
-        // current value.
-        sBindPreferenceSummaryToValueListener.onPreferenceChange(preference,
-                PreferenceManager
-                        .getDefaultSharedPreferences(preference.getContext())
-                        .getString(preference.getKey(), ""));
-    }
-}

libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/PreferenceHelper.java

@@ -49,7 +49,7 @@ public final class PreferenceHelper {
         return getPrefs(context).getBoolean("editor_line_numbers", true);
     }
 
-    public static boolean getSyntaxHiglight(Context context) {
+    public static boolean getSyntaxHighlight(Context context) {
         return getPrefs(context).getBoolean("editor_syntax_highlight", false);
     }
 
@@ -105,7 +105,7 @@ public final class PreferenceHelper {
         return getPrefs(context).getBoolean("ignore_back_button", false);
     }
 
-    public static boolean getPageSystemEnabled(Context context) {
+    public static boolean getSplitText(Context context) {
         return getPrefs(context).getBoolean("page_system_active", true);
     }
 
@@ -122,7 +122,7 @@ public final class PreferenceHelper {
         getEditor(context).putBoolean("editor_line_numbers", value).commit();
     }
 
-    public static void setSyntaxHiglight(Context context, boolean value) {
+    public static void setSyntaxHighlight(Context context, boolean value) {
         getEditor(context).putBoolean("editor_syntax_highlight", value).commit();
     }
 
@@ -158,4 +158,31 @@ public final class PreferenceHelper {
         getEditor(context).putBoolean("has_donated", value);
     }
 
+    public static void setLightTheme(Context context, boolean value) {
+        getEditor(context).putBoolean("light_theme", value).commit();
+    }
+
+    public static void setSuggestionsActive(Context context, boolean value) {
+        getEditor(context).putBoolean("suggestion_active", value).commit();
+    }
+
+    public static void setAutoSave(Context context, boolean value) {
+        getEditor(context).putBoolean("auto_save", value).commit();
+    }
+
+    public static void setIgnoreBackButton(Context context, boolean value) {
+        getEditor(context).putBoolean("ignore_back_button", value).commit();
+    }
+
+    public static void setSplitText(Context context, boolean value) {
+        getEditor(context).putBoolean("page_system_active", value).commit();
+    }
+
+    public static void setSendErrorReport(Context context, boolean value) {
+        getEditor(context).putBoolean("ignore_back_button", value).commit();
+    }
+
+    public static void setEncoding(Context context, String value) {
+        getEditor(context).putString("editor_encoding", value).commit();
+    }
 }

libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/SettingsFragment.java

@@ -20,32 +20,34 @@
 package sharedcode.turboeditor.preferences;
 
 import android.app.Fragment;
-import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.widget.SwitchCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.TextView;
 
 import de.greenrobot.event.EventBus;
 import sharedcode.turboeditor.R;
+import sharedcode.turboeditor.fragment.EncodingDialog;
 import sharedcode.turboeditor.fragment.SeekbarDialog;
-import sharedcode.turboeditor.util.AnimationUtils;
 import sharedcode.turboeditor.util.ProCheckUtils;
 import sharedcode.turboeditor.util.ViewUtils;
 import sharedcode.turboeditor.views.DialogHelper;
 
 import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged;
+import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.ENCODING;
 import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.FONT_SIZE;
 import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.LINE_NUMERS;
 import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.MONOSPACE;
 import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.READ_ONLY;
 import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.SYNTAX;
+import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.TEXT_SUGGESTIONS;
+import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.THEME_CHANGE;
 import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.WRAP_CONTENT;
 
-public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbarDialog {
+public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbarDialog, EncodingDialog.DialogListener {
 
     // Editor Variables
     private boolean sLineNumbers;
@@ -54,71 +56,100 @@ public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbar
     private boolean sUseMonospace;
     private boolean sReadOnly;
 
+    private boolean sLightTheme;
+    private boolean sSuggestions;
+    private boolean sAutoSave;
+    private boolean sIgnoreBackButton;
+    private boolean sSplitText;
+    private boolean sErrorReports;
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         sUseMonospace = PreferenceHelper.getUseMonospace(getActivity());
-        sColorSyntax = PreferenceHelper.getSyntaxHiglight(getActivity());
+        sColorSyntax = PreferenceHelper.getSyntaxHighlight(getActivity());
         sWrapContent = PreferenceHelper.getWrapContent(getActivity());
         sLineNumbers = PreferenceHelper.getLineNumbers(getActivity());
         sReadOnly = PreferenceHelper.getReadOnly(getActivity());
+
+        sLightTheme = PreferenceHelper.getLightTheme(getActivity());
+        sSuggestions = PreferenceHelper.getSuggestionActive(getActivity());
+        sAutoSave = PreferenceHelper.getAutoSave(getActivity());
+        sIgnoreBackButton = PreferenceHelper.getIgnoreBackButton(getActivity());
+        sSplitText = PreferenceHelper.getSplitText(getActivity());
+        sErrorReports = PreferenceHelper.getSendErrorReports(getActivity());
     }
 
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
         // Our custom layout
-        View rootView = inflater.inflate(R.layout.fragment_settings, container, false);
+        final View rootView = inflater.inflate(R.layout.fragment_settings, container, false);
-        final CheckBox switchLineNumbers, switchSyntax, switchWrapContent, switchMonospace, switchReadOnly;
+        final SwitchCompat swLineNumbers, swSyntax, swWrapContent, swMonospace, swReadOnly;
-        switchLineNumbers = (CheckBox) rootView.findViewById(R.id.switch_line_numbers);
+        final SwitchCompat swLightTheme, swSuggestions, swAutoSave, swIgnoreBackButton, swSplitText, swErrorReports;
-        switchSyntax = (CheckBox) rootView.findViewById(R.id.switch_syntax);
-        switchWrapContent = (CheckBox) rootView.findViewById(R.id.switch_wrap_content);
-        switchMonospace = (CheckBox) rootView.findViewById(R.id.switch_monospace);
-        switchReadOnly = (CheckBox) rootView.findViewById(R.id.switch_read_only);
         
-        switchLineNumbers.setChecked(sLineNumbers);
+        swLineNumbers = (SwitchCompat) rootView.findViewById(R.id.switch_line_numbers);
-        switchSyntax.setChecked(sColorSyntax);
+        swSyntax = (SwitchCompat) rootView.findViewById(R.id.switch_syntax);
-        switchWrapContent.setChecked(sWrapContent);
+        swWrapContent = (SwitchCompat) rootView.findViewById(R.id.switch_wrap_content);
-        switchMonospace.setChecked(sUseMonospace);
+        swMonospace = (SwitchCompat) rootView.findViewById(R.id.switch_monospace);
-        switchReadOnly.setChecked(sReadOnly);
+        swReadOnly = (SwitchCompat) rootView.findViewById(R.id.switch_read_only);
 
-        TextView fontSizeView, donateView, extraOptionsView;
+        swLightTheme = (SwitchCompat) rootView.findViewById(R.id.switch_light_theme);
+        swSuggestions = (SwitchCompat) rootView.findViewById(R.id.switch_suggestions_active);
+        swAutoSave = (SwitchCompat) rootView.findViewById(R.id.switch_auto_save);
+        swIgnoreBackButton = (SwitchCompat) rootView.findViewById(R.id.switch_ignore_backbutton);
+        swSplitText = (SwitchCompat) rootView.findViewById(R.id.switch_page_system);
+        swErrorReports = (SwitchCompat) rootView.findViewById(R.id.switch_send_error_reports);
+
+        swLineNumbers.setChecked(sLineNumbers);
+        swSyntax.setChecked(sColorSyntax);
+        swWrapContent.setChecked(sWrapContent);
+        swMonospace.setChecked(sUseMonospace);
+        swReadOnly.setChecked(sReadOnly);
+
+        swLightTheme.setChecked(sLightTheme);
+        swSuggestions.setChecked(sSuggestions);
+        swAutoSave.setChecked(sAutoSave);
+        swIgnoreBackButton.setChecked(sIgnoreBackButton);
+        swSplitText.setChecked(sSplitText);
+        swErrorReports.setChecked(sErrorReports);
+
+        TextView fontSizeView, encodingView, donateView, extraOptionsView;
         fontSizeView = (TextView) rootView.findViewById(R.id.drawer_button_font_size);
+        encodingView = (TextView) rootView.findViewById(R.id.drawer_button_encoding);
         extraOptionsView = (TextView) rootView.findViewById(R.id.drawer_button_extra_options);
         donateView = (TextView) rootView.findViewById(R.id.drawer_button_go_pro);
 
         if(ProCheckUtils.isPro(getActivity(), false))
             ViewUtils.setVisible(donateView, false);
 
-        switchLineNumbers.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        swLineNumbers.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                sLineNumbers = isChecked;
                 PreferenceHelper.setLineNumbers(getActivity(), isChecked);
                 EventBus.getDefault().post(new APreferenceValueWasChanged(LINE_NUMERS));
             }
         });
 
-        switchSyntax.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        swSyntax.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 sColorSyntax = isChecked;
-                PreferenceHelper.setSyntaxHiglight(getActivity(), isChecked);
+                PreferenceHelper.setSyntaxHighlight(getActivity(), isChecked);
                 EventBus.getDefault().post(new APreferenceValueWasChanged(SYNTAX));
 
             }
         });
 
-        switchWrapContent.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        swWrapContent.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                sWrapContent = isChecked;
                 PreferenceHelper.setWrapContent(getActivity(), isChecked);
                 EventBus.getDefault().post(new APreferenceValueWasChanged(WRAP_CONTENT));
             }
         });
 
-        switchMonospace.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        swMonospace.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
                 sUseMonospace = isChecked;
@@ -128,10 +159,9 @@ public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbar
             }
         });
 
-        switchReadOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+        swReadOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-                sReadOnly = isChecked;
                 PreferenceHelper.setReadOnly(getActivity(), isChecked);
                 EventBus.getDefault().post(new APreferenceValueWasChanged(READ_ONLY));
             }
@@ -151,11 +181,21 @@ public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbar
             }
         });
 
+        encodingView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                EncodingDialog dialogFrag = EncodingDialog.newInstance();
+                dialogFrag.setTargetFragment(SettingsFragment.this, 0);
+                dialogFrag.show(getFragmentManager().beginTransaction(), "dialog");
+            }
+        });
+
         extraOptionsView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                AnimationUtils.startActivityWithScale(getActivity(), new Intent(getActivity(),
+                View otherOptions = rootView.findViewById(R.id.other_options);
-                        ExtraSettingsActivity.class), false, 0, v);
+                boolean isVisible = otherOptions.getVisibility() == View.VISIBLE;
+                ViewUtils.setVisible(otherOptions, !isVisible);
             }
         });
 
@@ -166,6 +206,22 @@ public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbar
             }
         });
 
+        swLightTheme.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                PreferenceHelper.setLightTheme(getActivity(), isChecked);
+                EventBus.getDefault().post(new APreferenceValueWasChanged(THEME_CHANGE));
+            }
+        });
+
+        swSuggestions.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+            @Override
+            public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+                PreferenceHelper.setSuggestionsActive(getActivity(), isChecked);
+                EventBus.getDefault().post(new APreferenceValueWasChanged(TEXT_SUGGESTIONS));
+            }
+        });
+
         return rootView;
     }
 
@@ -175,4 +231,10 @@ public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbar
         EventBus.getDefault().post(new APreferenceValueWasChanged(FONT_SIZE));
 
     }
+
+    @Override
+    public void onEncodingSelected(String result) {
+        PreferenceHelper.setEncoding(getActivity(), result);
+        EventBus.getDefault().post(new APreferenceValueWasChanged(ENCODING));
+    }
 }

libraries/sharedCode/src/main/java/sharedcode/turboeditor/texteditor/PageSystem.java

@@ -43,7 +43,7 @@ public class PageSystem {
         int to;
         int indexOfReturn;
         int textLenght = text.length();
-        boolean pageSystemEnabled = PreferenceHelper.getPageSystemEnabled(context);
+        boolean pageSystemEnabled = PreferenceHelper.getSplitText(context);
         if (pageSystemEnabled && textLenght > maxLenghtInOnePage) {
             while (i < textLenght && pageSystemEnabled) {
                 to = i + charForPage;

libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/EventBusEvents.java

@@ -87,7 +87,7 @@ public class EventBusEvents {
         }
 
         public enum Type {
-            FONT_SIZE, ENCODING, SYNTAX, WRAP_CONTENT, MONOSPACE, LINE_NUMERS, THEME_CHANGE, TEXT_SUGGESTIONS, READ_ONLY
+            FONT_SIZE, ENCODING, SYNTAX, WRAP_CONTENT, MONOSPACE, LINE_NUMERS, THEME_CHANGE, TEXT_SUGGESTIONS, READ_ONLY,
         }
     }
 

libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/ThemeUtils.java

@@ -35,6 +35,15 @@ public class ThemeUtils {
         }
     }
 
+    public static void setPreferenceTheme(Activity activity){
+        boolean light = PreferenceHelper.getLightTheme(activity);
+        if (light) {
+            activity.setTheme(R.style.PreferenceLight);
+        } else {
+            activity.setTheme(R.style.PreferenceDark);
+        }
+    }
+
     public static void setWindowsBackground(Activity activity) {
         boolean whiteTheme = PreferenceHelper.getLightTheme(activity);
         if (whiteTheme) {

libraries/sharedCode/src/main/res/drawable/actionbar_icon_placeholder_compat.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:width="12dp" />
-    <solid android:color="@android:color/transparent" />
-</shape>

libraries/sharedCode/src/main/res/drawable/actionbar_shadow.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:height="4dp" />
-    <gradient
-        android:angle="270"
-        android:endColor="@android:color/transparent"
-        android:startColor="@color/gradient_start" />
-</shape>

libraries/sharedCode/src/main/res/drawable/item_background_holo_dark.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 Vlad Mihalachi
-  ~
-  ~ This file is part of Turbo Editor.
-  ~
-  ~ Turbo Editor is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ Turbo Editor is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" />
-    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" />
-    <item android:state_focused="true"                                                             android:drawable="@color/navigation_drawer_button_inverted" />
-    <item                                                                                          android:drawable="@android:color/transparent" />
-</selector>

libraries/sharedCode/src/main/res/drawable/item_background_holo_light.xml

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 Vlad Mihalachi
-  ~
-  ~ This file is part of Turbo Editor.
-  ~
-  ~ Turbo Editor is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ Turbo Editor is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <!-- Even though these two point to the same resource, have two states so the drawable will invalidate itself when coming out of pressed state. -->
-    <item android:state_focused="true"  android:state_enabled="false" android:state_pressed="true" android:drawable="@drawable/list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"  android:state_enabled="false"                              android:drawable="@drawable/list_selector_disabled_holo_dark" />
-    <item android:state_focused="true"                                android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" />
-    <item android:state_focused="false"                               android:state_pressed="true" android:drawable="@drawable/list_selector_background_transition_holo_dark" />
-    <item android:state_focused="true"                                                             android:drawable="@color/navigation_drawer_button" />
-    <item                                                                                          android:drawable="@color/navigation_drawer_button" />
-</selector>

libraries/sharedCode/src/main/res/drawable/navigation_drawer_shadow.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <size android:width="16dp" />
-    <gradient
-        android:endColor="@android:color/transparent"
-        android:startColor="@color/gradient_light_start" />
-</shape>

libraries/sharedCode/src/main/res/layout/activity_home.xml

@@ -17,17 +17,23 @@
   ~ You should have received a copy of the GNU General Public License
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <include layout="@layout/toolbar"/>
 
 <sharedcode.turboeditor.views.CustomDrawerLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <TextView
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:textSize="@dimen/text_size_mega_title"
         android:fontFamily="sans-serif-light"
@@ -36,7 +42,6 @@
         android:textColor="@android:color/secondary_text_dark"
         android:id="@id/no_file_opened_messagge"/>
 
-
     <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -97,20 +102,251 @@
 
         </FrameLayout>
 
-    <fragment android:layout_width="@dimen/navigation_drawer_width"
+
+
+    <RelativeLayout
+        android:layout_width="@dimen/navigation_drawer_width"
         android:layout_height="match_parent"
-              android:name="sharedcode.turboeditor.fragment.NavigationDrawer"
+        android:background="@color/navigation_drawer_background_inverted"
         android:id="@id/drawer_files"
         android:layout_gravity="start"
-               tools:layout="@layout/fragment_navigation_drawer"
+        >
+
+        <ListView
+            android:id="@id/android:list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:fadingEdge="none"
+            android:cacheColorHint="@android:color/transparent"
+            android:layout_above="@id/drawer_buttons"
+            android:divider="@color/divider"
+            android:listSelector="?selectableItemBackground"
+            android:choiceMode="singleChoice"
+            android:background="@null"
             />
 
+        <TextView
+            android:id="@android:id/empty"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:textSize="@dimen/text_size_mega_title"
+            android:fontFamily="sans-serif-light"
+            android:text="@string/recent_files"
+            android:textColor="@android:color/secondary_text_dark"
+            android:layout_above="@id/drawer_buttons" />
+
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="192dp"
+            android:id="@id/drawer_buttons"
+            android:layout_alignParentBottom="true"
+            android:orientation="vertical">
+
+            <View
+                android:background="@color/divider_inverted"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line_dimension"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:text="@string/new_file"
+                android:gravity="center_vertical"
+                android:paddingStart="20dp"
+                android:paddingLeft="20dp"
+                android:paddingEnd="20dp"
+                android:paddingRight="20dp"
+                android:textSize="12sp"
+                android:textColor="@color/navigation_drawer_button_text_color_inverted"
+                android:clickable="true"
+                android:onClick="CreateFile"
+                android:background="?selectableItemBackground"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:text="@string/open_a_file"
+                android:gravity="center_vertical"
+                android:paddingStart="20dp"
+                android:paddingLeft="20dp"
+                android:paddingEnd="20dp"
+                android:paddingRight="20dp"
+                android:textSize="12sp"
+                android:textColor="@color/navigation_drawer_button_text_color_inverted"
+                android:clickable="true"
+                android:onClick="OpenFile"
+                android:background="?selectableItemBackground"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:text="@string/preferenze"
+                android:gravity="center_vertical"
+                android:paddingStart="20dp"
+                android:paddingLeft="20dp"
+                android:paddingEnd="20dp"
+                android:paddingRight="20dp"
+                android:textSize="12sp"
+                android:textColor="@color/navigation_drawer_button_text_color_inverted"
+                android:clickable="true"
+                android:onClick="OpenSettings"
+                android:background="?selectableItemBackground"/>
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="48dp"
+                android:text="@string/info"
+                android:gravity="center_vertical"
+                android:paddingStart="20dp"
+                android:paddingLeft="20dp"
+                android:paddingEnd="20dp"
+                android:paddingRight="20dp"
+                android:textSize="12sp"
+                android:textColor="@color/navigation_drawer_button_text_color_inverted"
+                android:clickable="true"
+                android:onClick="OpenInfo"
+                android:background="?selectableItemBackground"/>
+
+
+
+            <!--<RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="52dp"
+                android:orientation="horizontal"
+                >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:onClick="OpenFile"
+                    android:background="@drawable/item_background_holo_dark"
+                    android:layout_toLeftOf="@+id/ic_add_dark"
+                    >
+                    <ImageView
+                        android:layout_width="35dp"
+                        android:layout_height="35dp"
+                        android:src="@drawable/ic_file_dark"
+                        android:paddingStart="16dp"
+                        android:paddingLeft="16dp"/>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@string/open_a_file"
+                        android:gravity="center_vertical"
+                        android:paddingStart="20dp"
+                        android:paddingLeft="20dp"
+                        android:paddingEnd="20dp"
+                        android:paddingRight="20dp"
+                        android:textSize="12sp"
+                        android:textAllCaps="true"
+                        android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
+                </LinearLayout>
+
+               <View
+                    android:background="@color/divider_inverted"
+                    android:layout_width="@dimen/line_dimension"
+                    android:layout_height="match_parent"
+                    android:layout_toLeftOf="@id/ic_add_dark"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"/>
+
+                <ImageView
+                    android:id="@+id/ic_add_dark"
+                    android:layout_width="64dp"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/ic_add_dark"
+                    android:padding="14dp"
+                    android:layout_alignParentRight="true"
+                    android:clickable="true"
+                    android:onClick="CreateFile"
+                    android:background="@drawable/item_background_holo_dark"
+                    />
+
+            </RelativeLayout>
+
+
+            <View
+                android:background="@color/divider_inverted"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/line_dimension"/>
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="52dp"
+                android:orientation="horizontal"
+                >
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:orientation="horizontal"
+                    android:clickable="true"
+                    android:gravity="center_vertical"
+                    android:onClick="OpenSettings"
+                    android:background="@drawable/item_background_holo_dark"
+                    android:layout_toLeftOf="@+id/ic_info_dark"
+                    >
+                    <ImageView
+                        android:layout_width="35dp"
+                        android:layout_height="35dp"
+                        android:src="@drawable/ic_settings_dark"
+                        android:paddingStart="16dp"
+                        android:paddingLeft="16dp"/>
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="match_parent"
+                        android:text="@string/preferenze"
+                        android:gravity="center_vertical"
+                        android:paddingStart="20dp"
+                        android:paddingLeft="20dp"
+                        android:paddingEnd="20dp"
+                        android:paddingRight="20dp"
+                        android:textSize="12sp"
+                        android:textAllCaps="true"
+                        android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
+                </LinearLayout>
+
+               <View
+                    android:background="@color/divider_inverted"
+                    android:layout_width="@dimen/line_dimension"
+                    android:layout_height="match_parent"
+                    android:layout_toLeftOf="@id/ic_info_dark"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginBottom="10dp"/>
+
+                <ImageView
+                    android:id="@+id/ic_info_dark"
+                    android:layout_width="64dp"
+                    android:layout_height="match_parent"
+                    android:src="@drawable/ic_info_dark"
+                    android:padding="14dp"
+                    android:layout_alignParentRight="true"
+                    android:clickable="true"
+                    android:onClick="OpenInfo"
+                    android:background="@drawable/item_background_holo_dark"
+                    />
+
+            </RelativeLayout>-->
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
     <fragment android:layout_width="@dimen/navigation_drawer_width"
         android:layout_height="match_parent"
         android:name="sharedcode.turboeditor.preferences.SettingsFragment"
         android:id="@id/drawer_settings"
-        android:layout_gravity="end"
+        android:layout_gravity="end"/>
-        tools:layout="@layout/fragment_navigation_drawer"/>
 
 
 </sharedcode.turboeditor.views.CustomDrawerLayout>
+
+</LinearLayout>

libraries/sharedCode/src/main/res/layout/activity_select_file.xml

@@ -18,8 +18,16 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
-    xmlns:fab="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical">
+
+    <include layout="@layout/toolbar"/>
+
+    <FrameLayout
+
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -28,7 +36,13 @@
             android:id="@android:id/list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-    android:smoothScrollbar="true"/>
+            android:smoothScrollbar="true"
+            android:listSelector="?selectableItemBackground"
+            android:divider="@null"
+            android:layout_marginLeft="@dimen/list_horizontal_margin"
+            android:layout_marginRight="@dimen/list_horizontal_margin"
+            android:layout_marginStart="@dimen/list_horizontal_margin"
+            android:layout_marginEnd="@dimen/list_horizontal_margin"/>
 
         <com.faizmalkani.floatingactionbutton.FloatingActionButton
             android:id="@+id/fabbutton"
@@ -42,3 +56,5 @@
     </FrameLayout>
 
 
+</LinearLayout>
+

libraries/sharedCode/src/main/res/layout/dialog_encoding_list.xml

@@ -24,7 +24,7 @@
               android:layout_gravity="center"
               android:orientation="vertical">
 
-    <Switch
+    <android.support.v7.widget.SwitchCompat
             android:id="@android:id/checkbox"
             android:layout_width="match_parent"
             android:layout_height="56dp"
@@ -34,7 +34,7 @@
         android:paddingRight="16dp"
             android:text="@string/enable_autoencoding"
         android:textSize="12sp"
-        android:textColor="@color/navigation_drawer_button_text_color"
+        android:textColor="@color/textColor"
         android:textAllCaps="true"/>
 
     <ListView

libraries/sharedCode/src/main/res/layout/dialog_skeleton.xml

@@ -28,10 +28,10 @@
         android:id="@+id/title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/activity_horizontal_margin"
+        android:layout_marginStart="16dp"
-        android:layout_marginEnd="@dimen/activity_horizontal_margin"
+        android:layout_marginEnd="16dp"
-        android:layout_marginLeft="@dimen/activity_horizontal_margin"
+        android:layout_marginLeft="16dp"
-        android:layout_marginRight="@dimen/activity_horizontal_margin"
+        android:layout_marginRight="16dp"
         android:layout_marginTop="8dp"
         android:layout_marginBottom="8dp"
         android:drawablePadding="8dp"

libraries/sharedCode/src/main/res/layout/fragment_navigation_drawer.xml

@@ -1,192 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2014 Vlad Mihalachi
-  ~
-  ~ This file is part of Turbo Editor.
-  ~
-  ~ Turbo Editor is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ (at your option) any later version.
-  ~
-  ~ Turbo Editor is distributed in the hope that it will be useful,
-  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
-  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  ~ GNU General Public License for more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License
-  ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/navigation_drawer_background_inverted"
-    >
-
-    <ListView
-        android:id="@id/android:list"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:fadingEdge="none"
-        android:cacheColorHint="@android:color/transparent"
-        android:layout_above="@id/drawer_buttons"
-        android:divider="@color/divider"
-        android:listSelector="@android:color/transparent"
-        android:choiceMode="singleChoice"
-        android:background="@null"
-        />
-
-    <TextView
-        android:id="@android:id/empty"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:textSize="@dimen/text_size_mega_title"
-        android:fontFamily="sans-serif-light"
-        android:text="@string/recent_files"
-        android:textColor="@android:color/secondary_text_dark"
-        android:layout_above="@id/drawer_buttons" />
-
-
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="104dp"
-        android:id="@id/drawer_buttons"
-        android:layout_alignParentBottom="true"
-        android:orientation="vertical">
-
-        <View
-            android:background="@color/divider_inverted"
-            android:layout_width="match_parent"
-            android:layout_height="@dimen/line_dimension"/>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="52dp"
-        android:orientation="horizontal"
-        >
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:clickable="true"
-            android:gravity="center_vertical"
-            android:onClick="OpenFile"
-            android:background="@drawable/item_background_holo_dark"
-            android:layout_toLeftOf="@+id/ic_add_dark"
-            >
-            <ImageView
-                android:layout_width="35dp"
-                android:layout_height="35dp"
-                android:src="@drawable/ic_file_dark"
-                android:paddingStart="16dp"
-                android:paddingLeft="16dp"/>
-
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:text="@string/open_a_file"
-                android:gravity="center_vertical"
-                android:paddingStart="20dp"
-                android:paddingLeft="20dp"
-                android:paddingEnd="20dp"
-                android:paddingRight="20dp"
-                android:textSize="12sp"
-                android:textAllCaps="true"
-                android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
-        </LinearLayout>
-
-        <View
-            android:background="@color/divider_inverted"
-            android:layout_width="@dimen/line_dimension"
-            android:layout_height="match_parent"
-            android:layout_toLeftOf="@id/ic_add_dark"
-            android:layout_marginTop="10dp"
-            android:layout_marginBottom="10dp"/>
-
-        <ImageView
-            android:id="@+id/ic_add_dark"
-            android:layout_width="64dp"
-            android:layout_height="match_parent"
-            android:src="@drawable/ic_add_dark"
-            android:padding="14dp"
-            android:layout_alignParentRight="true"
-            android:clickable="true"
-            android:onClick="CreateFile"
-            android:background="@drawable/item_background_holo_dark"
-            />
-
-    </RelativeLayout>
-
-
-    <View
-        android:background="@color/divider_inverted"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line_dimension"/>
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="52dp"
-            android:orientation="horizontal"
-            >
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal"
-                android:clickable="true"
-                android:gravity="center_vertical"
-                android:onClick="OpenSettings"
-                android:background="@drawable/item_background_holo_dark"
-                android:layout_toLeftOf="@+id/ic_info_dark"
-                >
-                <ImageView
-                    android:layout_width="35dp"
-                    android:layout_height="35dp"
-                    android:src="@drawable/ic_settings_dark"
-                    android:paddingStart="16dp"
-                    android:paddingLeft="16dp"/>
-
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="@string/preferenze"
-                    android:gravity="center_vertical"
-                    android:paddingStart="20dp"
-                    android:paddingLeft="20dp"
-                    android:paddingEnd="20dp"
-                    android:paddingRight="20dp"
-                    android:textSize="12sp"
-                    android:textAllCaps="true"
-                    android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
-            </LinearLayout>
-
-            <View
-                android:background="@color/divider_inverted"
-                android:layout_width="@dimen/line_dimension"
-                android:layout_height="match_parent"
-                android:layout_toLeftOf="@id/ic_info_dark"
-                android:layout_marginTop="10dp"
-                android:layout_marginBottom="10dp"/>
-
-            <ImageView
-                android:id="@+id/ic_info_dark"
-                android:layout_width="64dp"
-                android:layout_height="match_parent"
-                android:src="@drawable/ic_info_dark"
-                android:padding="14dp"
-                android:layout_alignParentRight="true"
-                android:clickable="true"
-                android:onClick="OpenInfo"
-                android:background="@drawable/item_background_holo_dark"
-                />
-
-        </RelativeLayout>
-
-    </LinearLayout>
-
-</RelativeLayout>

libraries/sharedCode/src/main/res/layout/fragment_settings.xml

@@ -23,7 +23,8 @@
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:background="@color/navigation_drawer_background_inverted">
+    android:background="@color/navigation_drawer_background_inverted"
+    android:paddingTop="10dp">
 <LinearLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -36,29 +37,22 @@
         android:layout_width="match_parent"
         android:layout_height="72dp"
         android:text="@string/donate"
-        android:paddingStart="20dp"
+        android:paddingStart="16dp"
-        android:paddingEnd="20dp"
+        android:paddingEnd="16dp"
-        android:paddingLeft="20dp"
+        android:paddingLeft="16dp"
-        android:paddingRight="20dp"
+        android:paddingRight="16dp"
         android:gravity="center_vertical"
         android:textSize="12sp"
-        android:textAllCaps="true"
         android:clickable="true"
-        android:background="@drawable/item_background_holo_dark"
+        android:background="?selectableItemBackground"
         android:textColor="@color/indigo"/>
 
-    <View
+    <android.support.v7.widget.SwitchCompat
-        android:background="@color/divider_inverted"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line_dimension"/>
-
-        <CheckBox         android:button="@null"         android:drawableRight="?android:attr/listChoiceIndicatorMultiple"
             android:gravity="center_vertical"
-            android:checkMark="?android:attr/listChoiceIndicatorMultiple"
             android:layout_width="match_parent"
             android:layout_height="56dp"
             android:text="@string/line_numbers"
-            android:textAllCaps="true"
+            
             android:textSize="12sp"
             android:id="@id/switch_line_numbers"
             android:layout_gravity="center_horizontal"
@@ -69,18 +63,12 @@
             android:textColor="@color/navigation_drawer_button_text_color_inverted"
             />
 
-    <View
+    <android.support.v7.widget.SwitchCompat
-        android:background="@color/divider_inverted"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line_dimension"/>
-
-    <CheckBox         android:button="@null"         android:drawableRight="?android:attr/listChoiceIndicatorMultiple"
         android:gravity="center_vertical"
-        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:text="@string/menu_syntax_highlight"
-        android:textAllCaps="true"
+        
         android:textSize="12sp"
         android:id="@id/switch_syntax"
         android:layout_gravity="center_horizontal"
@@ -90,18 +78,12 @@
         android:paddingRight="16dp"
         android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
 
-    <View
+    <android.support.v7.widget.SwitchCompat
-        android:background="@color/divider_inverted"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line_dimension"/>
-
-    <CheckBox         android:button="@null"         android:drawableRight="?android:attr/listChoiceIndicatorMultiple"
         android:gravity="center_vertical"
-        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:text="@string/wrap_content"
-        android:textAllCaps="true"
+        
         android:textSize="12sp"
         android:id="@id/switch_wrap_content"
         android:layout_gravity="center_horizontal"
@@ -111,19 +93,12 @@
         android:paddingRight="16dp"
         android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
 
-
+    <android.support.v7.widget.SwitchCompat
-    <View
-        android:background="@color/divider_inverted"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line_dimension"/>
-
-    <CheckBox         android:button="@null"         android:drawableRight="?android:attr/listChoiceIndicatorMultiple"
         android:gravity="center_vertical"
-        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:text="@string/use_monospace"
-        android:textAllCaps="true"
+        
         android:textSize="12sp"
         android:id="@id/switch_monospace"
         android:layout_gravity="center_horizontal"
@@ -133,18 +108,12 @@
         android:paddingRight="16dp"
         android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
 
-    <View
+    <android.support.v7.widget.SwitchCompat
-        android:background="@color/divider_inverted"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line_dimension"/>
-
-    <CheckBox         android:button="@null"         android:drawableRight="?android:attr/listChoiceIndicatorMultiple"
         android:gravity="center_vertical"
-        android:checkMark="?android:attr/listChoiceIndicatorMultiple"
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:text="@string/read_only"
-        android:textAllCaps="true"
+        
         android:textSize="12sp"
         android:id="@id/switch_read_only"
         android:layout_gravity="center_horizontal"
@@ -154,55 +123,145 @@
         android:paddingRight="16dp"
         android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
 
-
-
-
-    <View
-        android:background="@color/divider_inverted"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/line_dimension"/>
-
     <TextView
         android:id="@id/drawer_button_font_size"
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:text="@string/font_size"
-        android:paddingStart="20dp"
+        android:paddingStart="16dp"
-        android:paddingEnd="20dp"
+        android:paddingEnd="16dp"
-            android:paddingLeft="20dp"
+            android:paddingLeft="16dp"
-            android:paddingRight="20dp"
+            android:paddingRight="16dp"
         android:gravity="center_vertical"
         android:textSize="12sp"
-        android:textAllCaps="true"
-        android:clickable="true"
-        android:background="@drawable/item_background_holo_dark"
-        android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
         
-    <View
+        android:clickable="true"
-        android:background="@color/divider_inverted"
+        android:background="?selectableItemBackground"
-        android:layout_width="match_parent"
+        android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
-        android:layout_height="@dimen/line_dimension"/>
 
     <TextView
         android:id="@id/drawer_button_extra_options"
         android:layout_width="match_parent"
         android:layout_height="56dp"
         android:text="@string/extra_options"
-        android:paddingStart="20dp"
+        android:paddingStart="16dp"
-        android:paddingEnd="20dp"
+        android:paddingEnd="16dp"
-        android:paddingLeft="20dp"
+        android:paddingLeft="16dp"
-        android:paddingRight="20dp"
+        android:paddingRight="16dp"
         android:gravity="center_vertical"
         android:textSize="12sp"
-        android:textAllCaps="true"
         android:clickable="true"
-        android:background="@drawable/item_background_holo_dark"
+        android:background="?selectableItemBackground"
+        android:textColor="@color/navigation_drawer_button_text_color_inverted"
+        android:drawableRight="@drawable/abc_spinner_mtrl_am_alpha"/>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:id="@+id/other_options"
+        android:visibility="gone"
+        android:orientation="vertical">
+
+        <android.support.v7.widget.SwitchCompat
+            android:gravity="center_vertical"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:text="@string/light_theme"
+            android:textSize="12sp"
+            android:id="@id/switch_light_theme"
+            android:layout_gravity="center_horizontal"
+            android:paddingEnd="16dp"
+            android:paddingStart="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
             android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
 
-    <View
+        <android.support.v7.widget.SwitchCompat
-        android:background="@color/divider_inverted"
+            android:gravity="center_vertical"
             android:layout_width="match_parent"
-        android:layout_height="@dimen/line_dimension"/>
+            android:layout_height="56dp"
+            android:text="@string/keyboard_suggestions_and_swipe"
+            android:textSize="12sp"
+            android:id="@id/switch_suggestions_active"
+            android:layout_gravity="center_horizontal"
+            android:paddingEnd="16dp"
+            android:paddingStart="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
+
+        <android.support.v7.widget.SwitchCompat
+            android:gravity="center_vertical"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:text="@string/auto_save"
+            android:textSize="12sp"
+            android:id="@id/switch_auto_save"
+            android:layout_gravity="center_horizontal"
+            android:paddingEnd="16dp"
+            android:paddingStart="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
+
+        <TextView
+            android:id="@id/drawer_button_encoding"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:text="@string/codifica"
+            android:paddingStart="16dp"
+            android:paddingEnd="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:gravity="center_vertical"
+            android:textSize="12sp"
+            android:clickable="true"
+            android:background="?selectableItemBackground"
+            android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
+
+        <android.support.v7.widget.SwitchCompat
+            android:gravity="center_vertical"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:text="@string/ignore_back_button"
+            android:textSize="12sp"
+            android:id="@id/switch_ignore_backbutton"
+            android:layout_gravity="center_horizontal"
+            android:paddingEnd="16dp"
+            android:paddingStart="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
+
+        <android.support.v7.widget.SwitchCompat
+            android:gravity="center_vertical"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:text="@string/split_text_if_too_long"
+            android:textSize="12sp"
+            android:id="@id/switch_page_system"
+            android:layout_gravity="center_horizontal"
+            android:paddingEnd="16dp"
+            android:paddingStart="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
+
+        <android.support.v7.widget.SwitchCompat
+            android:gravity="center_vertical"
+            android:layout_width="match_parent"
+            android:layout_height="56dp"
+            android:text="@string/send_error_reports"
+            android:textSize="12sp"
+            android:id="@id/switch_send_error_reports"
+            android:layout_gravity="center_horizontal"
+            android:paddingEnd="16dp"
+            android:paddingStart="16dp"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp"
+            android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
+
+        </LinearLayout>
 
 </LinearLayout>
     </ScrollView>

libraries/sharedCode/src/main/res/layout/item_drawer_list.xml

@@ -18,7 +18,7 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 <LinearLayout
-    android:layout_height="72dp"
+    android:layout_height="64dp"
     android:layout_width="match_parent"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
@@ -29,20 +29,20 @@
     android:layout_width="0dp"
     android:layout_height="wrap_content"
     android:layout_weight="5"
-    android:textSize="18sp"
+    android:textSize="16sp"
-    android:paddingStart="@dimen/item_drawer_list_padding"
+    android:paddingStart="16dp"
-    android:paddingEnd="@dimen/item_drawer_list_padding"
+    android:paddingEnd="8dp"
-    android:paddingLeft="@dimen/item_drawer_list_padding"
+    android:paddingLeft="16dp"
-    android:paddingRight="@dimen/item_drawer_list_padding"
+    android:paddingRight="8dp"
     android:maxLines="1"
-    android:textColor="@color/navigation_drawer_button_text_color_inverted"
+    android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
-    android:ellipsize="end"/>
 
     <ImageView
         android:layout_width="0dp"
         android:layout_weight="1"
-        android:layout_height="30dp"
+        android:layout_height="match_parent"
         android:id="@id/button_remove_from_list"
-        android:src="@drawable/ic_close_dark"/>
+        android:src="@drawable/ic_close_dark"
+        android:padding="15dp"/>
 
     </LinearLayout>

libraries/sharedCode/src/main/res/layout/toolbar.xml

@@ -18,7 +18,14 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<transition xmlns:android="http://schemas.android.com/apk/res/android">
+
-    <item android:drawable="@drawable/list_pressed_holo_dark"  />
+<android.support.v7.widget.Toolbar
-    <item android:drawable="@drawable/list_longpressed_holo_dark"  />
+    xmlns:app="http://schemas.android.com/apk/res-auto"
-</transition>
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/my_awesome_toolbar"
+    android:layout_height="?attr/actionBarSize"
+    android:layout_width="match_parent"
+    android:minHeight="?attr/actionBarSize"
+    android:background="?attr/colorPrimary"
+    app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+    app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>

libraries/sharedCode/src/main/res/menu/activity_select_file.xml

@@ -22,25 +22,25 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@id/im_select_folder"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
         android:title="@string/seleziona">
     </item>
 <item
     android:id="@id/im_set_as_working_folder"
-    android:showAsAction="ifRoom"
+    app:showAsAction="ifRoom"
     android:icon="@drawable/ic_action_bookmark_outline"
     android:title="@string/set_as_working_folder">
 </item>
 <item
     android:id="@id/im_is_working_folder"
-    android:showAsAction="ifRoom"
+    app:showAsAction="ifRoom"
     android:icon="@drawable/ic_action_bookmark"
     android:title="@string/is_the_working_folder">
 </item>
 <item
     android:id="@id/im_search"
-    android:actionViewClass="android.widget.SearchView"
+    app:actionViewClass="android.support.v7.widget.SearchView"
-    android:showAsAction="ifRoom|collapseActionView"
+    app:showAsAction="ifRoom|collapseActionView"
     android:icon="@drawable/ic_action_search"
     android:title="@string/find">
 </item>

libraries/sharedCode/src/main/res/menu/fragment_editor.xml

@@ -22,44 +22,45 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
             android:id="@id/im_save"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
             android:icon="@drawable/ic_action_save"
             android:title="@string/salva"/>
     <item
             android:id="@id/im_undo"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
             android:icon="@drawable/ic_action_undo"
             android:title="@string/testo_indietro"
             />
     <item
             android:id="@id/im_redo"
-        android:showAsAction="ifRoom"
+        app:showAsAction="ifRoom"
             android:icon="@drawable/ic_action_redo"
             android:title="@string/testo_rifai"
             />
     <item
         android:id="@id/im_search"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/find"
         />
     <item
         android:id="@id/im_goto_line"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/goto_line"
         />
     <item
         android:id="@id/im_view_it_on_browser"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/view_it_on_the_web"
         />
     <item
         android:id="@id/im_share"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/share"
+        app:actionProviderClass="android.support.v7.widget.ShareActionProvider"
         />
     <item
         android:id="@id/im_info"
-        android:showAsAction="never"
+        app:showAsAction="never"
         android:title="@string/info"
         />
 

libraries/sharedCode/src/main/res/menu/fragment_editor_search.xml

@@ -30,29 +30,29 @@
     </item>-->
     <item
         android:id="@id/im_cancel"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@android:string/cancel">
     </item>
 
     <item
         android:id="@id/im_previous_item"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/previous">
     </item>
     <item
         android:id="@id/im_next_item"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/next">
     </item>
     <item
         android:id="@id/im_replace"
-        android:showAsAction="always"
+        app:showAsAction="always"
         android:title="@string/replace">
     </item>
     <!--<item
         android:id="@id/im_cancel"
         android:icon="@drawable/ic_action_close"
-        android:title="@android:string/cancel"
+        android:title="@app:tring/cancel"
         app:showAsAction="always">
     </item>-->
 </menu>

libraries/sharedCode/src/main/res/menu/popup_new_file.xml

@@ -24,10 +24,10 @@
     <item
         android:id="@id/im_new_file"
         android:title="@string/file"
-        android:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom"/>
 
     <item
         android:id="@id/im_new_folder"
         android:title="@string/folder"
-        android:showAsAction="ifRoom"/>
+        app:showAsAction="ifRoom"/>
 </menu>