Updated dependencies. Migrated to androidx (mostly). Stripping JSONRPC

next.

app/build.gradle

@@ -20,47 +20,52 @@ buildscript {
     repositories {
         mavenCentral()
         jcenter()
-    }
 
-    dependencies {
+        maven { url "https://jitpack.io" }
-        classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
-        classpath 'com.github.ben-manes:gradle-versions-plugin:0.11.3'
     }
 }
 
 apply plugin: 'com.android.application'
-apply plugin: 'com.jakewharton.hugo'
+
-apply plugin: 'com.github.ben-manes.versions'
+repositories {
+    maven { url "https://jitpack.io" }
+}
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 28
-    buildToolsVersion '23.0.1'
+    buildToolsVersion '28.0.3'
+
+    lintOptions {
+        abortOnError false
+    }
 
     defaultConfig {
         applicationId "com.idlegandalf.ledd"
-        minSdkVersion 17
+        minSdkVersion 24
-        targetSdkVersion 23
+        targetSdkVersion 28
-        versionCode 2
+        versionCode System.getenv("BUILD_NUMBER") as Integer ?: 100
-        versionName "1.0.1"
+        versionName "2.0.0-SNAPSHOT"
+        archivesBaseName = "LedD-" + versionName + "-" + versionCode
     }
-    buildTypes {
+
-        release {
+    compileOptions {
-            minifyEnabled false
+        targetCompatibility 1.8
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        sourceCompatibility 1.8
-        }
     }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
-    compile 'com.android.support:appcompat-v7:23.0.1'
+    implementation 'com.koushikdutta.async:androidasync:2.2.1'
-    compile 'com.android.support:support-v4:23.0.1'
+    implementation 'com.squareup.okhttp3:okhttp:3.12.0'
-    compile 'com.squareup.okhttp:okhttp:2.5.0'
+    implementation 'com.jakewharton.timber:timber:4.7.1'
-    compile 'com.google.code.gson:gson:2.3.1'
+    implementation 'com.google.code.gson:gson:2.8.5'
-    compile 'com.jakewharton:butterknife:7.0.1'
+    implementation 'com.jakewharton:butterknife:8.8.1'
-    compile 'com.koushikdutta.async:androidasync:2.1.6'
+    implementation 'com.github.madrapps:pikolo:1.1.6'
-    compile 'com.android.support:design:23.0.1'
+    implementation 'com.google.guava:guava:27.0-android'
-    compile 'com.larswerkman:HoloColorPicker:1.5'
+    implementation('com.mikepenz:materialdrawer:6.1.1@aar') {
-    compile 'com.google.guava:guava:19.0-rc1'
+        transitive = true
-    provided 'org.projectlombok:lombok:1.16.6'
+    }
+    annotationProcessor 'org.projectlombok:lombok:1.18.4'
+    compileOnly 'org.projectlombok:lombok:1.18.4'
 }

app/src/main/AndroidManifest.xml

@@ -17,19 +17,20 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<manifest
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.idlegandalf.ledd"
+    package="com.idlegandalf.ledd">
-    xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
+    <uses-permission android:name="android.permission.RECORD_AUDIO"/>
+    <uses-feature android:glEsVersion="0x00030000" android:required="true" />
 
     <application
         android:name=".ColorApplication"
         android:allowBackup="true"
         android:fullBackupContent="false"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
         <activity

app/src/main/java/com/idlegandalf/ledd/ColorActivity.java

@@ -22,59 +22,77 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
-import android.content.res.Configuration;
 import android.graphics.Color;
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
 import android.os.Bundle;
-import android.support.design.widget.NavigationView;
+import android.preference.PreferenceManager;
-import android.support.design.widget.Snackbar;
+import android.support.annotation.Nullable;
-import android.support.v4.widget.DrawerLayout;
+import android.util.SparseArray;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
-import android.view.Gravity;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
-import android.view.SubMenu;
 import android.view.View;
+import android.widget.CompoundButton;
+import android.widget.LinearLayout;
 
-import com.idlegandalf.ledd.callbacks.RecieveColorCallback;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.common.reflect.TypeToken;
+import com.google.gson.Gson;
+import com.idlegandalf.ledd.callbacks.ReceiveColorCallback;
 import com.idlegandalf.ledd.callbacks.StripesCallback;
 import com.idlegandalf.ledd.components.HSV;
 import com.idlegandalf.ledd.components.LedDDaemon;
 import com.idlegandalf.ledd.components.LedStripe;
+import com.idlegandalf.ledd.components.Profile;
+import com.idlegandalf.ledd.fragments.AddProfileDialog;
 import com.idlegandalf.ledd.fragments.AddStripeDialog;
 import com.idlegandalf.ledd.helper.LedDHelper;
-import com.larswerkman.holocolorpicker.ColorPicker;
+import com.idlegandalf.ledd.utils.RateLimiter;
-import com.larswerkman.holocolorpicker.SVBar;
+import com.madrapps.pikolo.HSLColorPicker;
+import com.madrapps.pikolo.listeners.SimpleColorSelectionListener;
+import com.mikepenz.materialdrawer.Drawer;
+import com.mikepenz.materialdrawer.DrawerBuilder;
+import com.mikepenz.materialdrawer.holder.BadgeStyle;
+import com.mikepenz.materialdrawer.interfaces.OnCheckedChangeListener;
+import com.mikepenz.materialdrawer.model.DividerDrawerItem;
+import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
+import com.mikepenz.materialdrawer.model.SecondaryDrawerItem;
+import com.mikepenz.materialdrawer.model.SecondarySwitchDrawerItem;
+import com.mikepenz.materialdrawer.model.SwitchDrawerItem;
+import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
 
-import org.json.JSONException;
+import java.lang.reflect.Type;
-
+import java.util.ArrayList;
-import java.io.IOException;
 import java.util.List;
 
-import butterknife.Bind;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import butterknife.BindView;
 import butterknife.ButterKnife;
+import timber.log.Timber;
 
-public class ColorActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
+public class ColorActivity extends AppCompatActivity implements Drawer.OnDrawerItemClickListener, Drawer.OnDrawerItemLongClickListener, OnCheckedChangeListener {
 
-    @Bind(R.id.drawer_layout)
+    @BindView(R.id.main_layout)
-    DrawerLayout mDrawerLayout;
+    LinearLayout scrollView;
-    @Bind(R.id.toolbar)
+    @BindView(R.id.toolbar)
     Toolbar toolbar;
-    @Bind(R.id.drawer)
+    @BindView(R.id.picker)
-    NavigationView navigationView;
+    HSLColorPicker colorPicker;
-    @Bind(R.id.picker)
+    Drawer mDrawer;
-    ColorPicker colorPicker;
+    private List<IDrawerItem> mDaemons;
-    @Bind(R.id.svbar)
-    SVBar svBar;
-    private ActionBarDrawerToggle mDrawerToggle;
     private refreshDaemonsListener daemonsListener;
     private List<LedStripe> ledStripes;
+    private List<Profile> profiles;
     private LedStripe mCurrentStripe;
-    private LedDHelper mCurrentHelper;
+    private boolean fromOnCreate = true;
+    private boolean autoColorSet = false;
+    private RateLimiter limiter;
+    private boolean isRefreshRunning = false;
+    private Type profileList = new TypeToken<List<Profile>>() {
+    }.getType();
+    private PrimaryDrawerItem menuProfiles;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -82,56 +100,78 @@ public class ColorActivity extends AppCompatActivity implements NavigationView.O
         setContentView(R.layout.activity_color);
         ButterKnife.bind(this);
 
+        if (BuildConfig.DEBUG) {
+            Timber.plant(new Timber.DebugTree());
+        }
+
         // check for connectivity
         ConnectivityManager connMgr = (ConnectivityManager) getSystemService(Context.CONNECTIVITY_SERVICE);
         NetworkInfo networkInfo = connMgr.getActiveNetworkInfo();
-        if (networkInfo == null || !networkInfo.isConnected()) {
+        if (networkInfo == null || !networkInfo.isConnected() || networkInfo.getType() != ConnectivityManager.TYPE_WIFI) {
-            // TODO: Display error (snackbar)
+            Snackbar.make(scrollView, R.string.snackbar_no_wlan, Snackbar.LENGTH_INDEFINITE).setAction("RETRY", v -> {
+                refreshStripes();
+            }).show();
         }
 
-        colorPicker.addSVBar(svBar);
+        mDaemons = new ArrayList<>();
-        colorPicker.setShowOldCenterColor(false);
+        limiter = new RateLimiter(30.0, 1000);
 
-        colorPicker.setOnColorChangedListener(new ColorPicker.OnColorChangedListener() {
+        colorPicker.setColorSelectionListener(new SimpleColorSelectionListener() {
             @Override
-            public void onColorChanged(int i) {
+            public void onColorSelected(int color) {
-                if (mCurrentStripe != null && mCurrentHelper != null) {
+                if (mCurrentStripe != null && limiter.check() && !autoColorSet) {
-                    float[] hsv = new float[3];
+                    mCurrentStripe.setColor(color);
-                    Color.colorToHSV(i, hsv);
-                    mCurrentStripe.setColor(new HSV(hsv[0], hsv[1], hsv[2]));
-                    mCurrentHelper.setColor(mCurrentStripe);
                 }
             }
         });
 
-        navigationView.setNavigationItemSelectedListener(this);
-        setSupportActionBar(toolbar);
         toolbar.setTitle(R.string.app_name);
 
-        mDrawerToggle = new ActionBarDrawerToggle(this, mDrawerLayout, R.string.app_name, R.string.app_name) {
+        mDrawer = new DrawerBuilder()
+                .withActivity(this)
+                .withToolbar(toolbar)
+                .withOnDrawerItemClickListener(this)
+                .withOnDrawerItemLongClickListener(this)
+                .addStickyDrawerItems(
+                        new PrimaryDrawerItem().withName(R.string.text_add_stripe).withTag("add_stripe").withSelectable(false).withIcon(R.drawable.ic_add_circle_black_48dp),
+                        new PrimaryDrawerItem().withName(R.string.text_settings).withTag("settings").withSelectable(false).withIcon(R.drawable.ic_tune_black_48dp)
+                )
+                .addDrawerItems(
+                        new DividerDrawerItem(),
+                        menuProfiles = new PrimaryDrawerItem()
+                                .withName("Profiles")
+                                .withIcon(R.drawable.ic_save_black_48dp)
+                                .withSelectable(false)
+                                .withIsExpanded(true)
+                                .withBadgeStyle(new BadgeStyle().withColor(Color.CYAN).withTextColor(Color.WHITE))
+                )
+                .build();
 
-            /** Called when a drawer has settled in a completely closed state. */
+        menuProfiles.withSubItems(new SecondaryDrawerItem().withName("Add Profile").withTag("add_profile").withSelectable(false).withIcon(R.drawable.ic_add_circle_outline_black_48dp));
-            public void onDrawerClosed(View view) {
-                // TODO: do things that have to be done here
-            }
 
-            /** Called when a drawer has settled in a completely open state. */
+        // enable HomeButton navigation to drawer
-            public void onDrawerOpened(View drawerView) {
-                // TODO: do things that have to be done here
-            }
-        };
-
-        // set the drawer toggle as the DrawerListener
-        mDrawerLayout.setDrawerListener(mDrawerToggle);
-
-        // enable Homebutton navigation to drawer
         if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+            getSupportActionBar().setDisplayHomeAsUpEnabled(false);
-            getSupportActionBar().setHomeButtonEnabled(true);
+            mDrawer.getActionBarDrawerToggle().setDrawerIndicatorEnabled(true);
         }
 
+        List<IDrawerItem> subProfiles = menuProfiles.getSubItems();
+        if (PreferenceManager.getDefaultSharedPreferences(this).contains("profiles")) {
+            profiles = new Gson().fromJson(PreferenceManager.getDefaultSharedPreferences(this).getString("profiles", ""), profileList);
+
+            for (Profile profile : profiles) {
+                subProfiles.add(0, new SecondaryDrawerItem().withName(profile.getName()).withTag(profile.getValues()).withSelectable(false).withIcon(R.drawable.ic_note_black_48dp));
+            }
+        } else {
+            profiles = new ArrayList<>();
+        }
+
+        menuProfiles.withSubItems(subProfiles);
+        mDrawer.updateItem(menuProfiles);
+
         daemonsListener = new refreshDaemonsListener();
         registerReceiver(daemonsListener, new IntentFilter(ColorApplication.INTENT_ACTION_REFRESH));
+
     }
 
     @Override
@@ -142,39 +182,56 @@ public class ColorActivity extends AppCompatActivity implements NavigationView.O
         return true;
     }
 
-    @Override
-    protected void onPostCreate(Bundle savedInstanceState) {
-        super.onPostCreate(savedInstanceState);
-        // Sync the toggle state after onRestoreInstanceState has occurred.
-        mDrawerToggle.syncState();
-    }
-
-    @Override
-    public void onConfigurationChanged(Configuration newConfig) {
-        super.onConfigurationChanged(newConfig);
-        mDrawerToggle.onConfigurationChanged(newConfig);
-    }
-
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
-        // Pass the event to ActionBarDrawerToggle, if it returns
-        // true, then it has handled the app icon touch event
-        if (mDrawerToggle.onOptionsItemSelected(item)) {
-            return true;
-        }
-        // Handle your other action bar items...
-
-
         return super.onOptionsItemSelected(item);
     }
 
+    @Override
+    protected void onRestart() {
+        super.onRestart();
+        ColorApplication.getInstance().onResume();
+        registerReceiver(daemonsListener, new IntentFilter(ColorApplication.INTENT_ACTION_REFRESH));
+        refreshStripes();
+    }
+
+    @Override
+    public void onCheckedChanged(IDrawerItem drawerItem, CompoundButton buttonView, boolean isChecked) {
+        LedStripe stripe = null;
+        for (LedStripe ledStripe : ledStripes) {
+            if (((int) drawerItem.getTag()) == ledStripe.getId()) {
+                stripe = ledStripe;
+                break;
+            }
+        }
+
+        if (stripe != null) {
+            if (isChecked) {
+                if (stripe == mCurrentStripe) {
+                    if (colorPicker.getSolidColor() != Color.BLACK)
+                        stripe.setColor(colorPicker.getSolidColor());
+                    else {
+                        colorPicker.setColor(Color.WHITE);
+                    }
+                } else {
+                    stripe.setColor(Color.WHITE);
+                }
+            } else {
+                if (stripe == mCurrentStripe)
+                    colorPicker.setColor(Color.BLACK);
+                else
+                    stripe.setColor(Color.BLACK);
+            }
+        }
+    }
+
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event) {
         if (keyCode == KeyEvent.KEYCODE_MENU) {
-            if (mDrawerLayout.isDrawerOpen(Gravity.LEFT)) {
+            if (mDrawer.isDrawerOpen()) {
-                mDrawerLayout.closeDrawer(Gravity.LEFT);
+                mDrawer.closeDrawer();
             } else {
-                mDrawerLayout.openDrawer(Gravity.LEFT);
+                mDrawer.openDrawer();
             }
 
             return true;
@@ -187,6 +244,12 @@ public class ColorActivity extends AppCompatActivity implements NavigationView.O
         super.onPause();
         ColorApplication.getInstance().teardown();
         unregisterReceiver(daemonsListener);
+
+        if (mCurrentStripe != null)
+            PreferenceManager.getDefaultSharedPreferences(this).edit().putInt("lastStripe", mCurrentStripe.getId()).apply();
+
+        if (profiles != null)
+            PreferenceManager.getDefaultSharedPreferences(this).edit().putString("profiles", new Gson().toJson(profiles, profileList)).apply();
     }
 
     @Override
@@ -198,156 +261,267 @@ public class ColorActivity extends AppCompatActivity implements NavigationView.O
     @Override
     protected void onResume() {
         super.onResume();
-        ColorApplication.getInstance().onResume();
+
-        registerReceiver(daemonsListener, new IntentFilter(ColorApplication.INTENT_ACTION_REFRESH));
+        if (!fromOnCreate) {
-        try {
+            ColorApplication.getInstance().onResume();
+            registerReceiver(daemonsListener, new IntentFilter(ColorApplication.INTENT_ACTION_REFRESH));
             refreshStripes();
-        } catch (IOException e) {
+        } else {
-            e.printStackTrace();
+            fromOnCreate = false;
         }
     }
 
+
+    @SuppressWarnings("unchecked")
     @Override
-    public boolean onNavigationItemSelected(MenuItem menuItem) {
+    public boolean onItemClick(View view, int position, IDrawerItem drawerItem) {
-        int id = menuItem.getItemId();
+        if (drawerItem.getTag() instanceof String) {
+            String tag = (String) drawerItem.getTag();
 
-        switch (id) {
+            switch (tag) {
-            case R.id.nv_add_stripe:
+                case "add_stripe":
-                new AddStripeDialog().show(getFragmentManager(), "");
+                    new AddStripeDialog().show(getFragmentManager(), "");
-                return true;
+                    return true;
-            case R.id.nv_settings:
+                case "settings":
-                return true;
+                    return true;
-        }
+                case "add_profile":
-
+                    new AddProfileDialog().show(getFragmentManager(), "");
-        for (LedStripe stripe : ledStripes) {
+                    return true;
-            if (stripe.getName().equals(menuItem.getTitle())) {
-                mCurrentStripe = stripe;
-                try {
-                    mCurrentHelper = ColorApplication.getInstance().getHelperForDaemon(stripe.getLedDDaemon());
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                mDrawerLayout.closeDrawer(Gravity.LEFT);
-                toolbar.setTitle(stripe.getName());
-                try {
-                    mCurrentHelper.getColor(mCurrentStripe, new RecieveColorCallback() {
-                        @Override
-                        public void onColorRecieved(LedStripe stripe) {
-                            final HSV cColor = stripe.getColor();
-
-                            runOnUiThread(new Runnable() {
-                                @Override
-                                public void run() {
-                                    colorPicker.setColor(Color.HSVToColor(new float[]{(float) cColor.getHue(), (float) cColor.getSaturation(),
-                                            (float) cColor.getValue()}));
-                                }
-                            });
-                        }
-
-                        @Override
-                        public void onRecievFailed(String msg) {
-
-                        }
-
-                        @Override
-                        public void onConnectionFailed(String message) {
-
-                        }
-                    });
-                } catch (JSONException | IOException e) {
-                    e.printStackTrace();
-                }
-                return true;
             }
         }
 
+        if (drawerItem.getTag() instanceof SparseArray) {
+            SparseArray<HSV> sparseArray = (SparseArray<HSV>) drawerItem.getTag();
+
+            if (ledStripes != null) {
+                for (LedStripe ledStripe : ledStripes) {
+                    String json_workaround = new Gson().toJson(sparseArray.get(ledStripe.getId()));
+                    HSV nHSV = new Gson().fromJson(json_workaround, new TypeToken<HSV>() {
+                    }.getType());
+
+                    if (nHSV != null) {
+                        ledStripe.setColor(nHSV);
+                    }
+                }
+            }
+        }
+
+        if (drawerItem.isSelectable()) {
+            if (drawerItem.getTag() instanceof Integer) {
+                int tag = (int) drawerItem.getTag();
+
+                for (LedStripe stripe : ledStripes) {
+                    if (tag == stripe.getId()) {
+                        selectStripe(stripe);
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public boolean onItemLongClick(View view, int position, IDrawerItem drawerItem) {
+        Timber.d("Longclick of %s", drawerItem.getClass().getName());
+
         return false;
     }
 
-    public void refreshStripes() throws IOException {
+    public List<LedStripe> getStripes() {
-        reCreateNavigationView(); // need to recreate the navigationview since we can't remove a once added submenu
+        return ledStripes;
+    }
 
-        final Menu nvMenu = navigationView.getMenu();
+    public void addProfile(Profile profile) {
-        final int stripeGroup = 42;
+        if (profiles != null) {
+            profiles.add(profile);
+
+            List<IDrawerItem> subProfiles = menuProfiles.getSubItems();
+            subProfiles.add(0, new SecondaryDrawerItem().withName(profile.getName()).withSelectable(false).withTag(profile.getValues()).withIcon(R.drawable.ic_note_black_48dp));
+
+            menuProfiles.withSubItems(subProfiles).withIsExpanded(true).withBadge(String.valueOf(profiles.size()));
+            mDrawer.updateItem(menuProfiles);
+        }
+    }
+
+    @SuppressWarnings("deprecated")
+    public void refreshStripes() {
+        if (isRefreshRunning)
+            return;
+        isRefreshRunning = true;
 
         int i = 1;
         for (final LedDDaemon dDaemon : ColorApplication.getInstance().getDaemons()) {
-
             LedDHelper helper = ColorApplication.getInstance().getHelperForDaemon(dDaemon);
 
             if (helper != null) {
-                try {
+                final int finalI = i;
-                    final int finalI = i;
+                helper.getStripes(new StripesCallback() {
-                    helper.getStripes(new StripesCallback() {
+                    @Override
-                        @Override
+                    public void onSuccess(List<LedStripe> stripes) {
-                        public void onSuccess(final List<LedStripe> stripes) {
+                        ledStripes = stripes;
-                            runOnUiThread(new Runnable() {
+                        runOnUiThread(() -> {
+                            PrimaryDrawerItem nDaemonMenu = null;
+                            long selectedItemId = -1;
+                            for (IDrawerItem drawerItem : mDaemons) {
+                                if (((PrimaryDrawerItem) drawerItem).getName().getText().equals(dDaemon.toString())) {
+                                    nDaemonMenu = (PrimaryDrawerItem) drawerItem;
+                                    break;
+                                }
+                            }
+
+                            if (nDaemonMenu == null) {
+                                nDaemonMenu = new PrimaryDrawerItem().withName(dDaemon.toString()).withTag(finalI).withSelectable(false).withIsExpanded(true).withIcon(R.drawable.ic_computer_black_48dp);
+                                mDrawer.addItemAtPosition(nDaemonMenu, 0);
+                                mDaemons.add(nDaemonMenu);
+                            }
+
+                            int lastStripeId = -1;
+                            if (PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).contains("lastStripe")) {
+                                lastStripeId = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()).getInt("lastStripe", -1);
+                            }
+
+                            List<IDrawerItem> mStripes = new ArrayList<>();
+                            for (LedStripe stripe : ledStripes) {
+                                final SwitchDrawerItem sItem = new SwitchDrawerItem()
+                                        .withName(stripe.getName())
+                                        .withTag(stripe.getId())
+                                        .withIcon(R.drawable.ic_wb_iridescent_black_48dp)
+                                        .withOnCheckedChangeListener(ColorActivity.this);
+
+                                mStripes.add(sItem);
+
+                                if (lastStripeId != -1 && stripe.getId() == lastStripeId) {
+                                    selectStripe(stripe);
+                                    selectedItemId = sItem.getIdentifier();
+                                }
+                            }
+
+                            nDaemonMenu.withSubItems(mStripes);
+                            nDaemonMenu.withBadge(String.valueOf(mStripes.size()));
+                            //noinspection deprecation
+                            nDaemonMenu.withBadgeStyle(new BadgeStyle().withColor(getResources().getColor(R.color.material_drawer_accent)).withTextColor(Color.WHITE));
+                            mDrawer.updateItem(nDaemonMenu);
+                            if (selectedItemId != -1)
+                                mDrawer.setSelection(selectedItemId);
+
+                            //noinspection ConstantConditions
+                            Snackbar.make(findViewById(android.R.id.content), R.string.snackbar_stripes_reloaded, Snackbar.LENGTH_LONG).show();
+                        });
+
+
+                        for (LedStripe stripe : ledStripes) {
+                            stripe.getColor(new ReceiveColorCallback() {
                                 @Override
-                                public void run() {
+                                public void onConnectionFailed(String message) {
-                                    SubMenu nDaemonMenu = nvMenu.addSubMenu(Menu.NONE, Menu.NONE, finalI, dDaemon.toString());
-                                    nDaemonMenu.setGroupCheckable(stripeGroup, true, true);
 
-                                    ledStripes = stripes;
+                                }
-                                    Snackbar.make(findViewById(android.R.id.content), "LED stripes reloaded", Snackbar.LENGTH_LONG).show();
 
-                                    for (LedStripe stripe : ledStripes) {
+                                @Override
-                                        MenuItem sItem = nDaemonMenu.add(stripeGroup, View.generateViewId(), stripe.getId(), stripe.getName());
+                                public void onColorReceived(LedStripe stripe) {
-                                        sItem.setIcon(R.drawable.ic_wb_iridescent_black_48dp);
+                                    if (stripe.isOn()) {
+                                        IDrawerItem sItem = findItemForStripe(stripe);
+
+                                        if (sItem != null) {
+                                            final SecondarySwitchDrawerItem cItem = (SecondarySwitchDrawerItem) sItem;
+                                            cItem.withSwitchEnabled(true);
+
+                                            runOnUiThread(() -> mDrawer.updateItem(cItem));
+                                        }
                                     }
                                 }
+
+                                @Override
+                                public void onReceiveFailed(int code, String msg) {
+
+                                }
+
                             });
                         }
+                    }
 
-                        @Override
+                    @Override
-                        public void onGetFailed(String message) {
+                    public void onGetFailed(int code, String message) {
-                            Snackbar.make(findViewById(android.R.id.content), "Coudn't get stripes from daemon: " + message, Snackbar.LENGTH_LONG)
+                        //noinspection ConstantConditions
-                                    .show();
+                        Snackbar.make(findViewById(android.R.id.content), getString(R.string.snackbar_no_connection_stripes) + message, Snackbar
+                                .LENGTH_LONG).show();
 
-                        }
+                    }
+
+                    @Override
+                    public void onConnectionFailed(String message) {
+                        //noinspection ConstantConditions
+                        Snackbar.make(findViewById(android.R.id.content), getString(R.string.snackbar_connection_failed) + message, Snackbar
+                                .LENGTH_LONG).show();
+                    }
+                });
 
-                        @Override
-                        public void onConnectionFailed(String message) {
-                            Snackbar.make(findViewById(android.R.id.content), "Coudn't connect to daemon: " + message, Snackbar.LENGTH_LONG).show();
-                        }
-                    });
-                } catch (JSONException | IOException e) {
-                    e.printStackTrace();
-                }
             }
 
             i++;
         }
+
+        isRefreshRunning = false;
     }
 
-    private void reCreateNavigationView() {
+    private void selectStripe(LedStripe stripe) {
-        runOnUiThread(new Runnable() {
+        mCurrentStripe = stripe;
+
+        toolbar.setTitle(stripe.getName());
+        autoColorSet = true;
+        mDrawer.closeDrawer();
+        mCurrentStripe.getColor(new ReceiveColorCallback() {
             @Override
-            public void run() {
+            public void onColorReceived(final LedStripe stripe) {
-                mDrawerLayout.removeView(navigationView);
+                final HSV cColor = stripe.getColor();
-                navigationView = new NavigationView(ColorActivity.this);
+                final int color = Color.HSVToColor(new float[]{(float) cColor.getHue(), (float) cColor.getSaturation(), (float) cColor.getValue()});
-                DrawerLayout.LayoutParams params = new DrawerLayout.LayoutParams(DrawerLayout.LayoutParams.WRAP_CONTENT, DrawerLayout.LayoutParams
+
-                        .MATCH_PARENT);
+                runOnUiThread(() -> {
-                params.gravity = Gravity.START;
+                    colorPicker.setColor(color);
-                navigationView.setLayoutParams(params);
+                    autoColorSet = false;
-                navigationView.inflateMenu(R.menu.navigation_drawer);
+
-                navigationView.inflateHeaderView(R.layout.navigation_header);
+                    if (stripe.isOn()) {
-                mDrawerLayout.addView(navigationView, params);
+                        IDrawerItem fItem = findItemForStripe(stripe);
-                navigationView.setNavigationItemSelectedListener(ColorActivity.this);
+
-                mDrawerToggle.syncState();
+                        if (fItem != null)
+                            ((SecondarySwitchDrawerItem) fItem).withSwitchEnabled(true);
+                    }
+                });
+            }
+
+            @Override
+            public void onReceiveFailed(int code, String msg) {
+                autoColorSet = false;
+            }
+
+            @Override
+            public void onConnectionFailed(String message) {
+                autoColorSet = false;
             }
         });
     }
 
+    @Nullable
+    private IDrawerItem findItemForStripe(LedStripe stripe) {
+        for (IDrawerItem dItem : mDaemons) {
+            if (((PrimaryDrawerItem) dItem).getSubItems() != null) {
+                for (IDrawerItem sItem : ((PrimaryDrawerItem) dItem).getSubItems()) {
+                    if (((int) sItem.getTag()) == stripe.getId()) {
+                        return sItem;
+                    }
+                }
+            }
+        }
+
+        return null;
+    }
+
     protected class refreshDaemonsListener extends BroadcastReceiver {
 
         @Override
         public void onReceive(Context context, Intent intent) {
             if (intent.getAction().equals(ColorApplication.INTENT_ACTION_REFRESH)) {
-                try {
+                refreshStripes();
-                    refreshStripes();
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
             }
         }
     }

app/src/main/java/com/idlegandalf/ledd/ColorApplication.java

@@ -21,7 +21,6 @@ package com.idlegandalf.ledd;
 import android.app.Application;
 import android.content.Intent;
 import android.preference.PreferenceManager;
-import android.util.Log;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
@@ -29,14 +28,13 @@ import com.idlegandalf.ledd.callbacks.DiscoverCallback;
 import com.idlegandalf.ledd.components.LedDDaemon;
 import com.idlegandalf.ledd.helper.LedDHelper;
 
-import org.json.JSONException;
-
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Set;
 
+import timber.log.Timber;
+
 public class ColorApplication extends Application {
     public static final String TAG = "LedD";
     public static final String INTENT_ACTION_REFRESH = "com.idlegandalf.ledd.action.refreshStripes";
@@ -50,51 +48,40 @@ public class ColorApplication extends Application {
     @Override
     public void onCreate() {
         super.onCreate();
-        singleton = this;
 
+        singleton = this;
         ledDHelpers = new HashMap<>();
         this.onResume();
     }
 
-    public LedDHelper getHelperForDaemon(final LedDDaemon ledDDaemon) throws IOException {
+    public LedDHelper getHelperForDaemon(final LedDDaemon ledDDaemon) {
         if (ledDHelpers.containsKey(ledDDaemon) && ledDHelpers.get(ledDDaemon) != null) {
             return ledDHelpers.get(ledDDaemon);
         } else {
             final LedDHelper dHelper = new LedDHelper(ledDDaemon, getApplicationContext());
-            try {
+            dHelper.discover(new DiscoverCallback() {
-                dHelper.discover(new DiscoverCallback() {
+                @Override
-                    @Override
+                public void onConnectionFailed(String message) {
-                    public void onConnectionFailed(String message) {
-
-                    }
-
-                    @Override
-                    public void onDiscoverSuccessfully(String version) {
-                        ledDHelpers.put(ledDDaemon, dHelper);
-                    }
-                });
-            } catch (JSONException e) {
-                e.printStackTrace();
-            }
 
+                }
 
+                @Override
+                public void onDiscoverSuccessfully(String version) {
+                    ledDHelpers.put(ledDDaemon, dHelper);
+                }
+            });
             return dHelper;
         }
     }
 
     public List<LedDDaemon> getDaemons() {
-        ArrayList<LedDDaemon> ledDDaemons = new ArrayList<>();
+        return new ArrayList<>(ledDHelpers.keySet());
-        ledDDaemons.addAll(ledDHelpers.keySet());
-
-        return ledDDaemons;
     }
 
     public void teardown() {
-        for (LedDHelper dHelper : ledDHelpers.values()) {
+        ledDHelpers.values().forEach(LedDHelper::teardown);
-            dHelper.teardown();
-        }
 
-        PreferenceManager.getDefaultSharedPreferences(this).edit().putString("daemons", new Gson().toJson(ledDHelpers.keySet())).commit();
+        PreferenceManager.getDefaultSharedPreferences(this).edit().putString("daemons", new Gson().toJson(ledDHelpers.keySet())).apply();
     }
 
     public void onResume() {
@@ -103,37 +90,31 @@ public class ColorApplication extends Application {
                     TypeToken<Set<LedDDaemon>>() {
             }.getType());
 
+            Timber.i("Loaded " + ledDDaemons.size() + " Daemons from preferences");
+
             for (final LedDDaemon ledDDaemon : ledDDaemons) {
-                try {
+                final LedDHelper helper = new LedDHelper(ledDDaemon, getApplicationContext());
-                    final LedDHelper helper = new LedDHelper(ledDDaemon, getApplicationContext());
 
-                    helper.discover(new DiscoverCallback() {
+                helper.discover(new DiscoverCallback() {
-                        @Override
+                    @Override
-                        public void onDiscoverSuccessfully(String version) {
+                    public void onDiscoverSuccessfully(String version) {
-                            //ledDDaemon.setActive(true);
+                        //ledDDaemon.setActive(true);
-                            ledDHelpers.put(ledDDaemon, helper);
+                        ledDHelpers.put(ledDDaemon, helper);
 
-                            Intent i = new Intent(INTENT_ACTION_REFRESH);
+                        Intent i = new Intent(INTENT_ACTION_REFRESH);
-                            sendBroadcast(i);
+                        sendBroadcast(i);
-                        }
+                    }
 
-                        @Override
+                    @Override
-                        public void onConnectionFailed(String message) {
+                    public void onConnectionFailed(String message) {
-                            //ledDDaemon.setActive(false);
+                        //ledDDaemon.setActive(false);
-                            ledDHelpers.put(ledDDaemon, helper);
+                        ledDHelpers.put(ledDDaemon, helper);
 
-                            Intent i = new Intent(INTENT_ACTION_REFRESH);
+                        Intent i = new Intent(INTENT_ACTION_REFRESH);
-                            sendBroadcast(i);
+                        sendBroadcast(i);
-                        }
+                    }
-                    });
+                });
-
-
-                } catch (IOException | JSONException e) {
-                    e.printStackTrace();
-                }
             }
         }
-
-        Log.i(ColorApplication.TAG, "Loaded " + ledDHelpers.size() + " Daemons from preferences");
     }
 }

app/src/main/java/com/idlegandalf/ledd/SettingsActivity.java

@@ -1,38 +0,0 @@
-/*
- * LEDD Project
- * Copyright (C) 2015 LEDD Team
- *
- * This program 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.
- *
- * This program 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 com.idlegandalf.ledd;
-
-import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
-
-import com.idlegandalf.ledd.fragments.SettingsFragment;
-
-public class SettingsActivity extends ActionBarActivity {
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        if (getSupportActionBar() != null) {
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        }
-
-        // Display the fragment as the main content.
-        getFragmentManager().beginTransaction().replace(android.R.id.content, new SettingsFragment()).commit();
-    }
-}

app/src/main/java/com/idlegandalf/ledd/callbacks/AddControllerCallback.java

@@ -28,6 +28,6 @@ public interface AddControllerCallback extends BaseCallback {
      */
     void onControllerAdded(Controller controller);
 
-    void onAddFailed(String msg, String detail);
+    void onAddFailed(int code, String msg);
 }
 

app/src/main/java/com/idlegandalf/ledd/callbacks/AddStripeCallback.java

@@ -23,4 +23,6 @@ import com.idlegandalf.ledd.components.LedStripe;
 
 public interface AddStripeCallback extends BaseCallback {
     void onAddSuccessfully(LedStripe stripe);
+
+    void onAddFailed(int code, String msg);
 }

app/src/main/java/com/idlegandalf/ledd/callbacks/ReceiveColorCallback.java

@@ -20,8 +20,8 @@ package com.idlegandalf.ledd.callbacks;
 
 import com.idlegandalf.ledd.components.LedStripe;
 
-public interface RecieveColorCallback extends BaseCallback {
+public interface ReceiveColorCallback extends BaseCallback {
-    void onColorRecieved(LedStripe stripe);
+    void onColorReceived(LedStripe stripe);
 
-    void onRecievFailed(String msg);
+    void onReceiveFailed(int code, String msg);
 }

app/src/main/java/com/idlegandalf/ledd/callbacks/StripesCallback.java

@@ -26,5 +26,5 @@ import java.util.List;
 public interface StripesCallback extends BaseCallback {
     void onSuccess(List<LedStripe> stripes);
 
-    void onGetFailed(String message);
+    void onGetFailed(int code, String message);
 }

app/src/main/java/com/idlegandalf/ledd/components/AnswerTask.java

@@ -19,11 +19,11 @@
 package com.idlegandalf.ledd.components;
 
 
-import org.json.JSONObject;
+import com.thetransactioncompany.jsonrpc2.JSONRPC2Response;
 
 public abstract class AnswerTask {
     public abstract void onConnectionFailed(String message);
 
-    public abstract void onResponse(JSONObject response);
+    public abstract void onResponse(JSONRPC2Response response);
 }
 

app/src/main/java/com/idlegandalf/ledd/components/HSV.java

@@ -33,8 +33,4 @@ public class HSV {
         this.saturation = s;
         this.value = v;
     }
-
-    public HSV() {
-
-    }
 }

app/src/main/java/com/idlegandalf/ledd/components/LedDDaemon.java

@@ -50,10 +50,7 @@ public class LedDDaemon {
 
     @Override
     public boolean equals(Object o) {
-        if (o instanceof LedDDaemon) {
+        return o instanceof LedDDaemon && address.equals(((LedDDaemon) o).address) && port == ((LedDDaemon) o).port;
-            if (address.equals(((LedDDaemon) o).address) && port == ((LedDDaemon) o).port) return true;
-        }
-        return false;
     }
 
     @Override

app/src/main/java/com/idlegandalf/ledd/components/LedDRequest.java

@@ -18,16 +18,16 @@
 
 package com.idlegandalf.ledd.components;
 
-import org.json.JSONObject;
+import com.thetransactioncompany.jsonrpc2.JSONRPC2Request;
 
 import lombok.Getter;
 
 @Getter
 public class LedDRequest {
-    JSONObject request;
+    JSONRPC2Request request;
     AnswerTask task;
 
-    public LedDRequest(JSONObject request, AnswerTask task) {
+    public LedDRequest(JSONRPC2Request request, AnswerTask task) {
         this.request = request;
         this.task = task;
     }

app/src/main/java/com/idlegandalf/ledd/components/LedStripe.java

@@ -18,6 +18,13 @@
 
 package com.idlegandalf.ledd.components;
 
+import android.graphics.Color;
+import android.support.annotation.Nullable;
+
+import com.idlegandalf.ledd.ColorApplication;
+import com.idlegandalf.ledd.callbacks.ReceiveColorCallback;
+import com.idlegandalf.ledd.helper.LedDHelper;
+
 import lombok.Getter;
 import lombok.Setter;
 
@@ -34,6 +41,7 @@ public class LedStripe {
     boolean RGB;
     Controller controller;
     LedDDaemon ledDDaemon;
+    LedDHelper helper;
 
     public LedStripe() {
         this(-1, -1, -1, -1, "");
@@ -55,4 +63,55 @@ public class LedStripe {
         this.name = name;
         this.RGB = RGB;
     }
+
+    @Override
+    public String toString() {
+        return String.format("%s->%s->%s (%d|%d|%d)", ledDDaemon, controller.getAddress(), name, channelRed, channelGreen, channelBlue);
+    }
+
+    public void setColor(int color) {
+        float[] hsv = new float[3];
+        Color.colorToHSV(color, hsv);
+        setColor(new HSV(hsv[0], hsv[1], hsv[2]));
+    }
+
+    public void setColor(HSV color) {
+        checkHelper();
+        this.color = color;
+
+        helper.setColor(this);
+    }
+
+    private void checkHelper() {
+        if (helper == null) {
+            helper = ColorApplication.getInstance().getHelperForDaemon(ledDDaemon);
+        }
+    }
+
+    public void getColor(@Nullable final ReceiveColorCallback callback) {
+        checkHelper();
+
+        helper.getColor(this, new ReceiveColorCallback() {
+            @Override
+            public void onColorReceived(LedStripe stripe) {
+                color = stripe.getColor();
+                if (callback != null)
+                    callback.onColorReceived(LedStripe.this);
+            }
+
+            @Override
+            public void onReceiveFailed(int code, String msg) {
+                if (callback != null) callback.onReceiveFailed(code, msg);
+            }
+
+            @Override
+            public void onConnectionFailed(String message) {
+                if (callback != null) callback.onConnectionFailed(message);
+            }
+        });
+    }
+
+    public boolean isOn() {
+        return color != null && color.getValue() != 0.0;
+    }
 }

app/src/main/java/com/idlegandalf/ledd/components/Profile.java

@@ -0,0 +1,22 @@
+package com.idlegandalf.ledd.components;
+
+import android.util.SparseArray;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Setter
+public class Profile {
+    private SparseArray<HSV> values;
+    private String name;
+
+    public Profile(SparseArray<HSV> hsvHashMap) {
+        setValues(hsvHashMap);
+    }
+
+    public Profile(String name) {
+        setValues(new SparseArray<HSV>());
+        setName(name);
+    }
+}

app/src/main/java/com/idlegandalf/ledd/components/Sendable.java

@@ -18,33 +18,26 @@
 
 package com.idlegandalf.ledd.components;
 
-import org.json.JSONException;
+import com.thetransactioncompany.jsonrpc2.JSONRPC2Request;
-import org.json.JSONObject;
+import com.thetransactioncompany.jsonrpc2.JSONRPC2Response;
 
-import java.util.UUID;
+import org.json.JSONException;
 
 import lombok.Getter;
 
 @Getter
 public class Sendable {
     LedDDaemon recipient;
-    JSONObject message;
+    JSONRPC2Request request;
-    String ref;
     AnswerTask onAnswer;
 
-    public Sendable(JSONObject msg, AnswerTask task, LedDDaemon ledDDaemon) throws JSONException {
+    public Sendable(JSONRPC2Request request, AnswerTask task, LedDDaemon recipient) throws JSONException {
-        this(msg, UUID.randomUUID().toString(), task, ledDDaemon);
+        this.request = request;
-    }
-
-    public Sendable(JSONObject msg, String ref, AnswerTask task, LedDDaemon recipient) throws JSONException {
-        this.message = msg;
-        this.ref = ref;
-        this.message.put("ref", ref);
         this.onAnswer = task;
         this.recipient = recipient;
     }
 
-    public void onResponse(JSONObject object) {
+    public void onResponse(JSONRPC2Response object) {
         if (onAnswer != null) {
             onAnswer.onResponse(object);
         }
@@ -55,6 +48,8 @@ public class Sendable {
     }
 
     public void onConnectionFailed(String message) {
-        onAnswer.onConnectionFailed(message);
+        if (onAnswer != null) {
+            onAnswer.onConnectionFailed(message);
+        }
     }
 }

app/src/main/java/com/idlegandalf/ledd/components/StripeGroup.java

@@ -21,9 +21,6 @@ package com.idlegandalf.ledd.components;
 
 import com.idlegandalf.ledd.helper.LedDHelper;
 
-import org.json.JSONException;
-
-import java.io.IOException;
 import java.util.ArrayList;
 
 public class StripeGroup {
@@ -60,7 +57,7 @@ public class StripeGroup {
         return null;
     }
 
-    public void setRGB(int r, int g, int b, LedDHelper api) throws JSONException, IOException {
+    public void setRGB(int r, int g, int b, LedDHelper api) {
         for (int i = 0; i < mStripes.size(); i++) {
             //mStripes.get(i).setRGB(r, g, b, api);
         }

app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java

@@ -22,8 +22,6 @@ import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -31,6 +29,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
 
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.textfield.TextInputLayout;
 import com.google.gson.Gson;
 import com.idlegandalf.ledd.ColorApplication;
 import com.idlegandalf.ledd.R;
@@ -39,31 +39,35 @@ import com.idlegandalf.ledd.components.Controller;
 import com.idlegandalf.ledd.components.LedDDaemon;
 import com.idlegandalf.ledd.helper.LedDHelper;
 
-import org.json.JSONException;
-
-import java.io.IOException;
 import java.text.NumberFormat;
 import java.text.ParsePosition;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 public class AddControllerDialog extends DialogFragment implements DialogInterface.OnShowListener {
 
-    @Bind(R.id.input_i2c_layout)
+    @BindView(R.id.input_i2c_layout)
     TextInputLayout i2cLayout;
-    @Bind(R.id.input_i2c)
+    @BindView(R.id.input_i2c)
     EditText i2cText;
-    @Bind(R.id.input_address_layout)
+    @BindView(R.id.input_address_layout)
     TextInputLayout addressLayout;
-    @Bind(R.id.input_address)
+    @BindView(R.id.input_address)
     EditText addressText;
-    @Bind(R.id.input_channel_layout)
+    @BindView(R.id.input_channel_layout)
     TextInputLayout channelLayout;
-    @Bind(R.id.input_channel)
+    @BindView(R.id.input_channel)
     EditText channelText;
     LedDDaemon dDaemon;
 
+    private static boolean isNumeric(String str) {
+        NumberFormat formatter = NumberFormat.getInstance();
+        ParsePosition pos = new ParsePosition(0);
+        formatter.parse(str, pos);
+        return str.length() == pos.getIndex();
+    }
+
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         View v = View.inflate(getActivity(), R.layout.fragment_addcontroller, null);
         ButterKnife.bind(this, v);
@@ -136,101 +140,60 @@ public class AddControllerDialog extends DialogFragment implements DialogInterfa
             }
         });
 
-        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
+        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> {
-            @Override
+            // TODO: AddStripeDialog.instance.onResume();
-            public void onClick(View v) {
+            alertDialog.dismiss();
-                AddStripeDialog.instance.onResume();
-                alertDialog.dismiss();
-            }
         });
 
-        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
-            @Override
+            if (i2cText.getText().toString().isEmpty() || !isNumeric(i2cText.getText().toString())) {
-            public void onClick(View v) {
+                i2cLayout.setError("No valid i2c device number");
-                if (i2cText.getText().toString().isEmpty() || !isNumeric(i2cText.getText().toString())) {
+                return;
-                    i2cLayout.setError("No valid i2c device number");
+            }
-                    return;
-                }
 
-                if (!addressText.getText().toString().contains("0x") || !addressText.getText().toString().split("x")[1].matches("-?[0-9a-fA-F]+")) {
+            if (!addressText.getText().toString().contains("0x") || !addressText.getText().toString().split("x")[1].matches("-?[0-9a-fA-F]+")) {
-                    addressLayout.setError("No valid hexdecimal address");
+                addressLayout.setError("No valid hexdecimal address");
-                    return;
+                return;
-                }
+            }
 
-                if (channelText.getText().toString().isEmpty() || !isNumeric(channelText.getText().toString()) && Integer.parseInt(channelText
+            if (channelText.getText().toString().isEmpty() || !isNumeric(channelText.getText().toString()) && Integer.parseInt(channelText
-                        .getText().toString()) <= 0) {
+                    .getText().toString()) <= 0) {
-                    channelLayout.setError("No valid channel amount");
+                channelLayout.setError("No valid channel amount");
-                    return;
+                return;
-                }
+            }
 
-                Controller c = new Controller();
+            Controller c = new Controller();
-                c.setAddress(addressText.getText().toString());
+            c.setAddress(addressText.getText().toString());
-                c.setI2c_device(Integer.parseInt(i2cText.getText().toString()));
+            c.setI2c_device(Integer.parseInt(i2cText.getText().toString()));
-                c.setChannels(Integer.parseInt(channelText.getText().toString()));
+            c.setChannels(Integer.parseInt(channelText.getText().toString()));
 
-                LedDHelper helper = null;
+            LedDHelper helper = ColorApplication.getInstance().getHelperForDaemon(dDaemon);
-                try {
-                    helper = ColorApplication.getInstance().getHelperForDaemon(dDaemon);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
 
-                if (helper != null) {
+            if (helper != null) {
-                    try {
+                helper.addController(c, new AddControllerCallback() {
-                        helper.addController(c, new AddControllerCallback() {
+                    @Override
-                            @Override
+                    public void onControllerAdded(final Controller controller) {
-                            public void onControllerAdded(final Controller controller) {
+                        getActivity().runOnUiThread(() -> Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content)).getChildAt(0), String.format(getActivity().getString(R.string.snachbar_added_controller), controller.getId()), Snackbar.LENGTH_LONG).show());
-                                getActivity().runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content))
-                                                .getChildAt(0), "Added Controller (" + controller.getId() + ")", Snackbar.LENGTH_LONG).show();
-                                    }
-                                });
 
-                                dDaemon.getControllers().add(controller);
+                        dDaemon.getControllers().add(controller);
-                                dismiss();
+                        dismiss();
-                            }
-
-                            @Override
-                            public void onAddFailed(final String msg, String detail) {
-                                getActivity().runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content))
-                                                .getChildAt(0), "Error: " + msg, Snackbar.LENGTH_LONG).show();
-                                    }
-                                });
-                                AddStripeDialog.instance.onResume();
-                                dismiss();
-                            }
-
-                            @Override
-                            public void onConnectionFailed(final String message) {
-                                getActivity().runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content))
-                                                .getChildAt(0), "Coudn't connect to" +
-                                                " daemon at " + dDaemon + ": " + message, Snackbar.LENGTH_LONG).show();
-                                    }
-                                });
-                                AddStripeDialog.instance.onResume();
-                                dismiss();
-                            }
-                        });
-                    } catch (JSONException | IOException e) {
-                        e.printStackTrace();
                     }
-                }
+
+                    @Override
+                    public void onAddFailed(final int code, final String msg) {
+                        getActivity().runOnUiThread(() -> Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content)).getChildAt(0), getActivity().getString(R.string.snackbar_error) + msg, Snackbar.LENGTH_LONG).show());
+                        // TODO: AddStripeDialog.instance.onResume();
+                        dismiss();
+                    }
+
+                    @Override
+                    public void onConnectionFailed(final String message) {
+                        getActivity().runOnUiThread(() -> Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content)).getChildAt(0), String.format(getActivity().getString(R.string.snackbar_daemon_connection_failed), dDaemon, message), Snackbar.LENGTH_LONG).show());
+                        // TODO: AddStripeDialog.instance.onResume();
+                        dismiss();
+                    }
+                });
             }
         });
     }
-
-    private static boolean isNumeric(String str) {
-        NumberFormat formatter = NumberFormat.getInstance();
-        ParsePosition pos = new ParsePosition(0);
-        formatter.parse(str, pos);
-        return str.length() == pos.getIndex();
-    }
 }

app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java

@@ -25,8 +25,6 @@ import android.content.DialogInterface;
 import android.net.nsd.NsdManager;
 import android.net.nsd.NsdServiceInfo;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -38,6 +36,8 @@ import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.textfield.TextInputLayout;
 import com.google.common.net.InetAddresses;
 import com.idlegandalf.ledd.ColorActivity;
 import com.idlegandalf.ledd.ColorApplication;
@@ -45,25 +45,22 @@ import com.idlegandalf.ledd.R;
 import com.idlegandalf.ledd.callbacks.DiscoverCallback;
 import com.idlegandalf.ledd.components.LedDDaemon;
 
-import org.json.JSONException;
-
-import java.io.IOException;
 import java.net.Inet4Address;
 import java.util.ArrayList;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 
 
 public class AddDaemonDialog extends DialogFragment implements DialogInterface.OnShowListener, NsdManager.DiscoveryListener {
 
     private final String SERVICE_TYPE = "_ledd._tcp.";
-    @Bind(R.id.input_ip)
+    @BindView(R.id.input_ip)
     EditText ip;
-    @Bind(R.id.input_ip_layout)
+    @BindView(R.id.input_ip_layout)
     TextInputLayout ip_lay;
-    @Bind(R.id.host_container)
+    @BindView(R.id.host_container)
     LinearLayout hostContainer;
     List<LedDDaemon> ledDDaemons = new ArrayList<>();
     NsdManager mNsdManager;
@@ -111,46 +108,40 @@ public class AddDaemonDialog extends DialogFragment implements DialogInterface.O
             }
         });
 
-        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
+        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> {
-            @Override
+            mNsdManager.stopServiceDiscovery(AddDaemonDialog.this);
-            public void onClick(View v) {
+            // TODO: AddStripeDialog.instance.onResume();
-                mNsdManager.stopServiceDiscovery(AddDaemonDialog.this);
+            alertDialog.dismiss();
-                AddStripeDialog.instance.onResume();
-                alertDialog.dismiss();
-            }
         });
 
-        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
-            @Override
+            String strIp = ip.getText().toString();
-            public void onClick(View v) {
+            int port;
-                String strIp = ip.getText().toString();
-                int port;
 
-                if (strIp.contains(":")) {
+            if (strIp.contains(":")) {
-                    strIp = strIp.split(":")[0];
+                strIp = strIp.split(":")[0];
-                    try {
+                try {
-                        port = Integer.parseInt(ip.getText().toString().split(":")[1]);
+                    port = Integer.parseInt(ip.getText().toString().split(":")[1]);
-                    } catch (NumberFormatException e) {
+                } catch (NumberFormatException e) {
-                        ip_lay.setError("Please check your port");
+                    ip_lay.setError("Please check your port");
-                        return;
+                    return;
-                    }
-
-                    if (port < 1024 || port > 65535) {
-                        ip_lay.setError("Port is out of range");
-                        return;
-                    }
-                } else {
-                    port = 1425;
                 }
 
-                if (InetAddresses.isInetAddress(strIp)) {
+                if (port < 1024 || port > 65535) {
-                    LedDDaemon daemon = new LedDDaemon(strIp, port);
+                    ip_lay.setError("Port is out of range");
-
+                    return;
-                    if (!ledDDaemons.contains(daemon)) addDaemon(new LedDDaemon(strIp, port));
-                    else ip_lay.setError("Daemon already exist");
-                } else {
-                    ip_lay.setError("No valid ip address");
                 }
+            } else {
+                port = 1425;
+            }
+
+            if (InetAddresses.isInetAddress(strIp)) {
+                LedDDaemon daemon = new LedDDaemon(strIp, port);
+
+                if (!ledDDaemons.contains(daemon)) addDaemon(new LedDDaemon(strIp, port));
+                else ip_lay.setError("Daemon already exist");
+            } else {
+                ip_lay.setError("No valid ip address");
             }
         });
     }
@@ -198,49 +189,43 @@ public class AddDaemonDialog extends DialogFragment implements DialogInterface.O
                         final LedDDaemon nLedDDaemon = new LedDDaemon(serviceInfo.getHost().getHostAddress(), serviceInfo.getPort());
 
                         if (!ledDDaemons.contains(nLedDDaemon)) {
-                            getActivity().runOnUiThread(new Runnable() {
+                            getActivity().runOnUiThread(() -> {
-                                @Override
+                                View v = ((LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(R.layout
-                                public void run() {
+                                        .host_row, hostContainer, false);
-                                    View v = ((LayoutInflater) getActivity().getSystemService(Context.LAYOUT_INFLATER_SERVICE)).inflate(R.layout
-                                            .host_row, hostContainer, false);
 
 
-                                    TextView host = (TextView) v.findViewById(R.id.text_host);
+                                TextView host = (TextView) v.findViewById(R.id.text_host);
 
-                                    host.setText(nLedDDaemon.toString());
+                                host.setText(nLedDDaemon.toString());
 
-                                    if (ColorApplication.getInstance().getDaemons().contains(nLedDDaemon)) {
+                                if (ColorApplication.getInstance().getDaemons().contains(nLedDDaemon)) {
-                                        v.setEnabled(false);
+                                    v.setEnabled(false);
-                                        host.setEnabled(false);
+                                    host.setEnabled(false);
-                                    }
-
-                                    View.OnClickListener listener = new View.OnClickListener() {
-                                        @Override
-                                        public void onClick(View v) {
-                                            if (v.isEnabled()) {
-                                                LedDDaemon d;
-
-                                                if (v instanceof TextView) {
-                                                    d = (LedDDaemon) ((LinearLayout) v.getParent()).getTag();
-                                                } else {
-                                                    d = (LedDDaemon) v.getTag();
-                                                }
-
-                                                if (d != null) {
-                                                    addDaemon(d);
-                                                }
-                                            }
-                                        }
-                                    };
-
-                                    v.setOnClickListener(listener);
-                                    host.setOnClickListener(listener);
-
-                                    v.setTag(nLedDDaemon);
-
-                                    ledDDaemons.add(nLedDDaemon);
-                                    hostContainer.addView(v);
                                 }
+
+                                View.OnClickListener listener = v1 -> {
+                                    if (v1.isEnabled()) {
+                                        LedDDaemon d;
+
+                                        if (v1 instanceof TextView) {
+                                            d = (LedDDaemon) ((LinearLayout) v1.getParent()).getTag();
+                                        } else {
+                                            d = (LedDDaemon) v1.getTag();
+                                        }
+
+                                        if (d != null) {
+                                            addDaemon(d);
+                                        }
+                                    }
+                                };
+
+                                v.setOnClickListener(listener);
+                                host.setOnClickListener(listener);
+
+                                v.setTag(nLedDDaemon);
+
+                                ledDDaemons.add(nLedDDaemon);
+                                hostContainer.addView(v);
                             });
                         }
                     }
@@ -286,44 +271,23 @@ public class AddDaemonDialog extends DialogFragment implements DialogInterface.O
     }
 
     private void addDaemon(final LedDDaemon ledDDaemon) {
-        try {
+        ColorApplication.getInstance().getHelperForDaemon(ledDDaemon).discover(new DiscoverCallback() {
-            ColorApplication.getInstance().getHelperForDaemon(ledDDaemon).discover(new DiscoverCallback() {
+            @Override
-                @Override
+            public void onConnectionFailed(final String message) {
-                public void onConnectionFailed(final String message) {
+                getActivity().runOnUiThread(() -> Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content)).getChildAt(0), String.format(getActivity().getString(R.string.snackbar_daemon_connection_failed), ledDDaemon, message), Snackbar.LENGTH_LONG).show());
-                    getActivity().runOnUiThread(new Runnable() {
+                // TODO: AddStripeDialog.instance.onResume();
-                        @Override
+                dismiss();
-                        public void run() {
+            }
-                            Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content)).getChildAt(0),
-                                    "Coudn't connect to" +
-                                            " daemon at " + ledDDaemon + ": " + message, Snackbar.LENGTH_LONG).show();
-                        }
-                    });
-                    AddStripeDialog stripeAdd = (AddStripeDialog) getFragmentManager().findFragmentByTag("stripeAdd");
-                    AddStripeDialog.instance.onResume();
-                    dismiss();
-                }
 
-                @Override
+            @Override
-                public void onDiscoverSuccessfully(final String version) {
+            public void onDiscoverSuccessfully(final String version) {
-                    getActivity().runOnUiThread(new Runnable() {
+                getActivity().runOnUiThread(() -> Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content)).getChildAt(0),
-                        @Override
+                        getActivity().getString(R.string.snackbar_added_daemon_version, version), Snackbar.LENGTH_LONG).show());
-                        public void run() {
-                            Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content)).getChildAt(0),
-                                    "Added LedD Daemon version: " + version, Snackbar.LENGTH_LONG).show();
-                        }
-                    });
 
-                    try {
+                ((ColorActivity) getActivity()).refreshStripes();
-                        ((ColorActivity) getActivity()).refreshStripes();
+                // TODO: AddStripeDialog.instance.onResume();
-                    } catch (IOException e) {
+                dismiss();
-                        e.printStackTrace();
+            }
-                    }
+        });
-                    AddStripeDialog.instance.onResume();
-                    dismiss();
-                }
-            });
-        } catch (JSONException | IOException e) {
-            e.printStackTrace();
-        }
     }
 }

app/src/main/java/com/idlegandalf/ledd/fragments/AddProfileDialog.java

@@ -0,0 +1,142 @@
+package com.idlegandalf.ledd.fragments;
+
+/*
+ * LEDD Project
+ * Copyright (C) 2015 LEDD Team
+ *
+ * This program 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.
+ *
+ * This program 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/>.
+ */
+
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.support.v7.app.AlertDialog;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
+import android.widget.EditText;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import com.google.android.material.textfield.TextInputLayout;
+import com.idlegandalf.ledd.ColorActivity;
+import com.idlegandalf.ledd.R;
+import com.idlegandalf.ledd.components.LedStripe;
+import com.idlegandalf.ledd.components.Profile;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+
+public class AddProfileDialog extends DialogFragment implements DialogInterface.OnShowListener {
+
+    @BindView(R.id.input_profile_name_layout)
+    TextInputLayout nameLayout;
+    @BindView(R.id.input_profile_name)
+    EditText nameText;
+    @BindView(R.id.container_linlay)
+    LinearLayout checkboxContainer;
+    List<LedStripe> mStripes;
+    List<CheckBox> mCheckboxes;
+
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        View v = View.inflate(getActivity(), R.layout.fragment_addprofile, null);
+        ButterKnife.bind(this, v);
+
+        mStripes = ((ColorActivity) getActivity()).getStripes();
+        mCheckboxes = new ArrayList<>();
+
+        if (mStripes != null) {
+            for (LedStripe ledStripe : mStripes) {
+                CheckBox nC = (CheckBox) View.inflate(getActivity(), R.layout.fragment_addprofile_item, null);
+
+                nC.setText(ledStripe.getName());
+                mCheckboxes.add(nC);
+                checkboxContainer.addView(nC);
+            }
+        }
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+        builder.setView(v).setPositiveButton("Save", null).setNegativeButton("Cancel", null);
+
+        AlertDialog dialog = builder.create();
+
+        dialog.setOnShowListener(this);
+
+        return dialog;
+    }
+
+    @Override
+    public void onShow(final DialogInterface dialog) {
+
+        final AlertDialog alertDialog = (AlertDialog) dialog;
+
+        nameText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+                nameLayout.setError(null);
+            }
+        });
+
+        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> alertDialog.dismiss());
+
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
+            if (nameText.getText().toString().isEmpty()) {
+                nameLayout.setError("Please enter a name");
+                return;
+            }
+
+            int checked = 0;
+            for (CheckBox c : mCheckboxes) {
+                if (c.isChecked()) {
+                    checked++;
+                    mStripes.get(checkboxContainer.indexOfChild(c)).getColor();
+                }
+            }
+
+            if (checked < 2) {
+                Toast.makeText(getActivity(), "Please select at least two stripes for your profile", Toast.LENGTH_LONG).show();
+                return;
+            }
+
+            Profile profile = new Profile(nameText.getText().toString());
+
+            mCheckboxes.stream().filter(CompoundButton::isChecked).forEach(c -> {
+                LedStripe stripe = mStripes.get(checkboxContainer.indexOfChild(c));
+                profile.getValues().append(stripe.getId(), stripe.getColor());
+            });
+
+            ((ColorActivity) getActivity()).addProfile(profile);
+            Toast.makeText(getActivity(), "Added profile " + nameText.getText().toString(), Toast.LENGTH_SHORT).show();
+            dismiss();
+        });
+    }
+}
+

app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java

@@ -23,8 +23,6 @@ import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.design.widget.TextInputLayout;
 import android.support.v7.app.AlertDialog;
 import android.text.Editable;
 import android.text.TextWatcher;
@@ -39,6 +37,8 @@ import android.widget.RelativeLayout;
 import android.widget.Spinner;
 import android.widget.Toast;
 
+import com.google.android.material.snackbar.Snackbar;
+import com.google.android.material.textfield.TextInputLayout;
 import com.google.gson.Gson;
 import com.idlegandalf.ledd.ColorActivity;
 import com.idlegandalf.ledd.ColorApplication;
@@ -50,49 +50,45 @@ import com.idlegandalf.ledd.components.LedDDaemon;
 import com.idlegandalf.ledd.components.LedStripe;
 import com.idlegandalf.ledd.helper.LedDHelper;
 
-import org.json.JSONException;
-
-import java.io.IOException;
 import java.text.NumberFormat;
 import java.text.ParsePosition;
 import java.util.List;
 
-import butterknife.Bind;
+import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 
 public class AddStripeDialog extends DialogFragment implements DialogInterface.OnShowListener {
 
-    public static AddStripeDialog instance;
+    @BindView(R.id.spinner_daemon)
-    @Bind(R.id.spinner_daemon)
     Spinner daemonSpinner;
-    @Bind(R.id.spinner_controller)
+    @BindView(R.id.spinner_controller)
     Spinner controllerSpinner;
-    @Bind(R.id.choose_controller_lay)
+    @BindView(R.id.choose_controller_lay)
     RelativeLayout controllerLayout;
-    @Bind(R.id.input_stripe_name_lay)
+    @BindView(R.id.input_stripe_name_lay)
     TextInputLayout stripeNameLay;
-    @Bind(R.id.input_stripe_name)
+    @BindView(R.id.input_stripe_name)
     EditText stripeNameText;
-    @Bind(R.id.input_channel_r_lay)
+    @BindView(R.id.input_channel_r_lay)
     TextInputLayout channelRLay;
-    @Bind(R.id.input_channel_r)
+    @BindView(R.id.input_channel_r)
     EditText channelR;
-    @Bind(R.id.input_channel_g_lay)
+    @BindView(R.id.input_channel_g_lay)
     TextInputLayout channelGLay;
-    @Bind(R.id.input_channel_g)
+    @BindView(R.id.input_channel_g)
     EditText channelG;
-    @Bind(R.id.input_channel_b_lay)
+    @BindView(R.id.input_channel_b_lay)
     TextInputLayout channelBLay;
-    @Bind(R.id.input_channel_b)
+    @BindView(R.id.input_channel_b)
     EditText channelB;
-    @Bind(R.id.stripe_mapping_lay)
+    @BindView(R.id.stripe_mapping_lay)
     LinearLayout stripeMapping;
-    @Bind(R.id.imgbuttn_togglechannel_r)
+    @BindView(R.id.imgbuttn_togglechannel_r)
     ImageButton channelRBttn;
-    @Bind(R.id.imgbuttn_togglechannel_g)
+    @BindView(R.id.imgbuttn_togglechannel_g)
     ImageButton channelGBttn;
-    @Bind(R.id.imgbuttn_togglechannel_b)
+    @BindView(R.id.imgbuttn_togglechannel_b)
     ImageButton channelBBttn;
     ArrayAdapter<LedDDaemon> daemonArrayAdapter;
     ArrayAdapter<Controller> controllerArrayAdapter;
@@ -109,7 +105,6 @@ public class AddStripeDialog extends DialogFragment implements DialogInterface.O
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         View v = View.inflate(getActivity(), R.layout.fragment_addstripe, null);
         ButterKnife.bind(this, v);
-        instance = this;
 
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         builder.setView(v).setPositiveButton("Add", null).setNegativeButton("Cancel", null);
@@ -208,20 +203,17 @@ public class AddStripeDialog extends DialogFragment implements DialogInterface.O
             }
         });
 
-        ImageButton.OnClickListener imgListener = new View.OnClickListener() {
+        ImageButton.OnClickListener imgListener = v -> {
-            @Override
+            switch (v.getId()) {
-            public void onClick(View v) {
+                case R.id.imgbuttn_togglechannel_r:
-                switch (v.getId()) {
+                    testChannel(channelR, (ImageButton) v);
-                    case R.id.imgbuttn_togglechannel_r:
+                    break;
-                        testChannel(channelR, (ImageButton) v);
+                case R.id.imgbuttn_togglechannel_g:
-                        break;
+                    testChannel(channelG, (ImageButton) v);
-                    case R.id.imgbuttn_togglechannel_g:
+                    break;
-                        testChannel(channelG, (ImageButton) v);
+                case R.id.imgbuttn_togglechannel_b:
-                        break;
+                    testChannel(channelB, (ImageButton) v);
-                    case R.id.imgbuttn_togglechannel_b:
+                    break;
-                        testChannel(channelB, (ImageButton) v);
-                        break;
-                }
             }
         };
 
@@ -229,81 +221,53 @@ public class AddStripeDialog extends DialogFragment implements DialogInterface.O
         channelGBttn.setOnClickListener(imgListener);
         channelBBttn.setOnClickListener(imgListener);
 
-        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(new View.OnClickListener() {
+        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> alertDialog.dismiss());
-            @Override
+
-            public void onClick(View v) {
+        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(v -> {
-                alertDialog.dismiss();
+            if (!mDaemonSelected) {
+                Toast.makeText(getActivity(), "Please select Daemon and Controller", Toast.LENGTH_LONG).show();
+                return;
             }
-        });
 
-        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener(new View.OnClickListener() {
+            if (stripeNameText.getText().toString().isEmpty()) {
-            @Override
+                stripeNameLay.setError("Please set the Stripe name");
-            public void onClick(View v) {
+                return;
-                if (!mDaemonSelected) {
+            }
-                    Toast.makeText(getActivity(), "Please select Daemon and Controller", Toast.LENGTH_LONG).show();
-                    return;
-                }
 
-                if (stripeNameText.getText().toString().isEmpty()) {
+            if (channelR.getText().toString().isEmpty() || channelG.getText().toString().isEmpty() || channelB.getText().toString().isEmpty()) {
-                    stripeNameLay.setError("Please set the Stripe name");
+                Toast.makeText(getActivity(), "Please add mapping for all channels", Toast.LENGTH_LONG).show();
-                    return;
+                return;
-                }
+            }
 
-                if (channelR.getText().toString().isEmpty() || channelG.getText().toString().isEmpty() || channelB.getText().toString().isEmpty()) {
+            LedStripe stripe = new LedStripe(Integer.parseInt(channelR.getText().toString()), Integer.parseInt(channelG.getText().toString()),
-                    Toast.makeText(getActivity(), "Please add mapping for all channels", Toast.LENGTH_LONG).show();
+                    Integer.parseInt(channelB.getText().toString()), stripeNameText.getText().toString());
-                    return;
+            stripe.setLedDDaemon((LedDDaemon) daemonSpinner.getSelectedItem());
-                }
+            stripe.setController((Controller) controllerSpinner.getSelectedItem());
 
-                LedStripe stripe = new LedStripe(Integer.parseInt(channelR.getText().toString()), Integer.parseInt(channelG.getText().toString()),
+            LedDHelper helper = ColorApplication.getInstance().getHelperForDaemon((LedDDaemon) daemonSpinner.getSelectedItem());
-                        Integer.parseInt(channelB.getText().toString()), stripeNameText.getText().toString());
-                stripe.setLedDDaemon((LedDDaemon) daemonSpinner.getSelectedItem());
-                stripe.setController((Controller) controllerSpinner.getSelectedItem());
 
-                LedDHelper helper = null;
+            if (helper != null) {
-                try {
+                helper.addStripe(stripe, new AddStripeCallback() {
-                    helper = ColorApplication.getInstance().getHelperForDaemon((LedDDaemon) daemonSpinner.getSelectedItem());
+                    @Override
-                } catch (IOException e) {
+                    public void onAddSuccessfully(final LedStripe stripe) {
-                    e.printStackTrace();
+                        ColorActivity activity = ((ColorActivity) getActivity());
-                }
+                        activity.refreshStripes();
 
-                if (helper != null) {
+                        getActivity().runOnUiThread(() -> Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content)).getChildAt(0), String.format(getActivity().getString(R.string.snackbar_added_stripe_id), stripe.getId()), Snackbar.LENGTH_LONG).show());
-                    try {
+                        dismiss();
-                        helper.addStripe(stripe, new AddStripeCallback() {
-                            @Override
-                            public void onAddSuccessfully(final LedStripe stripe) {
-                                ColorActivity activity = ((ColorActivity) getActivity());
-                                try {
-                                    activity.refreshStripes();
-                                } catch (IOException e) {
-                                    e.printStackTrace();
-                                }
-
-                                getActivity().runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content))
-                                                .getChildAt(0), "Added stripe (" + stripe.getId() + ")", Snackbar.LENGTH_LONG).show();
-                                    }
-                                });
-                                dismiss();
-                            }
-
-                            @Override
-                            public void onConnectionFailed(final String message) {
-                                getActivity().runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content))
-                                                .getChildAt(0), "Failed to add stripe: " + message, Snackbar.LENGTH_LONG).show();
-                                    }
-                                });
-                                dismiss();
-                            }
-                        });
-                    } catch (JSONException | IOException e) {
-                        e.printStackTrace();
                     }
-                }
+
+                    @Override
+                    public void onAddFailed(int code, String msg) {
+
+                    }
+
+                    @Override
+                    public void onConnectionFailed(final String message) {
+                        getActivity().runOnUiThread(() -> Snackbar.make(((ViewGroup) getActivity().getWindow().getDecorView().findViewById(android.R.id.content)).getChildAt(0), getActivity().getString(R.string.snackbar_failed_add_stripe) + message, Snackbar.LENGTH_LONG).show());
+                        dismiss();
+                    }
+                });
             }
         });
 
@@ -371,14 +335,17 @@ public class AddStripeDialog extends DialogFragment implements DialogInterface.O
     public void onResume() {
         super.onResume();
         ColorApplication.getInstance().onResume();
-        if (daemonArrayAdapter != null) {
-            daemonArrayAdapter.clear();
-            daemonArrayAdapter.addAll(ColorApplication.getInstance().getDaemons());
-        }
 
-        if (controllerArrayAdapter != null && mDaemonSelected) {
+        getActivity().runOnUiThread(() -> {
-            refreshController((LedDDaemon) daemonSpinner.getSelectedItem());
+            if (daemonArrayAdapter != null) {
-        }
+                daemonArrayAdapter.clear();
+                daemonArrayAdapter.addAll(ColorApplication.getInstance().getDaemons());
+            }
+
+            if (controllerArrayAdapter != null && mDaemonSelected) {
+                refreshController((LedDDaemon) daemonSpinner.getSelectedItem());
+            }
+        });
     }
 
     private void testChannel(EditText text, ImageButton button) {
@@ -398,19 +365,11 @@ public class AddStripeDialog extends DialogFragment implements DialogInterface.O
                 }
                 text.setTag(toggle);
 
-                LedDHelper helper = null;
+                LedDHelper helper = ColorApplication.getInstance().getHelperForDaemon((LedDDaemon) daemonSpinner.getSelectedItem());
-                try {
+
-                    helper = ColorApplication.getInstance().getHelperForDaemon((LedDDaemon) daemonSpinner.getSelectedItem());
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
 
                 if (helper != null) {
-                    try {
+                    helper.testChannel((Controller) controllerSpinner.getSelectedItem(), Integer.parseInt(text.getText().toString()), val);
-                        helper.testChannel((Controller) controllerSpinner.getSelectedItem(), Integer.parseInt(text.getText().toString()), val);
-                    } catch (JSONException e) {
-                        e.printStackTrace();
-                    }
                 }
             }
         }
@@ -418,40 +377,28 @@ public class AddStripeDialog extends DialogFragment implements DialogInterface.O
 
     private void refreshController(final LedDDaemon ledDDaemon) {
         controllerArrayAdapter.clear();
-        LedDHelper helper = null;
+        LedDHelper helper = ColorApplication.getInstance().getHelperForDaemon(ledDDaemon);
-        try {
-            helper = ColorApplication.getInstance().getHelperForDaemon(ledDDaemon);
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
 
         if (helper != null) {
-            try {
+            helper.getStripes(new StripesCallback() {
-                helper.getStripes(new StripesCallback() {
+                @Override
-                    @Override
+                public void onSuccess(List<LedStripe> stripes) {
-                    public void onSuccess(List<LedStripe> stripes) {
+                    getActivity().runOnUiThread(() -> {
-                        getActivity().runOnUiThread(new Runnable() {
+                        controllerArrayAdapter.addAll(ledDDaemon.getControllers());
-                            @Override
+                        toggleAll(stripeMapping, true);
-                            public void run() {
+                    });
-                                controllerArrayAdapter.addAll(ledDDaemon.getControllers());
+                }
-                                toggleAll(stripeMapping, true);
-                            }
-                        });
-                    }
 
-                    @Override
+                @Override
-                    public void onGetFailed(String message) {
+                public void onGetFailed(int code, String message) {
 
-                    }
+                }
 
-                    @Override
+                @Override
-                    public void onConnectionFailed(String message) {
+                public void onConnectionFailed(String message) {
 
-                    }
+                }
-                });
+            });
-            } catch (JSONException | IOException e) {
-                e.printStackTrace();
-            }
         }
     }
 }

app/src/main/java/com/idlegandalf/ledd/helper/LedDHelper.java

@@ -23,13 +23,11 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.os.IBinder;
-import android.util.Log;
 
-import com.idlegandalf.ledd.ColorApplication;
 import com.idlegandalf.ledd.callbacks.AddControllerCallback;
 import com.idlegandalf.ledd.callbacks.AddStripeCallback;
 import com.idlegandalf.ledd.callbacks.DiscoverCallback;
-import com.idlegandalf.ledd.callbacks.RecieveColorCallback;
+import com.idlegandalf.ledd.callbacks.ReceiveColorCallback;
 import com.idlegandalf.ledd.callbacks.StripesCallback;
 import com.idlegandalf.ledd.components.AnswerTask;
 import com.idlegandalf.ledd.components.Controller;
@@ -38,22 +36,29 @@ import com.idlegandalf.ledd.components.LedDDaemon;
 import com.idlegandalf.ledd.components.LedDRequest;
 import com.idlegandalf.ledd.components.LedStripe;
 import com.idlegandalf.ledd.services.ColorService;
+import com.thetransactioncompany.jsonrpc2.JSONRPC2Error;
+import com.thetransactioncompany.jsonrpc2.JSONRPC2Request;
+import com.thetransactioncompany.jsonrpc2.JSONRPC2Response;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.IOException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.UUID;
 import java.util.concurrent.LinkedBlockingQueue;
 
+import timber.log.Timber;
+
 public class LedDHelper {
     final String ACTION_SETCOLOR = "set_color";
     final String ACTION_GETCOLOR = "get_color";
     final String ACTION_ADDCONTROLLER = "add_controller";
     final String ACTION_GETALLSTRIPES = "get_stripes";
-    final String ACTION_ADDSTRIPES = "add_stripe";
+    final String ACTION_ADDSTRIPE = "add_stripe";
     final String ACTION_TESTCHANNEL = "test_channel";
     final String ACTION_DISCOVER = "discover";
     private Context context;
@@ -65,7 +70,7 @@ public class LedDHelper {
 
         @Override
         public void onServiceConnected(ComponentName className, IBinder service) {
-            Log.d(ColorApplication.TAG, "ColorService bound!");
+            Timber.d("ColorService bound!");
             requestWorker = new Worker<>(dRequests, (ColorService.ColorBinder) service, ledDDaemon);
             mBound = true;
             new Thread(requestWorker).start();
@@ -78,7 +83,7 @@ public class LedDHelper {
         }
     };
 
-    public LedDHelper(LedDDaemon ledDDaemon, Context appl) throws IOException {
+    public LedDHelper(LedDDaemon ledDDaemon, Context appl) {
         this.context = appl;
         this.dRequests = new LinkedBlockingQueue<>();
         this.ledDDaemon = ledDDaemon;
@@ -91,34 +96,35 @@ public class LedDHelper {
      * Add controller to ledd daemon
      *
      * @param c controller object
-     * @throws JSONException no valid json
-     * @throws IOException   socket error
      */
-    public void addController(final Controller c, final AddControllerCallback callback) throws JSONException, IOException {
+    public void addController(final Controller c, final AddControllerCallback callback) {
-        JSONObject jnson = new JSONObject();
+        Map<String, Object> params = new HashMap<>();
 
-        jnson.put("action", ACTION_ADDCONTROLLER);
+        params.put("channels", c.getChannels());
-        jnson.put("channels", c.getChannels());
+        params.put("i2c_dev", c.getI2c_device());
-        jnson.put("i2c_dev", c.getI2c_device());
+        params.put("address", c.getAddress());
-        jnson.put("address", c.getAddress());
 
-        addRequestToQueue(jnson, new AnswerTask() {
+        JSONRPC2Request request = new JSONRPC2Request(ACTION_ADDCONTROLLER, params, UUID.randomUUID().toString());
+
+        addRequestToQueue(request, new AnswerTask() {
             @Override
             public void onConnectionFailed(String message) {
-                callback.onAddFailed(message, "");
+                callback.onConnectionFailed(message);
             }
 
             @Override
-            public void onResponse(JSONObject response) {
+            public void onResponse(JSONRPC2Response response) {
-                try {
+                if (response.indicatesSuccess()) {
-                    if (response.getBoolean("success")) {
+                    try {
-                        c.setId(response.getInt("cid"));
+                        JSONObject json = new JSONObject(response.getResult().toString());
+                        c.setId(json.getInt("cid"));
                         callback.onControllerAdded(c);
-                    } else {
+                    } catch (JSONException e) {
-                        callback.onAddFailed(response.getString("message"), response.getString("message_detail"));
+                        e.printStackTrace();
                     }
-                } catch (Exception e) {
+                } else {
-                    e.printStackTrace();
+                    @SuppressWarnings("ThrowableResultOfMethodCallIgnored") JSONRPC2Error error = response.getError();
+                    callback.onAddFailed(error.getCode(), error.getMessage());
                 }
             }
         });
@@ -126,28 +132,22 @@ public class LedDHelper {
 
     /**
      * Get stripes known to daemon
-     *
-     * @throws JSONException no valid json
-     * @throws IOException   socket error
      */
-    public void getStripes(final StripesCallback callback) throws JSONException, IOException {
+    public void getStripes(final StripesCallback callback) {
-        JSONObject jnson = new JSONObject();
+        addRequestToQueue(new JSONRPC2Request(ACTION_GETALLSTRIPES, UUID.randomUUID().toString()), new AnswerTask() {
-
-        jnson.put("action", ACTION_GETALLSTRIPES);
-
-        addRequestToQueue(jnson, new AnswerTask() {
             @Override
             public void onConnectionFailed(String message) {
-                callback.onGetFailed(message);
+                callback.onConnectionFailed(message);
             }
 
             @Override
-            public void onResponse(JSONObject response) {
+            public void onResponse(JSONRPC2Response response) {
                 try {
-                    if (response.getBoolean("success")) {
+                    if (response.indicatesSuccess()) {
                         ledDDaemon.getControllers().clear();
                         List<LedStripe> list = new ArrayList<>();
-                        JSONArray jcontrollers = response.getJSONArray("controller");
+                        JSONObject json = new JSONObject(response.getResult().toString());
+                        JSONArray jcontrollers = json.getJSONArray("controller");
 
                         for (int i = 0; i < jcontrollers.length(); i++) {
                             JSONObject row = jcontrollers.getJSONObject(i);
@@ -178,8 +178,8 @@ public class LedDHelper {
 
                         callback.onSuccess(list);
                     } else {
-                        if (response.has("message")) callback.onGetFailed(response.getString("message"));
+                        @SuppressWarnings("ThrowableResultOfMethodCallIgnored") JSONRPC2Error error = response.getError();
-                        else callback.onGetFailed("unknown error");
+                        callback.onGetFailed(error.getCode(), error.getMessage());
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -194,59 +194,56 @@ public class LedDHelper {
      * @param ledStripe Stripe
      */
     public void setColor(LedStripe ledStripe) {
+        Map<String, Object> hsv = new HashMap<>();
 
-        JSONObject jnson = new JSONObject();
+        hsv.put("h", ledStripe.getColor().getHue());
-        JSONObject hsv = new JSONObject();
+        hsv.put("s", ledStripe.getColor().getSaturation());
+        hsv.put("v", ledStripe.getColor().getValue());
 
-        try {
+        Map<String, Object> params = new HashMap<>();
-            hsv.put("h", ledStripe.getColor().getHue());
+        params.put("sid", ledStripe.getId());
-            hsv.put("s", ledStripe.getColor().getSaturation());
+        params.put("hsv", hsv);
-
-            hsv.put("v", ledStripe.getColor().getValue());
 
 
-            jnson.put("action", ACTION_SETCOLOR);
+        JSONRPC2Request request = new JSONRPC2Request(ACTION_SETCOLOR, params, UUID.randomUUID().toString());
-            jnson.put("sid", ledStripe.getId());
-            jnson.put("hsv", hsv);
 
-        } catch (JSONException e) {
+        addRequestToQueue(request, null);
-            e.printStackTrace();
-        }
-
-        addRequestToQueue(jnson, null);
     }
 
     /**
      * Get color using the stripeid
      *
      * @param ledStripe Stripe
-     * @throws JSONException no valid json
-     * @throws IOException   socket error
      */
-    public void getColor(final LedStripe ledStripe, final RecieveColorCallback callback) throws JSONException, IOException {
+    public void getColor(final LedStripe ledStripe, final ReceiveColorCallback callback) {
-        JSONObject jnson = new JSONObject();
+        HashMap<String, Object> params = new HashMap<>();
+        params.put("sid", ledStripe.getId());
 
-        jnson.put("action", ACTION_GETCOLOR);
+        addRequestToQueue(new JSONRPC2Request(ACTION_GETCOLOR, params, UUID.randomUUID().toString()), new AnswerTask() {
-        jnson.put("sid", ledStripe.getId());
-
-        addRequestToQueue(jnson, new AnswerTask() {
             @Override
             public void onConnectionFailed(String message) {
-                callback.onRecievFailed(message);
+                callback.onConnectionFailed(message);
             }
 
             @Override
-            public void onResponse(JSONObject response) {
+            public void onResponse(JSONRPC2Response response) {
-                try {
+                if (response.indicatesSuccess()) {
-                    if (response.getBoolean("success")) {
+                    try {
-                        JSONArray hsv = response.getJSONArray("color");
+                        JSONObject json = new JSONObject(response.getResult().toString());
-                        ledStripe.setColor(new HSV(hsv.getDouble(0), hsv.getDouble(1), hsv.getDouble(2)));
+                        JSONArray hsv = json.getJSONArray("color");
-                        callback.onColorRecieved(ledStripe);
+                        if (hsv.length() == 3) {
-                    } else {
+                            ledStripe.setColor(new HSV(hsv.getDouble(0), hsv.getDouble(1), hsv.getDouble(2)));
-                        callback.onRecievFailed(response.getString("message"));
+                            callback.onColorReceived(ledStripe);
+                        } else {
+                            callback.onReceiveFailed(-1, "HSV was empty");
+                        }
+                    } catch (JSONException e) {
+                        e.printStackTrace();
+                        callback.onReceiveFailed(-1, "Unhandeled JSON Exception");
                     }
-                } catch (Exception e) {
+                } else {
-                    e.printStackTrace();
+                    @SuppressWarnings("ThrowableResultOfMethodCallIgnored") JSONRPC2Error error = response.getError();
+                    callback.onReceiveFailed(error.getCode(), error.getMessage());
                 }
             }
         });
@@ -258,24 +255,22 @@ public class LedDHelper {
      * @param c       controller
      * @param channel channel number
      * @param value   value (1= on, 0 = off)
-     * @throws JSONException
      */
-    public void testChannel(Controller c, int channel, int value) throws JSONException {
+    public void testChannel(Controller c, int channel, int value) {
-        JSONObject jnson = new JSONObject();
+        HashMap<String, Object> params = new HashMap<>();
 
-        jnson.put("action", ACTION_TESTCHANNEL);
+        params.put("cid", c.getId());
-        jnson.put("cid", c.getId());
+        params.put("channel", channel);
-        jnson.put("channel", channel);
+        params.put("value", value);
-        jnson.put("value", value);
 
-        addRequestToQueue(jnson, new AnswerTask() {
+        addRequestToQueue(new JSONRPC2Request(ACTION_TESTCHANNEL, params, UUID.randomUUID().toString()), new AnswerTask() {
             @Override
             public void onConnectionFailed(String message) {
 
             }
 
             @Override
-            public void onResponse(JSONObject response) {
+            public void onResponse(JSONRPC2Response response) {
 
             }
         });
@@ -283,26 +278,20 @@ public class LedDHelper {
 
     /**
      * Get information about an ledd daemon
-     *
-     * @throws JSONException no valid json
-     * @throws IOException   socket error
      */
-    public void discover(final DiscoverCallback callback) throws JSONException, IOException {
+    public void discover(final DiscoverCallback callback) {
-        JSONObject jnson = new JSONObject();
+        addRequestToQueue(new JSONRPC2Request(ACTION_DISCOVER, UUID.randomUUID().toString()), new AnswerTask() {
-
-        jnson.put("action", ACTION_DISCOVER);
-
-        addRequestToQueue(jnson, new AnswerTask() {
             @Override
             public void onConnectionFailed(String message) {
                 callback.onConnectionFailed(message);
             }
 
             @Override
-            public void onResponse(JSONObject response) {
+            public void onResponse(JSONRPC2Response response) {
                 try {
-                    if (response.getBoolean("success")) {
+                    if (response.indicatesSuccess()) {
-                        callback.onDiscoverSuccessfully(response.getString("version"));
+                        JSONObject json = new JSONObject(response.getResult().toString());
+                        callback.onDiscoverSuccessfully(json.getString("version"));
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -313,39 +302,36 @@ public class LedDHelper {
 
     /**
      * Get information about an ledd daemon
-     *
-     * @throws JSONException no valid json
-     * @throws IOException   socket error
      */
-    public void addStripe(final LedStripe ledStripe, final AddStripeCallback callback) throws JSONException, IOException {
+    public void addStripe(final LedStripe ledStripe, final AddStripeCallback callback) {
-        JSONObject jnson = new JSONObject();
+        HashMap<String, Object> params = new HashMap<>();
+        HashMap<String, Object> mapping = new HashMap<>();
 
-        jnson.put("action", ACTION_ADDSTRIPES);
+        params.put("name", ledStripe.getName());
-        JSONObject stripe = new JSONObject();
+        params.put("rgb", ledStripe.isRGB());
 
-        stripe.put("name", ledStripe.getName());
-        stripe.put("rgb", ledStripe.isRGB());
-
-        JSONObject mapping = new JSONObject();
         mapping.put("r", ledStripe.getChannelRed());
         mapping.put("g", ledStripe.getChannelGreen());
         mapping.put("b", ledStripe.getChannelBlue());
-        stripe.put("map", mapping);
+        params.put("map", mapping);
-        stripe.put("cid", ledStripe.getController().getId());
+        params.put("cid", ledStripe.getController().getId());
-        jnson.put("stripe", stripe);
 
-        addRequestToQueue(jnson, new AnswerTask() {
+        addRequestToQueue(new JSONRPC2Request(ACTION_ADDSTRIPE, params, UUID.randomUUID().toString()), new AnswerTask() {
             @Override
             public void onConnectionFailed(String message) {
                 callback.onConnectionFailed(message);
             }
 
             @Override
-            public void onResponse(JSONObject response) {
+            public void onResponse(JSONRPC2Response response) {
                 try {
-                    if (response.getBoolean("success")) {
+                    if (response.indicatesSuccess()) {
-                        ledStripe.setId(response.getInt("sid"));
+                        JSONObject json = new JSONObject(response.getResult().toString());
+                        ledStripe.setId(json.getInt("sid"));
                         callback.onAddSuccessfully(ledStripe);
+                    } else {
+                        @SuppressWarnings("ThrowableResultOfMethodCallIgnored") JSONRPC2Error error = response.getError();
+                        callback.onAddFailed(error.getCode(), error.getMessage());
                     }
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -354,8 +340,8 @@ public class LedDHelper {
         });
     }
 
-    private void addRequestToQueue(JSONObject json, AnswerTask task) {
+    private void addRequestToQueue(JSONRPC2Request request, AnswerTask task) {
-        dRequests.add(new LedDRequest(json, task));
+        if (request != null) dRequests.add(new LedDRequest(request, task));
     }
 
     public void teardown() {
@@ -389,8 +375,6 @@ public class LedDHelper {
                 } catch (InterruptedException ex) {
                     Thread.currentThread().interrupt();
                     break;
-                } catch (JSONException e) {
-                    e.printStackTrace();
                 }
             }
         }

app/src/main/java/com/idlegandalf/ledd/services/ColorService.java

@@ -31,11 +31,12 @@ import com.koushikdutta.async.AsyncSocket;
 import com.koushikdutta.async.ByteBufferList;
 import com.koushikdutta.async.DataEmitter;
 import com.koushikdutta.async.Util;
-import com.koushikdutta.async.callback.ConnectCallback;
 import com.koushikdutta.async.callback.DataCallback;
+import com.thetransactioncompany.jsonrpc2.JSONRPC2ParseException;
+import com.thetransactioncompany.jsonrpc2.JSONRPC2Request;
+import com.thetransactioncompany.jsonrpc2.JSONRPC2Response;
 
 import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.io.UnsupportedEncodingException;
 import java.net.InetSocketAddress;
@@ -53,7 +54,7 @@ public class ColorService extends Service {
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
-        return -1;
+        return Service.START_STICKY;
     }
 
     @Override
@@ -65,11 +66,6 @@ public class ColorService extends Service {
         return mBinder;
     }
 
-    @Override
-    public boolean onUnbind(Intent intent) {
-        return super.onUnbind(intent);
-    }
-
     @Override
     public void onDestroy() {
         worker.stop();
@@ -85,24 +81,24 @@ public class ColorService extends Service {
         DataCallback dataCallback = new DataCallback() {
             @Override
             public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) {
-                JSONObject resp = null;
+                JSONRPC2Response reqIn = null;
-                try {
+                String dataStr = new String(bb.getAllByteArray());
-                    resp = new JSONObject(new String(bb.getAllByteArray()));
+
-                } catch (JSONException e) {
+                if (!dataStr.isEmpty()) {
-                    e.printStackTrace();
+                    try {
+                        reqIn = JSONRPC2Response.parse(dataStr);
+                    } catch (JSONRPC2ParseException e) {
+                        e.printStackTrace();
+                    }
                 }
 
-                if (resp != null) {
+                if (reqIn != null) {
-                    try {
+                    if (sendableHashMap.containsKey(reqIn.getID().toString())) {
-                        if (sendableHashMap.containsKey(resp.getString("ref"))) {
+                        sendableHashMap.get(reqIn.getID().toString()).onResponse(reqIn);
-                            sendableHashMap.get(resp.getString("ref")).onResponse(resp);
+                        sendableHashMap.remove(reqIn.getID().toString());
-                            sendableHashMap.remove(resp.getString("ref"));
+                        if (timeoutHashMap.containsKey(reqIn.getID().toString()) && timeoutHashMap.get(reqIn.getID().toString()) != null)
-                            if (timeoutHashMap.containsKey(resp.getString("ref")) && timeoutHashMap.get(resp.getString("ref")) != null)
+                            timeoutHashMap.get(reqIn.getID().toString()).cancel(false);
-                                timeoutHashMap.get(resp.getString("ref")).cancel(false);
+                        timeoutHashMap.remove(reqIn.getID().toString());
-                            timeoutHashMap.remove(resp.getString("ref"));
-                        }
-                    } catch (JSONException e) {
-                        e.printStackTrace();
                     }
                 }
             }
@@ -122,39 +118,43 @@ public class ColorService extends Service {
                     final T item = workQueue.take();
 
                     if (item instanceof Sendable) {
-                        if (socketHashMap.containsKey(((Sendable) item).getRecipient()) && socketHashMap.get(((Sendable) item).getRecipient())
+                        final Sendable sendable = (Sendable) item;
-                                .getServer().isRunning()) {
+                        if (socketHashMap.containsKey(sendable.getRecipient())) {
+                            if (socketHashMap.get(sendable.getRecipient()) == null) {
+                                // if server is not running yet, readd item to queue
+                                workQueue.add(item);
+                                continue;
+                            } else if (!socketHashMap.get(sendable.getRecipient()).getServer().isRunning()) {
+                                // connection probably closed or was interrupted -> reconnect
+                                socketHashMap.remove(sendable.getRecipient());
+                                workQueue.add(item);
+                                continue;
+                            }
 
-                            Util.writeAll(socketHashMap.get(((Sendable) item).getRecipient()), (((Sendable) item).getMessage().toString() + "\n")
+                            Util.writeAll(socketHashMap.get(sendable.getRecipient()), (sendable.getRequest().toString() + "\n").getBytes("UTF-8"),
-                                    .getBytes
+                                    null);
-                                    ("UTF-8"), null);
+                            sendableHashMap.put((String) sendable.getRequest().getID(), sendable);
-                            sendableHashMap.put(((Sendable) item).getRef(), (Sendable) item);
                             if (!poolExecutor.isTerminating() && !poolExecutor.isTerminated())
-                                timeoutHashMap.put(((Sendable) item).getRef(), poolExecutor.schedule(new Runnable() {
+                                timeoutHashMap.put((String) sendable.getRequest().getID(), poolExecutor.schedule(() -> {
-                                    @Override
+                                    sendable.onNoResponse();
-                                    public void run() {
+                                    timeoutHashMap.remove(sendable.getRequest().getID());
-                                        ((Sendable) item).onNoResponse();
+                                    sendableHashMap.remove(sendable.getRequest().getID());
-                                        timeoutHashMap.remove(((Sendable) item).getRef());
-                                        sendableHashMap.remove(((Sendable) item).getRef());
-                                    }
                                 }, 1000, TimeUnit.MILLISECONDS));
                         } else {
-                            AsyncServer.getDefault().connectSocket(new InetSocketAddress(((Sendable) item).getRecipient().getAddress(), ((Sendable)
+                            socketHashMap.put(sendable.getRecipient(), null);
-                                    item).getRecipient().getPort()), new ConnectCallback() {
+                            AsyncServer.getDefault().connectSocket(new InetSocketAddress(sendable.getRecipient().getAddress(), sendable
-                                @Override
+                                    .getRecipient().getPort()), (ex, socket) -> {
-                                public void onConnectCompleted(Exception ex, final AsyncSocket socket) {
+                                        if (ex == null) {
-                                    if (ex == null) {
+                                            socket.setDataCallback(dataCallback);
-                                        socket.setDataCallback(dataCallback);
 
-                                        socketHashMap.put(((Sendable) item).getRecipient(), socket);
+                                            socketHashMap.put(sendable.getRecipient(), socket);
 
-                                        //if (!workQueue.contains(item)) -> needs equals implementaion
+                                            //if (!workQueue.contains(item)) -> needs equals implementation
-                                        workQueue.add(item);
+                                            workQueue.add(item);
-                                    } else {
+                                        } else {
-                                        ((Sendable) item).onConnectionFailed(ex.getMessage());
+                                            sendable.onConnectionFailed(ex.getMessage());
-                                    }
+                                        }
-                                }
+                                    });
-                            });
                         }
                     }
                 } catch (InterruptedException ex) {
@@ -172,10 +172,16 @@ public class ColorService extends Service {
     }
 
     public class ColorBinder extends Binder {
-        public String queueSend(LedDDaemon rec, JSONObject msg, AnswerTask answerTask) throws JSONException {
+        public void queueSend(LedDDaemon rec, JSONRPC2Request request, AnswerTask answerTask) {
-            Sendable sendable = new Sendable(msg, answerTask, rec);
+            Sendable sendable = null;
-            queue.add(sendable);
+            try {
-            return sendable.getRef();
+                sendable = new Sendable(request, answerTask, rec);
+            } catch (JSONException e) {
+                e.printStackTrace();
+            }
+            if (sendable != null) {
+                queue.add(sendable);
+            }
         }
     }
 }

app/src/main/java/com/idlegandalf/ledd/utils/RateLimiter.java

@@ -0,0 +1,51 @@
+/*
+ * LEDD Project
+ * Copyright (C) 2015 LEDD Team
+ *
+ * This program 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.
+ *
+ * This program 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 com.idlegandalf.ledd.utils;
+
+
+public class RateLimiter {
+    private double rate;
+    private double per;
+    private double allowance;
+    private long last_check;
+
+    public RateLimiter(double rate, double per) {
+        this.rate = rate;
+        this.per = per;
+        this.allowance = rate;
+        this.last_check = System.currentTimeMillis();
+    }
+
+    public boolean check() {
+        long current = System.currentTimeMillis();
+        long time_passed = current - last_check;
+        last_check = current;
+        allowance += time_passed * (rate / per);
+        if (allowance > rate) {
+            allowance = rate; // throttle
+        }
+
+        if (allowance < 1.0) {
+            return false;
+        } else {
+            allowance -= 1.0;
+            return true;
+        }
+    }
+}

app/src/main/res/layout/activity_asistent.xml

@@ -1,23 +0,0 @@
-<!--
-  ~ LEDD Project
-  ~ Copyright (C) 2015 LEDD Team
-  ~
-  ~ This program 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.
-  ~
-  ~ This program 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/>.
-  -->
-
-<FrameLayout
-    android:id="@+id/fragmentContainer"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" />

app/src/main/res/layout/activity_color.xml

@@ -16,52 +16,26 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<android.support.v4.widget.DrawerLayout
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
+    android:id="@+id/main_layout"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="wrap_content"
-    android:layout_width="match_parent"
+    android:fitsSystemWindows="true"
-    android:layout_height="match_parent"
+    android:orientation="vertical">
-    android:fitsSystemWindows="true">
 
-    <!-- The main content view -->
+    <Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?attr/colorPrimary"
+        android:minHeight="?android:attr/actionBarSize"
+        android:titleTextColor="@android:color/black" />
 
-    <LinearLayout
+    <com.github.madrapps.HSLColorPicker
+        android:id="@+id/picker"
         android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
+        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_gravity="center_horizontal"
+        android:layout_marginTop="25dp" />
 
-        <android.support.v7.widget.Toolbar
+</LinearLayout>
-            android:id="@+id/toolbar"
-            xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
-            android:minHeight="?android:attr/actionBarSize"/>
-
-        <com.larswerkman.holocolorpicker.ColorPicker
-            android:id="@+id/picker"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="25dp"/>
-
-        <com.larswerkman.holocolorpicker.SVBar
-            android:id="@+id/svbar"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="25dp"/>
-
-    </LinearLayout>
-
-    <!-- The navigation drawer -->
-
-    <android.support.design.widget.NavigationView
-        android:id="@+id/drawer"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        app:headerLayout="@layout/navigation_header"
-        app:menu="@menu/navigation_drawer"/>
-
-</android.support.v4.widget.DrawerLayout>

app/src/main/res/layout/fragment_addcontroller.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ LEDD Project
   ~ Copyright (C) 2015 LEDD Team
   ~
@@ -18,15 +17,16 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
-              android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
-              android:focusableInTouchMode="true"
+    android:layout_height="wrap_content"
-              android:minWidth="350dp"
+    android:focusableInTouchMode="true"
-              android:orientation="vertical"
+    android:minWidth="350dp"
-              android:paddingLeft="15dp"
+    android:orientation="vertical"
-              android:paddingRight="15dp"
+    android:paddingLeft="15dp"
-              android:paddingTop="15dp">
+    android:paddingTop="15dp"
+    android:paddingRight="15dp">
 
     <RelativeLayout
         android:layout_width="wrap_content"
@@ -36,68 +36,68 @@
             android:id="@+id/img_host"
             android:layout_width="35dp"
             android:layout_height="35dp"
-            android:src="@drawable/ic_developer_board_black_48dp"/>
+            android:src="@drawable/ic_developer_board_black_48dp"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/img_host"
             android:layout_alignTop="@id/img_host"
-            android:layout_marginLeft="7dp"
+            android:layout_alignBottom="@id/img_host"
-            android:layout_toRightOf="@id/img_host"
+            android:layout_marginStart="7dp"
+            android:layout_toEndOf="@id/img_host"
             android:gravity="center"
-            android:text="Add Controller"
+            android:text="@string/text_add_controller"
-            android:textAppearance="?android:textAppearanceMedium"
+            android:textAppearance="?android:textAppearanceMedium" />
-            />
     </RelativeLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/input_i2c_layout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="15dp"
         app:errorEnabled="true">
 
-        <EditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/input_i2c"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:hint="i2c device number"
+            android:hint="@string/hint_i2c_device"
             android:inputType="number"
-            android:minWidth="350dp"/>
+            android:minWidth="350dp" />
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/input_address_layout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         app:errorEnabled="true">
 
-        <EditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/input_address"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:hint="controller address in hex format"
+            android:hint="@string/hint_controller_address"
-            android:minWidth="350dp"/>
+            android:minWidth="350dp" />
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/input_channel_layout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="5dp"
         app:errorEnabled="true">
 
-        <EditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/input_channel"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:hint="channels"
+            android:hint="@string/hint_channels"
             android:inputType="number"
-            android:minWidth="350dp"/>
+            android:minWidth="350dp" />
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>

app/src/main/res/layout/fragment_adddaemon.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ LEDD Project
   ~ Copyright (C) 2015 LEDD Team
   ~
@@ -18,15 +17,16 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
-              android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
-              android:focusableInTouchMode="true"
+    android:layout_height="wrap_content"
-              android:minWidth="250dp"
+    android:focusableInTouchMode="true"
-              android:orientation="vertical"
+    android:minWidth="250dp"
-              android:paddingLeft="15dp"
+    android:orientation="vertical"
-              android:paddingRight="15dp"
+    android:paddingLeft="15dp"
-              android:paddingTop="15dp">
+    android:paddingRight="15dp"
+    android:paddingTop="15dp">
 
     <RelativeLayout
         android:layout_width="wrap_content"
@@ -36,27 +36,29 @@
             android:id="@+id/img_host"
             android:layout_width="35dp"
             android:layout_height="35dp"
-            android:src="@drawable/ic_computer_black_48dp"/>
+            android:src="@drawable/ic_computer_black_48dp"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/img_host"
             android:layout_alignTop="@id/img_host"
-            android:layout_marginLeft="7dp"
+            android:layout_marginStart="7dp"
-            android:layout_toRightOf="@id/img_host"
+            android:layout_toEndOf="@id/img_host"
-            android:gravity="center"
+            android:layout_toStartOf="@id/progress_daemon"
-            android:text="Choose Daemon"
+            android:gravity="start|center_vertical"
-            android:textAppearance="?android:textAppearanceMedium"
+            android:text="@string/text_choose_daemon"
-            />
+            android:textAppearance="?android:textAppearanceMedium" />
 
         <ProgressBar
+            android:id="@+id/progress_daemon"
             android:layout_width="35dp"
             android:layout_height="35dp"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_alignParentTop="true"
-            android:layout_marginLeft="5dp"
+            android:layout_marginStart="5dp"
-            android:indeterminate="true"/>
+            android:indeterminate="true" />
 
     </RelativeLayout>
 
@@ -70,7 +72,7 @@
             android:id="@+id/host_container"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="vertical"/>
+            android:orientation="vertical" />
 
     </ScrollView>
 
@@ -80,21 +82,21 @@
         android:layout_marginBottom="5dp"
         android:layout_marginTop="5dp"
         android:gravity="center_horizontal"
-        android:text="or"
+        android:text="@string/text_or"
-        android:textAppearance="?android:textAppearanceMedium"/>
+        android:textAppearance="?android:textAppearanceMedium" />
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/input_ip_layout"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         app:errorEnabled="true">
 
-        <EditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/input_ip"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:hint="ip address[:port]"
+            android:hint="@string/hint_daemon_ip_port"
-            android:minWidth="250dp"/>
+            android:minWidth="250dp" />
 
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>

app/src/main/res/layout/fragment_addprofile.xml

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ LEDD Project
+  ~ Copyright (C) 2015 LEDD Team
+  ~
+  ~ This program 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.
+  ~
+  ~ This program 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/>.
+  -->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:focusableInTouchMode="true"
+    android:minWidth="350dp"
+    android:orientation="vertical"
+    android:paddingLeft="15dp"
+    android:paddingRight="15dp"
+    android:paddingTop="15dp">
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content">
+
+        <ImageView
+            android:id="@+id/img_host"
+            android:layout_width="35dp"
+            android:layout_height="35dp"
+            android:src="@drawable/ic_save_black_48dp"
+            tools:ignore="ContentDescription" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBottom="@id/img_host"
+            android:layout_alignTop="@id/img_host"
+            android:layout_marginStart="7dp"
+            android:layout_toEndOf="@id/img_host"
+            android:gravity="center"
+            android:text="@string/add_profile"
+            android:textAppearance="?android:textAppearanceMedium" />
+    </RelativeLayout>
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="20dp"
+        android:text="@string/choose_stripes_to_include" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="120dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginTop="10dp">
+
+        <LinearLayout
+            android:id="@+id/container_linlay"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+
+    </ScrollView>
+
+    <com.google.android.material.textfield.TextInputLayout
+        android:id="@+id/input_profile_name_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="5dp"
+        app:errorEnabled="true">
+
+        <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/input_profile_name"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:hint="@string/profile_name"
+            android:inputType="text"
+            android:minWidth="350dp" />
+
+    </com.google.android.material.textfield.TextInputLayout>
+</LinearLayout>

app/src/main/res/layout/fragment_addprofile_item.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<CheckBox xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginBottom="5dp" />
+

app/src/main/res/layout/fragment_addstripe.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ LEDD Project
   ~ Copyright (C) 2015 LEDD Team
   ~
@@ -18,15 +17,16 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
-              android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
-              android:focusableInTouchMode="true"
+    android:layout_height="wrap_content"
-              android:minWidth="250dp"
+    android:focusableInTouchMode="true"
-              android:orientation="vertical"
+    android:minWidth="250dp"
-              android:paddingLeft="15dp"
+    android:orientation="vertical"
-              android:paddingRight="15dp"
+    android:paddingLeft="15dp"
-              android:paddingTop="15dp">
+    android:paddingRight="15dp"
+    android:paddingTop="15dp">
 
     <RelativeLayout
         android:layout_width="wrap_content"
@@ -36,19 +36,19 @@
             android:id="@+id/img_host"
             android:layout_width="25dp"
             android:layout_height="25dp"
-            android:src="@drawable/ic_computer_black_48dp"/>
+            android:src="@drawable/ic_computer_black_48dp"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/img_host"
             android:layout_alignTop="@id/img_host"
-            android:layout_marginLeft="7dp"
+            android:layout_marginStart="7dp"
-            android:layout_toRightOf="@id/img_host"
+            android:layout_toEndOf="@id/img_host"
             android:gravity="center"
-            android:text="Choose Daemon"
+            android:text="@string/text_choose_daemon"
-            android:textAppearance="?android:textAppearanceSmall"
+            android:textAppearance="?android:textAppearanceSmall" />
-            />
 
     </RelativeLayout>
 
@@ -62,20 +62,21 @@
             android:id="@+id/imgbuttn_adddaemon"
             android:layout_width="28dp"
             android:layout_height="28dp"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:background="?android:attr/selectableItemBackground"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_add_circle_black_48dp"/>
+            android:src="@drawable/ic_add_circle_black_48dp"
+            tools:ignore="ContentDescription" />
 
         <Spinner
             android:id="@+id/spinner_daemon"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:layout_toLeftOf="@id/imgbuttn_adddaemon"/>
+            android:layout_toStartOf="@id/imgbuttn_adddaemon" />
 
     </RelativeLayout>
 
@@ -89,19 +90,19 @@
             android:id="@+id/img_controller"
             android:layout_width="25dp"
             android:layout_height="25dp"
-            android:src="@drawable/ic_developer_board_black_48dp"/>
+            android:src="@drawable/ic_developer_board_black_48dp"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/img_controller"
             android:layout_alignTop="@id/img_controller"
-            android:layout_marginLeft="7dp"
+            android:layout_marginStart="7dp"
-            android:layout_toRightOf="@id/img_controller"
+            android:layout_toEndOf="@id/img_controller"
             android:gravity="center"
-            android:text="Choose Controller"
+            android:text="@string/text_choose_controller"
-            android:textAppearance="?android:textAppearanceSmall"
+            android:textAppearance="?android:textAppearanceSmall" />
-            />
 
     </RelativeLayout>
 
@@ -115,20 +116,21 @@
             android:id="@+id/imgbuttn_addcontroller"
             android:layout_width="28dp"
             android:layout_height="28dp"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:layout_gravity="center_vertical"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="10dp"
             android:background="?android:attr/selectableItemBackground"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_add_circle_black_48dp"/>
+            android:src="@drawable/ic_add_circle_black_48dp"
+            tools:ignore="ContentDescription" />
 
         <Spinner
             android:id="@+id/spinner_controller"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="10dp"
-            android:layout_toLeftOf="@id/imgbuttn_addcontroller"/>
+            android:layout_toStartOf="@id/imgbuttn_addcontroller" />
 
     </RelativeLayout>
 
@@ -141,53 +143,52 @@
             android:id="@+id/img_stripe"
             android:layout_width="25dp"
             android:layout_height="25dp"
-            android:src="@drawable/ic_wb_iridescent_black_48dp"/>
+            android:src="@drawable/ic_wb_iridescent_black_48dp"
+            tools:ignore="ContentDescription" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@id/img_stripe"
             android:layout_alignTop="@id/img_stripe"
-            android:layout_marginLeft="7dp"
+            android:layout_marginStart="7dp"
-            android:layout_toRightOf="@id/img_stripe"
+            android:layout_toEndOf="@id/img_stripe"
             android:gravity="center"
-            android:text="Stripe Properties"
+            android:text="@string/text_stripe_properties"
-            android:textAppearance="?android:textAppearanceSmall"
+            android:textAppearance="?android:textAppearanceSmall" />
-            />
 
     </RelativeLayout>
 
-    <android.support.design.widget.TextInputLayout
+    <com.google.android.material.textfield.TextInputLayout
         android:id="@+id/input_stripe_name_lay"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:layout_marginTop="15dp"
         app:errorEnabled="true">
 
-        <EditText
+        <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/input_stripe_name"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:hint="Stripe name"
+            android:hint="@string/hint_stripe_name"
             android:inputType="text"
-            android:minEms="12"/>
+            android:minEms="12" />
-    </android.support.design.widget.TextInputLayout>
+    </com.google.android.material.textfield.TextInputLayout>
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="9dp"
+        android:layout_marginStart="9dp"
         android:layout_marginTop="15dp"
         android:gravity="center"
-        android:text="Channel Mapping"
+        android:text="@string/text_channel_mapping"
-        android:textAppearance="?android:textAppearanceSmall"
+        android:textAppearance="?android:textAppearanceSmall" />
-        />
 
     <HorizontalScrollView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:layout_marginTop="10dp">
 
         <LinearLayout
@@ -196,79 +197,82 @@
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/input_channel_r_lay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content">
 
-                <EditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/input_channel_r"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ems="2"
-                    android:hint="R"
+                    android:hint="@string/hint_channel_r"
-                    android:inputType="number"/>
+                    android:inputType="number" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <ImageButton
                 android:id="@+id/imgbuttn_togglechannel_r"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_visibility_off_black_48dp"/>
+                android:src="@drawable/ic_visibility_off_black_48dp"
+                tools:ignore="ContentDescription" />
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/input_channel_g_lay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp">
+                android:layout_marginStart="10dp">
 
-                <EditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/input_channel_g"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ems="2"
-                    android:hint="G"
+                    android:hint="@string/hint_channel_g"
-                    android:inputType="number"/>
+                    android:inputType="number" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <ImageButton
                 android:id="@+id/imgbuttn_togglechannel_g"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_visibility_off_black_48dp"/>
+                android:src="@drawable/ic_visibility_off_black_48dp"
+                tools:ignore="ContentDescription" />
 
-            <android.support.design.widget.TextInputLayout
+            <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/input_channel_b_lay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="10dp">
+                android:layout_marginStart="10dp">
 
-                <EditText
+                <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/input_channel_b"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ems="2"
-                    android:hint="B"
+                    android:hint="@string/hint_channel_b"
-                    android:inputType="number"/>
+                    android:inputType="number" />
-            </android.support.design.widget.TextInputLayout>
+            </com.google.android.material.textfield.TextInputLayout>
 
             <ImageButton
                 android:id="@+id/imgbuttn_togglechannel_b"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:layout_gravity="center_vertical"
-                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
                 android:background="?android:attr/selectableItemBackground"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_visibility_off_black_48dp"/>
+                android:src="@drawable/ic_visibility_off_black_48dp"
+                tools:ignore="ContentDescription" />
         </LinearLayout>
 
     </HorizontalScrollView>

app/src/main/res/layout/host_row.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ LEDD Project
   ~ Copyright (C) 2015 LEDD Team
   ~
@@ -18,31 +17,36 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
-              android:layout_height="wrap_content"
+    android:layout_width="wrap_content"
-              android:layout_marginTop="5dp"
+    android:layout_height="wrap_content"
-              android:background="?android:attr/selectableItemBackground"
+    android:layout_marginTop="5dp"
-              android:clickable="true"
+    android:background="?android:attr/selectableItemBackground"
-              android:gravity="center_horizontal"
+    android:clickable="true"
-              android:orientation="horizontal"
+    android:gravity="center_horizontal"
-              android:paddingLeft="7dp">
+    android:orientation="horizontal"
+    android:paddingStart="7dp"
+    android:focusable="true"
+    tools:ignore="RtlSymmetry">
 
     <ImageView
         android:layout_width="25dp"
         android:layout_height="25dp"
-        android:src="@drawable/ic_developer_board_black_48dp"/>
+        android:src="@drawable/ic_developer_board_black_48dp"
+        tools:ignore="ContentDescription" />
 
     <TextView
         android:id="@+id/text_host"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="10dp"
+        android:layout_marginStart="10dp"
         android:background="?android:attr/selectableItemBackground"
         android:clickable="true"
         android:gravity="center_vertical"
-        android:text="textHost"
+        android:text=""
         android:textAppearance="?android:textAppearanceMedium"
-        android:textColor="@color/primaryColorDark"/>
+        android:textColor="@color/primaryColorDark"
+        android:focusable="true" />
 
 </LinearLayout>

app/src/main/res/layout/navigation_header.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ LEDD Project
-  ~ Copyright (C) 2015 LEDD Team
-  ~
-  ~ This program 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.
-  ~
-  ~ This program 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/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="192dp"
-              android:background="?attr/colorPrimaryDark"
-              android:gravity="bottom"
-              android:orientation="vertical"
-              android:padding="16dp"
-              android:theme="@style/ThemeOverlay.AppCompat.Dark">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:text="-- stripes infos go here --"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"/>
-
-</LinearLayout>

app/src/main/res/layout/progress.xml

@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ LEDD Project
-  ~ Copyright (C) 2015 LEDD Team
-  ~
-  ~ This program 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.
-  ~
-  ~ This program 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/>.
-  -->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical" >
-
-    <ProgressBar
-        android:id="@+id/activity_bar"
-        style="@style/Widget.AppCompat.ProgressBar.Horizontal"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="-8dp" />
-
-    <FrameLayout
-        android:id="@+id/activity_frame"
-        android:layout_width="match_parent"
-        android:layout_height="fill_parent" />
-
-</LinearLayout>

app/src/main/res/layout/spinner_dropdown_item.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ LEDD Project
   ~ Copyright (C) 2015 LEDD Team
   ~
@@ -17,12 +16,11 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<CheckedTextView
+<CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     style="?android:attr/spinnerDropDownItemStyle"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="?android:attr/listPreferredItemHeight"
     android:ellipsize="marquee"
     android:singleLine="true"
-    android:textColor="@android:color/black"/>
+    android:textColor="@android:color/black" />

app/src/main/res/layout/spinner_item.xml

@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?><!--
-<!--
   ~ LEDD Project
   ~ Copyright (C) 2015 LEDD Team
   ~
@@ -17,13 +16,12 @@
   ~ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<TextView
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/text1"
     style="?android:attr/spinnerItemStyle"
-    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
     android:singleLine="true"
     android:textAlignment="inherit"
-    android:textColor="@android:color/black"/>
+    android:textColor="@android:color/black" />

app/src/main/res/menu/color.xml

@@ -17,6 +17,4 @@
   -->
 
 <menu>
-
-
 </menu>

app/src/main/res/menu/navigation_drawer.xml

@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ LEDD Project
-  ~ Copyright (C) 2015 LEDD Team
-  ~
-  ~ This program 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.
-  ~
-  ~ This program 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/>.
-  -->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item
-        android:id="@+id/nv_add_stripe"
-        android:icon="@drawable/ic_add_circle_black_48dp"
-        android:orderInCategory="51"
-        android:title="Add Stripe"/>
-
-    <item
-        android:id="@+id/nv_settings"
-        android:icon="@drawable/ic_tune_black_48dp"
-        android:orderInCategory="52"
-        android:title="Settings"/>
-
-
-</menu>

app/src/main/res/values-v11/styles.xml

@@ -1,29 +0,0 @@
-<!--
-  ~ LEDD Project
-  ~ Copyright (C) 2015 LEDD Team
-  ~
-  ~ This program 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.
-  ~
-  ~ This program 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/>.
-  -->
-
-<resources>
-
-    <!--
-        Base application theme for API 11+. This theme completely replaces
-        AppBaseTheme from res/values/styles.xml on API 11+ devices.
-    -->
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- API 11 theme customizations can go here. -->
-    </style>
-
-</resources>

app/src/main/res/values-v14/styles.xml

@@ -1,30 +0,0 @@
-<!--
-  ~ LEDD Project
-  ~ Copyright (C) 2015 LEDD Team
-  ~
-  ~ This program 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.
-  ~
-  ~ This program 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/>.
-  -->
-
-<resources>
-
-    <!--
-        Base application theme for API 14+. This theme completely replaces
-        AppBaseTheme from BOTH res/values/styles.xml and
-        res/values-v11/styles.xml on API 14+ devices.
-    -->
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- API 14 theme customizations can go here. -->
-    </style>
-
-</resources>

app/src/main/res/values-v19/styles.xml

@@ -22,7 +22,7 @@
         Base application theme for API 19+. This theme completely replaces
         AppBaseTheme from res/values/styles.xml on API 19+ devices.
     -->
-    <style name="AppBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="AppBaseTheme" parent="MaterialDrawerTheme.Light.DarkToolbar.TranslucentStatus">
         <!-- API 19 theme customizations can go here. -->
         <item name="android:windowTranslucentStatus">true</item>
     </style>