diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1ad057..61ebf66 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,7 +29,7 @@ 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"> stripes) { - runOnUiThread(new Runnable() { - @Override - public void run() { - SubMenu nDaemonMenu = nvMenu.addSubMenu(Menu.NONE, Menu.NONE, finalI, dDaemon.toString()); - nDaemonMenu.setGroupCheckable(stripeGroup, true, true); + final int finalI = i; + helper.getStripes(new StripesCallback() { + @Override + public void onSuccess(final List stripes) { + runOnUiThread(new Runnable() { + @Override + public void run() { + 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(); + ledStripes = stripes; + Snackbar.make(findViewById(android.R.id.content), "LED stripes reloaded", Snackbar.LENGTH_LONG).show(); - for (LedStripe stripe : ledStripes) { - MenuItem sItem = nDaemonMenu.add(stripeGroup, View.generateViewId(), stripe.getId(), stripe.getName()); - sItem.setIcon(R.drawable.ic_wb_iridescent_black_48dp); - } + for (LedStripe stripe : ledStripes) { + MenuItem sItem = nDaemonMenu.add(stripeGroup, View.generateViewId(), stripe.getId(), stripe.getName()); + sItem.setIcon(R.drawable.ic_wb_iridescent_black_48dp); } - }); - } + } + }); + } - @Override - public void onGetFailed(String message) { - Snackbar.make(findViewById(android.R.id.content), "Coudn't get stripes from daemon: " + message, Snackbar.LENGTH_LONG) - .show(); + @Override + public void onGetFailed(String message) { + Snackbar.make(findViewById(android.R.id.content), "Coudn't get stripes from daemon: " + 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(); + } + }); - @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++; @@ -343,11 +332,7 @@ public class ColorActivity extends AppCompatActivity implements NavigationView.O @Override public void onReceive(Context context, Intent intent) { if (intent.getAction().equals(ColorApplication.INTENT_ACTION_REFRESH)) { - try { - refreshStripes(); - } catch (IOException e) { - e.printStackTrace(); - } + refreshStripes(); } } } diff --git a/app/src/main/java/com/idlegandalf/ledd/ColorApplication.java b/app/src/main/java/com/idlegandalf/ledd/ColorApplication.java index 49eeb58..ab05838 100644 --- a/app/src/main/java/com/idlegandalf/ledd/ColorApplication.java +++ b/app/src/main/java/com/idlegandalf/ledd/ColorApplication.java @@ -29,9 +29,6 @@ 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; @@ -56,28 +53,22 @@ public class ColorApplication extends Application { 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() { - @Override - public void onConnectionFailed(String message) { - - } - - @Override - public void onDiscoverSuccessfully(String version) { - ledDHelpers.put(ledDDaemon, dHelper); - } - }); - } catch (JSONException e) { - e.printStackTrace(); - } + dHelper.discover(new DiscoverCallback() { + @Override + public void onConnectionFailed(String message) { + } + @Override + public void onDiscoverSuccessfully(String version) { + ledDHelpers.put(ledDDaemon, dHelper); + } + }); return dHelper; } } @@ -104,33 +95,27 @@ public class ColorApplication extends Application { }.getType()); for (final LedDDaemon ledDDaemon : ledDDaemons) { - try { - final LedDHelper helper = new LedDHelper(ledDDaemon, getApplicationContext()); + final LedDHelper helper = new LedDHelper(ledDDaemon, getApplicationContext()); - helper.discover(new DiscoverCallback() { - @Override - public void onDiscoverSuccessfully(String version) { - //ledDDaemon.setActive(true); - ledDHelpers.put(ledDDaemon, helper); + helper.discover(new DiscoverCallback() { + @Override + public void onDiscoverSuccessfully(String version) { + //ledDDaemon.setActive(true); + ledDHelpers.put(ledDDaemon, helper); - Intent i = new Intent(INTENT_ACTION_REFRESH); - sendBroadcast(i); - } + Intent i = new Intent(INTENT_ACTION_REFRESH); + sendBroadcast(i); + } - @Override - public void onConnectionFailed(String message) { - //ledDDaemon.setActive(false); - ledDHelpers.put(ledDDaemon, helper); + @Override + public void onConnectionFailed(String message) { + //ledDDaemon.setActive(false); + ledDHelpers.put(ledDDaemon, helper); - Intent i = new Intent(INTENT_ACTION_REFRESH); - sendBroadcast(i); - } - }); - - - } catch (IOException | JSONException e) { - e.printStackTrace(); - } + Intent i = new Intent(INTENT_ACTION_REFRESH); + sendBroadcast(i); + } + }); } } diff --git a/app/src/main/java/com/idlegandalf/ledd/SettingsActivity.java b/app/src/main/java/com/idlegandalf/ledd/SettingsActivity.java index 12f3c7d..80271f2 100644 --- a/app/src/main/java/com/idlegandalf/ledd/SettingsActivity.java +++ b/app/src/main/java/com/idlegandalf/ledd/SettingsActivity.java @@ -19,11 +19,11 @@ package com.idlegandalf.ledd; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.AppCompatActivity; import com.idlegandalf.ledd.fragments.SettingsFragment; -public class SettingsActivity extends ActionBarActivity { +public class SettingsActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); diff --git a/app/src/main/java/com/idlegandalf/ledd/components/StripeGroup.java b/app/src/main/java/com/idlegandalf/ledd/components/StripeGroup.java index 9df4a90..ce7f9d9 100644 --- a/app/src/main/java/com/idlegandalf/ledd/components/StripeGroup.java +++ b/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); } diff --git a/app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java b/app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java index 72c3d09..700ab5c 100644 --- a/app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java +++ b/app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java @@ -39,9 +39,6 @@ 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; @@ -64,6 +61,13 @@ public class AddControllerDialog extends DialogFragment implements DialogInterfa 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); @@ -168,69 +172,53 @@ public class AddControllerDialog extends DialogFragment implements DialogInterfa c.setI2c_device(Integer.parseInt(i2cText.getText().toString())); c.setChannels(Integer.parseInt(channelText.getText().toString())); - LedDHelper helper = null; - try { - helper = ColorApplication.getInstance().getHelperForDaemon(dDaemon); - } catch (IOException e) { - e.printStackTrace(); - } + LedDHelper helper = ColorApplication.getInstance().getHelperForDaemon(dDaemon); if (helper != null) { - try { - helper.addController(c, new AddControllerCallback() { - @Override - public void onControllerAdded(final Controller controller) { - 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(); - } - }); + helper.addController(c, new AddControllerCallback() { + @Override + public void onControllerAdded(final Controller controller) { + 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); - dismiss(); - } + dDaemon.getControllers().add(controller); + 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 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 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(); + } + }); } } }); } - - private static boolean isNumeric(String str) { - NumberFormat formatter = NumberFormat.getInstance(); - ParsePosition pos = new ParsePosition(0); - formatter.parse(str, pos); - return str.length() == pos.getIndex(); - } } diff --git a/app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java b/app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java index a5c2e9a..7f8802d 100644 --- a/app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java +++ b/app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java @@ -45,9 +45,6 @@ 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; @@ -286,44 +283,35 @@ public class AddDaemonDialog extends DialogFragment implements DialogInterface.O } private void addDaemon(final LedDDaemon ledDDaemon) { - try { - ColorApplication.getInstance().getHelperForDaemon(ledDDaemon).discover(new DiscoverCallback() { - @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 " + ledDDaemon + ": " + message, Snackbar.LENGTH_LONG).show(); - } - }); - AddStripeDialog stripeAdd = (AddStripeDialog) getFragmentManager().findFragmentByTag("stripeAdd"); - AddStripeDialog.instance.onResume(); - dismiss(); - } - - @Override - public void onDiscoverSuccessfully(final String version) { - getActivity().runOnUiThread(new Runnable() { - @Override - 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(); - } catch (IOException e) { - e.printStackTrace(); + ColorApplication.getInstance().getHelperForDaemon(ledDDaemon).discover(new DiscoverCallback() { + @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 " + ledDDaemon + ": " + message, Snackbar.LENGTH_LONG).show(); } - AddStripeDialog.instance.onResume(); - dismiss(); - } - }); - } catch (JSONException | IOException e) { - e.printStackTrace(); - } + }); + AddStripeDialog.instance.onResume(); + dismiss(); + } + + @Override + public void onDiscoverSuccessfully(final String version) { + getActivity().runOnUiThread(new Runnable() { + @Override + 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(); + } + }); + + ((ColorActivity) getActivity()).refreshStripes(); + AddStripeDialog.instance.onResume(); + dismiss(); + } + }); } } diff --git a/app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java b/app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java index 9979d0f..e1654a6 100644 --- a/app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java +++ b/app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java @@ -50,9 +50,6 @@ 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; @@ -259,50 +256,38 @@ public class AddStripeDialog extends DialogFragment implements DialogInterface.O stripe.setLedDDaemon((LedDDaemon) daemonSpinner.getSelectedItem()); stripe.setController((Controller) controllerSpinner.getSelectedItem()); - LedDHelper helper = null; - try { - helper = ColorApplication.getInstance().getHelperForDaemon((LedDDaemon) daemonSpinner.getSelectedItem()); - } catch (IOException e) { - e.printStackTrace(); - } + LedDHelper helper = ColorApplication.getInstance().getHelperForDaemon((LedDDaemon) daemonSpinner.getSelectedItem()); + if (helper != null) { - try { - helper.addStripe(stripe, new AddStripeCallback() { - @Override - public void onAddSuccessfully(final LedStripe stripe) { - ColorActivity activity = ((ColorActivity) getActivity()); - try { - activity.refreshStripes(); - } catch (IOException e) { - e.printStackTrace(); + helper.addStripe(stripe, new AddStripeCallback() { + @Override + public void onAddSuccessfully(final LedStripe stripe) { + ColorActivity activity = ((ColorActivity) getActivity()); + activity.refreshStripes(); + + 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(); + } - 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 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(); + } + }); } } }); @@ -398,19 +383,11 @@ public class AddStripeDialog extends DialogFragment implements DialogInterface.O } text.setTag(toggle); - LedDHelper helper = null; - try { - helper = ColorApplication.getInstance().getHelperForDaemon((LedDDaemon) daemonSpinner.getSelectedItem()); - } catch (IOException e) { - e.printStackTrace(); - } + LedDHelper helper = ColorApplication.getInstance().getHelperForDaemon((LedDDaemon) daemonSpinner.getSelectedItem()); + if (helper != null) { - try { - helper.testChannel((Controller) controllerSpinner.getSelectedItem(), Integer.parseInt(text.getText().toString()), val); - } catch (JSONException e) { - e.printStackTrace(); - } + helper.testChannel((Controller) controllerSpinner.getSelectedItem(), Integer.parseInt(text.getText().toString()), val); } } } @@ -418,40 +395,31 @@ public class AddStripeDialog extends DialogFragment implements DialogInterface.O private void refreshController(final LedDDaemon ledDDaemon) { controllerArrayAdapter.clear(); - LedDHelper helper = null; - try { - helper = ColorApplication.getInstance().getHelperForDaemon(ledDDaemon); - } catch (IOException e) { - e.printStackTrace(); - } + LedDHelper helper = ColorApplication.getInstance().getHelperForDaemon(ledDDaemon); if (helper != null) { - try { - helper.getStripes(new StripesCallback() { - @Override - public void onSuccess(List stripes) { - getActivity().runOnUiThread(new Runnable() { - @Override - public void run() { - controllerArrayAdapter.addAll(ledDDaemon.getControllers()); - toggleAll(stripeMapping, true); - } - }); - } + helper.getStripes(new StripesCallback() { + @Override + public void onSuccess(List stripes) { + getActivity().runOnUiThread(new Runnable() { + @Override + public void run() { + controllerArrayAdapter.addAll(ledDDaemon.getControllers()); + toggleAll(stripeMapping, true); + } + }); + } - @Override - public void onGetFailed(String message) { + @Override + public void onGetFailed(String message) { - } + } - @Override - public void onConnectionFailed(String message) { + @Override + public void onConnectionFailed(String message) { - } - }); - } catch (JSONException | IOException e) { - e.printStackTrace(); - } + } + }); } } } diff --git a/app/src/main/java/com/idlegandalf/ledd/helper/LedDHelper.java b/app/src/main/java/com/idlegandalf/ledd/helper/LedDHelper.java index 80e63e6..7a57bea 100644 --- a/app/src/main/java/com/idlegandalf/ledd/helper/LedDHelper.java +++ b/app/src/main/java/com/idlegandalf/ledd/helper/LedDHelper.java @@ -43,7 +43,6 @@ import org.json.JSONArray; import org.json.JSONException; import org.json.JSONObject; -import java.io.IOException; import java.util.ArrayList; import java.util.List; import java.util.concurrent.LinkedBlockingQueue; @@ -78,7 +77,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,16 +90,18 @@ 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(); - jnson.put("action", ACTION_ADDCONTROLLER); - jnson.put("channels", c.getChannels()); - jnson.put("i2c_dev", c.getI2c_device()); - jnson.put("address", c.getAddress()); + try { + jnson.put("action", ACTION_ADDCONTROLLER); + jnson.put("channels", c.getChannels()); + jnson.put("i2c_dev", c.getI2c_device()); + jnson.put("address", c.getAddress()); + } catch (JSONException e) { + e.printStackTrace(); + } addRequestToQueue(jnson, new AnswerTask() { @Override @@ -126,14 +127,15 @@ 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(); - jnson.put("action", ACTION_GETALLSTRIPES); + try { + jnson.put("action", ACTION_GETALLSTRIPES); + } catch (JSONException e) { + e.printStackTrace(); + } addRequestToQueue(jnson, new AnswerTask() { @Override @@ -220,14 +222,16 @@ public class LedDHelper { * 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 RecieveColorCallback callback) { JSONObject jnson = new JSONObject(); - jnson.put("action", ACTION_GETCOLOR); - jnson.put("sid", ledStripe.getId()); + try { + jnson.put("action", ACTION_GETCOLOR); + jnson.put("sid", ledStripe.getId()); + } catch (JSONException e) { + e.printStackTrace(); + } addRequestToQueue(jnson, new AnswerTask() { @Override @@ -258,15 +262,19 @@ 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(); - jnson.put("action", ACTION_TESTCHANNEL); - jnson.put("cid", c.getId()); - jnson.put("channel", channel); - jnson.put("value", value); + try { + jnson.put("action", ACTION_TESTCHANNEL); + + jnson.put("cid", c.getId()); + jnson.put("channel", channel); + jnson.put("value", value); + } catch (JSONException e) { + e.printStackTrace(); + } addRequestToQueue(jnson, new AnswerTask() { @Override @@ -283,14 +291,15 @@ 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(); - jnson.put("action", ACTION_DISCOVER); + try { + jnson.put("action", ACTION_DISCOVER); + } catch (JSONException e) { + e.printStackTrace(); + } addRequestToQueue(jnson, new AnswerTask() { @Override @@ -313,26 +322,29 @@ 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(); - jnson.put("action", ACTION_ADDSTRIPES); - JSONObject stripe = new JSONObject(); + try { + jnson.put("action", ACTION_ADDSTRIPES); - stripe.put("name", ledStripe.getName()); - stripe.put("rgb", ledStripe.isRGB()); + JSONObject stripe = new JSONObject(); - JSONObject mapping = new JSONObject(); - mapping.put("r", ledStripe.getChannelRed()); - mapping.put("g", ledStripe.getChannelGreen()); - mapping.put("b", ledStripe.getChannelBlue()); - stripe.put("map", mapping); - stripe.put("cid", ledStripe.getController().getId()); - jnson.put("stripe", stripe); + 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); + stripe.put("cid", ledStripe.getController().getId()); + jnson.put("stripe", stripe); + + } catch (JSONException e) { + e.printStackTrace(); + } addRequestToQueue(jnson, new AnswerTask() { @Override @@ -355,7 +367,7 @@ public class LedDHelper { } private void addRequestToQueue(JSONObject json, AnswerTask task) { - dRequests.add(new LedDRequest(json, task)); + if (json != null && json.length() > 0) dRequests.add(new LedDRequest(json, task)); } public void teardown() { @@ -389,8 +401,6 @@ public class LedDHelper { } catch (InterruptedException ex) { Thread.currentThread().interrupt(); break; - } catch (JSONException e) { - e.printStackTrace(); } } } diff --git a/app/src/main/java/com/idlegandalf/ledd/services/ColorService.java b/app/src/main/java/com/idlegandalf/ledd/services/ColorService.java index 06d141b..fd23af6 100644 --- a/app/src/main/java/com/idlegandalf/ledd/services/ColorService.java +++ b/app/src/main/java/com/idlegandalf/ledd/services/ColorService.java @@ -65,11 +65,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,26 +80,19 @@ public class ColorService extends Service { DataCallback dataCallback = new DataCallback() { @Override public void onDataAvailable(DataEmitter emitter, ByteBufferList bb) { - JSONObject resp = null; try { - resp = new JSONObject(new String(bb.getAllByteArray())); + JSONObject resp = new JSONObject(new String(bb.getAllByteArray())); + + if (sendableHashMap.containsKey(resp.getString("ref"))) { + sendableHashMap.get(resp.getString("ref")).onResponse(resp); + sendableHashMap.remove(resp.getString("ref")); + if (timeoutHashMap.containsKey(resp.getString("ref")) && timeoutHashMap.get(resp.getString("ref")) != null) + timeoutHashMap.get(resp.getString("ref")).cancel(false); + timeoutHashMap.remove(resp.getString("ref")); + } } catch (JSONException e) { e.printStackTrace(); } - - if (resp != null) { - try { - if (sendableHashMap.containsKey(resp.getString("ref"))) { - sendableHashMap.get(resp.getString("ref")).onResponse(resp); - sendableHashMap.remove(resp.getString("ref")); - if (timeoutHashMap.containsKey(resp.getString("ref")) && timeoutHashMap.get(resp.getString("ref")) != null) - timeoutHashMap.get(resp.getString("ref")).cancel(false); - timeoutHashMap.remove(resp.getString("ref")); - } - } catch (JSONException e) { - e.printStackTrace(); - } - } } }; @@ -122,36 +110,36 @@ 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()) - .getServer().isRunning()) { + final Sendable sendable = (Sendable) item; + if (socketHashMap.containsKey(sendable.getRecipient()) && socketHashMap.get(sendable.getRecipient()).getServer().isRunning + ()) { - Util.writeAll(socketHashMap.get(((Sendable) item).getRecipient()), (((Sendable) item).getMessage().toString() + "\n") - .getBytes - ("UTF-8"), null); - sendableHashMap.put(((Sendable) item).getRef(), (Sendable) item); + Util.writeAll(socketHashMap.get(sendable.getRecipient()), (sendable.getMessage().toString() + "\n").getBytes("UTF-8"), + null); + sendableHashMap.put(sendable.getRef(), sendable); if (!poolExecutor.isTerminating() && !poolExecutor.isTerminated()) - timeoutHashMap.put(((Sendable) item).getRef(), poolExecutor.schedule(new Runnable() { + timeoutHashMap.put(sendable.getRef(), poolExecutor.schedule(new Runnable() { @Override public void run() { - ((Sendable) item).onNoResponse(); - timeoutHashMap.remove(((Sendable) item).getRef()); - sendableHashMap.remove(((Sendable) item).getRef()); + sendable.onNoResponse(); + timeoutHashMap.remove(sendable.getRef()); + sendableHashMap.remove(sendable.getRef()); } }, 1000, TimeUnit.MILLISECONDS)); } else { - AsyncServer.getDefault().connectSocket(new InetSocketAddress(((Sendable) item).getRecipient().getAddress(), ((Sendable) - item).getRecipient().getPort()), new ConnectCallback() { + AsyncServer.getDefault().connectSocket(new InetSocketAddress(sendable.getRecipient().getAddress(), sendable + .getRecipient().getPort()), new ConnectCallback() { @Override public void onConnectCompleted(Exception ex, final AsyncSocket socket) { if (ex == null) { 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); } else { - ((Sendable) item).onConnectionFailed(ex.getMessage()); + sendable.onConnectionFailed(ex.getMessage()); } } }); @@ -172,10 +160,16 @@ public class ColorService extends Service { } public class ColorBinder extends Binder { - public String queueSend(LedDDaemon rec, JSONObject msg, AnswerTask answerTask) throws JSONException { - Sendable sendable = new Sendable(msg, answerTask, rec); - queue.add(sendable); - return sendable.getRef(); + public void queueSend(LedDDaemon rec, JSONObject msg, AnswerTask answerTask) { + Sendable sendable = null; + try { + sendable = new Sendable(msg, answerTask, rec); + } catch (JSONException e) { + e.printStackTrace(); + } + if (sendable != null) { + queue.add(sendable); + } } } } diff --git a/app/src/main/res/drawable-hdpi/ic_action_settings.png b/app/src/main/res/drawable-hdpi/ic_action_settings.png deleted file mode 100644 index 0eb78f7..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_action_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_add_black_48dp.png deleted file mode 100644 index a84106b..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_add_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_add_box_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_add_box_black_48dp.png deleted file mode 100644 index 99e99b1..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_add_box_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_arrow_forward_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_arrow_forward_black_48dp.png deleted file mode 100644 index a124259..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_arrow_forward_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_cancel_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_cancel_black_48dp.png deleted file mode 100644 index 98c59c1..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_cancel_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_devices_black_48dp.png b/app/src/main/res/drawable-hdpi/ic_devices_black_48dp.png deleted file mode 100644 index 3ea6e2c..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_devices_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-hdpi/ic_launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 36b4a5d..0000000 Binary files a/app/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_action_settings.png b/app/src/main/res/drawable-mdpi/ic_action_settings.png deleted file mode 100644 index c290e59..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_action_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_add_black_48dp.png deleted file mode 100644 index 3191d52..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_add_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_add_box_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_add_box_black_48dp.png deleted file mode 100644 index b591b0f..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_add_box_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_arrow_forward_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_arrow_forward_black_48dp.png deleted file mode 100644 index 27767f1..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_arrow_forward_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_cancel_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_cancel_black_48dp.png deleted file mode 100644 index 6253c0d..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_cancel_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_devices_black_48dp.png b/app/src/main/res/drawable-mdpi/ic_devices_black_48dp.png deleted file mode 100644 index dc1d46c..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_devices_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_launcher.png b/app/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 9ce85cf..0000000 Binary files a/app/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-nodpi/ic_launcher.png b/app/src/main/res/drawable-nodpi/ic_launcher.png deleted file mode 100644 index 90c0f0b..0000000 Binary files a/app/src/main/res/drawable-nodpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_action_settings.png b/app/src/main/res/drawable-xhdpi/ic_action_settings.png deleted file mode 100644 index 999d0f0..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_action_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_add_black_48dp.png deleted file mode 100644 index 3cb1092..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_add_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_add_box_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_add_box_black_48dp.png deleted file mode 100644 index fef1c75..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_add_box_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_arrow_forward_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_arrow_forward_black_48dp.png deleted file mode 100644 index 8b5a681..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_arrow_forward_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_cancel_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_cancel_black_48dp.png deleted file mode 100644 index 36116ed..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_cancel_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_devices_black_48dp.png b/app/src/main/res/drawable-xhdpi/ic_devices_black_48dp.png deleted file mode 100644 index 893ce4a..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_devices_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index fca8186..0000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_settings.png b/app/src/main/res/drawable-xxhdpi/ic_action_settings.png deleted file mode 100644 index 530227e..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_action_settings.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_black_48dp.png deleted file mode 100644 index 60cbd9c..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_add_box_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_add_box_black_48dp.png deleted file mode 100644 index b35e70e..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_add_box_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_black_48dp.png deleted file mode 100644 index 5c5eda0..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_arrow_forward_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_cancel_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_cancel_black_48dp.png deleted file mode 100644 index 02ac72a..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_cancel_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_devices_black_48dp.png b/app/src/main/res/drawable-xxhdpi/ic_devices_black_48dp.png deleted file mode 100644 index b699376..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_devices_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 0ae19d6..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_black_48dp.png deleted file mode 100644 index 1e1e4d6..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_add_box_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_add_box_black_48dp.png deleted file mode 100644 index f146877..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_add_box_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_black_48dp.png deleted file mode 100644 index c0342c7..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_arrow_forward_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_cancel_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_cancel_black_48dp.png deleted file mode 100644 index 91c0751..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_cancel_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_devices_black_48dp.png b/app/src/main/res/drawable-xxxhdpi/ic_devices_black_48dp.png deleted file mode 100644 index f8df3c3..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/ic_devices_black_48dp.png and /dev/null differ diff --git a/app/src/main/res/layout/activity_asistent.xml b/app/src/main/res/layout/activity_asistent.xml deleted file mode 100644 index b544b88..0000000 --- a/app/src/main/res/layout/activity_asistent.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - diff --git a/app/src/main/res/layout/fragment_addcontroller.xml b/app/src/main/res/layout/fragment_addcontroller.xml index edad69e..f7474a0 100644 --- a/app/src/main/res/layout/fragment_addcontroller.xml +++ b/app/src/main/res/layout/fragment_addcontroller.xml @@ -46,7 +46,7 @@ android:layout_marginLeft="7dp" android:layout_toRightOf="@id/img_host" android:gravity="center" - android:text="Add Controller" + android:text="@string/text_add_controller" android:textAppearance="?android:textAppearanceMedium" /> @@ -62,7 +62,7 @@ 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"/> @@ -79,7 +79,7 @@ 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"/> @@ -95,7 +95,7 @@ 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"/> diff --git a/app/src/main/res/layout/fragment_adddaemon.xml b/app/src/main/res/layout/fragment_adddaemon.xml index 72d1bab..1fe7b59 100644 --- a/app/src/main/res/layout/fragment_adddaemon.xml +++ b/app/src/main/res/layout/fragment_adddaemon.xml @@ -80,7 +80,7 @@ android:layout_marginBottom="5dp" android:layout_marginTop="5dp" android:gravity="center_horizontal" - android:text="or" + android:text="@string/text_or" android:textAppearance="?android:textAppearanceMedium"/> diff --git a/app/src/main/res/layout/fragment_addstripe.xml b/app/src/main/res/layout/fragment_addstripe.xml index 87a9639..221df3b 100644 --- a/app/src/main/res/layout/fragment_addstripe.xml +++ b/app/src/main/res/layout/fragment_addstripe.xml @@ -46,7 +46,7 @@ android:layout_marginLeft="7dp" android:layout_toRightOf="@id/img_host" android:gravity="center" - android:text="Choose Daemon" + android:text="@string/text_choose_daemon" android:textAppearance="?android:textAppearanceSmall" /> @@ -99,7 +99,7 @@ android:layout_marginLeft="7dp" android:layout_toRightOf="@id/img_controller" android:gravity="center" - android:text="Choose Controller" + android:text="@string/text_choose_controller" android:textAppearance="?android:textAppearanceSmall" /> @@ -151,7 +151,7 @@ android:layout_marginLeft="7dp" android:layout_toRightOf="@id/img_stripe" android:gravity="center" - android:text="Stripe Properties" + android:text="@string/text_stripe_properties" android:textAppearance="?android:textAppearanceSmall" /> @@ -169,7 +169,7 @@ 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"/> @@ -180,7 +180,7 @@ android:layout_marginLeft="9dp" android:layout_marginTop="15dp" android:gravity="center" - android:text="Channel Mapping" + android:text="@string/text_channel_mapping" android:textAppearance="?android:textAppearanceSmall" /> @@ -206,7 +206,7 @@ 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"/> @@ -231,7 +231,7 @@ 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"/> @@ -256,7 +256,7 @@ 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"/> diff --git a/app/src/main/res/layout/host_row.xml b/app/src/main/res/layout/host_row.xml index 3d3db90..1240e6c 100644 --- a/app/src/main/res/layout/host_row.xml +++ b/app/src/main/res/layout/host_row.xml @@ -41,7 +41,7 @@ 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"/> diff --git a/app/src/main/res/layout/progress.xml b/app/src/main/res/layout/progress.xml deleted file mode 100644 index 1c70830..0000000 --- a/app/src/main/res/layout/progress.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/menu/navigation_drawer.xml b/app/src/main/res/menu/navigation_drawer.xml index ce872d8..3103fae 100644 --- a/app/src/main/res/menu/navigation_drawer.xml +++ b/app/src/main/res/menu/navigation_drawer.xml @@ -23,13 +23,13 @@ android:id="@+id/nv_add_stripe" android:icon="@drawable/ic_add_circle_black_48dp" android:orderInCategory="51" - android:title="Add Stripe"/> + android:title="@string/text_add_stripe"/> + android:title="@string/test_settings"/> \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..5ebc200 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..550589b Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..e2ed79d Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..1168f35 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..0991e81 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 87d77f3..9d5b62c 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -19,9 +19,5 @@ - 16dp - 16dp - 30dp - 7dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d169048..a138fff 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -20,8 +20,21 @@ LedD - OK - Pick a color - DialogPreference with Color Picker. + Add Controller + i2c device number + controller address in hex format + channels + or + ip address[:port] + Choose Daemon + Choose Controller + Stripe Properties + Stripe name + Channel Mapping + R + G + B + Add Stripe + Settings