From 97b1f371643bf6e78dd6ea766c358c64606a6c2a Mon Sep 17 00:00:00 2001 From: Giovanni Harting <539@idlegandalf.com> Date: Fri, 14 Apr 2017 20:07:30 +0200 Subject: [PATCH] updated to latest deps, needs some rework for incoming protobuf implementation --- app/build.gradle | 10 +++------- .../java/com/idlegandalf/ledd/ColorApplication.java | 4 +--- .../java/com/idlegandalf/ledd/components/HSV.java | 4 ---- .../ledd/fragments/AddControllerDialog.java | 6 +++--- .../idlegandalf/ledd/fragments/AddDaemonDialog.java | 6 +++--- .../idlegandalf/ledd/fragments/AddProfileDialog.java | 11 +++++------ .../idlegandalf/ledd/fragments/AddStripeDialog.java | 2 -- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 9 files changed, 18 insertions(+), 31 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9c0e096..777909e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,12 +27,9 @@ buildscript { dependencies { classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1' classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0' - classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8' - classpath 'com.github.JakeWharton:sdk-manager-plugin:master' } } -apply plugin: 'android-sdk-manager' apply plugin: 'com.android.application' apply plugin: 'com.jakewharton.hugo' apply plugin: 'com.github.ben-manes.versions' @@ -41,7 +38,6 @@ repositories { maven { url "https://jitpack.io" } } - android { compileSdkVersion 25 buildToolsVersion '25.0.2' @@ -81,14 +77,14 @@ android { dependencies { compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:25.1.1' - compile 'com.android.support:support-v4:25.1.1' + compile 'com.android.support:appcompat-v7:25.3.1' + compile 'com.android.support:support-v4:25.3.1' compile 'com.squareup.okhttp:okhttp:2.7.5' compile 'com.jakewharton.timber:timber:4.5.1' compile 'com.google.code.gson:gson:2.8.0' compile 'com.jakewharton:butterknife:8.5.1' compile 'com.koushikdutta.async:androidasync:2.1.9' - compile 'com.android.support:design:25.1.1' + compile 'com.android.support:design:25.3.1' compile 'com.larswerkman:HoloColorPicker:1.5@aar' compile 'com.google.guava:guava:21.0' compile 'com.thetransactioncompany:jsonrpc2-base:1.38' diff --git a/app/src/main/java/com/idlegandalf/ledd/ColorApplication.java b/app/src/main/java/com/idlegandalf/ledd/ColorApplication.java index 8f4b813..240bfeb 100644 --- a/app/src/main/java/com/idlegandalf/ledd/ColorApplication.java +++ b/app/src/main/java/com/idlegandalf/ledd/ColorApplication.java @@ -81,9 +81,7 @@ public class ColorApplication extends Application { } public void teardown() { - for (LedDHelper dHelper : ledDHelpers.values()) { - dHelper.teardown(); - } + ledDHelpers.values().forEach(LedDHelper::teardown); PreferenceManager.getDefaultSharedPreferences(this).edit().putString("daemons", new Gson().toJson(ledDHelpers.keySet())).apply(); } diff --git a/app/src/main/java/com/idlegandalf/ledd/components/HSV.java b/app/src/main/java/com/idlegandalf/ledd/components/HSV.java index fe828ca..d215fab 100644 --- a/app/src/main/java/com/idlegandalf/ledd/components/HSV.java +++ b/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() { - - } } 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 f6535b5..3a4a4aa 100644 --- a/app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java +++ b/app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java @@ -141,7 +141,7 @@ public class AddControllerDialog extends DialogFragment implements DialogInterfa }); alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> { - AddStripeDialog.instance.onResume(); + // TODO: AddStripeDialog.instance.onResume(); alertDialog.dismiss(); }); @@ -182,14 +182,14 @@ public class AddControllerDialog extends DialogFragment implements DialogInterfa @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()); - AddStripeDialog.instance.onResume(); + // 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()); - AddStripeDialog.instance.onResume(); + // TODO: AddStripeDialog.instance.onResume(); dismiss(); } }); 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 bf3b067..90e8723 100644 --- a/app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java +++ b/app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java @@ -110,7 +110,7 @@ public class AddDaemonDialog extends DialogFragment implements DialogInterface.O alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> { mNsdManager.stopServiceDiscovery(AddDaemonDialog.this); - AddStripeDialog.instance.onResume(); + // TODO: AddStripeDialog.instance.onResume(); alertDialog.dismiss(); }); @@ -275,7 +275,7 @@ public class AddDaemonDialog extends DialogFragment implements DialogInterface.O @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), ledDDaemon, message), Snackbar.LENGTH_LONG).show()); - AddStripeDialog.instance.onResume(); + // TODO: AddStripeDialog.instance.onResume(); dismiss(); } @@ -285,7 +285,7 @@ public class AddDaemonDialog extends DialogFragment implements DialogInterface.O getActivity().getString(R.string.snackbar_added_daemon_version, version), Snackbar.LENGTH_LONG).show()); ((ColorActivity) getActivity()).refreshStripes(); - AddStripeDialog.instance.onResume(); + // TODO: AddStripeDialog.instance.onResume(); dismiss(); } }); diff --git a/app/src/main/java/com/idlegandalf/ledd/fragments/AddProfileDialog.java b/app/src/main/java/com/idlegandalf/ledd/fragments/AddProfileDialog.java index 9023878..e3cc7c7 100644 --- a/app/src/main/java/com/idlegandalf/ledd/fragments/AddProfileDialog.java +++ b/app/src/main/java/com/idlegandalf/ledd/fragments/AddProfileDialog.java @@ -28,6 +28,7 @@ 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; @@ -127,12 +128,10 @@ public class AddProfileDialog extends DialogFragment implements DialogInterface. Profile profile = new Profile(nameText.getText().toString()); - for (CheckBox c : mCheckboxes) { - if (c.isChecked()) { - LedStripe stripe = mStripes.get(checkboxContainer.indexOfChild(c)); - profile.getValues().append(stripe.getId(), stripe.getColor()); - } - } + 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(); 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 5fcfe21..5baadbf 100644 --- a/app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java +++ b/app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java @@ -60,7 +60,6 @@ import butterknife.OnClick; public class AddStripeDialog extends DialogFragment implements DialogInterface.OnShowListener { - public static AddStripeDialog instance; @BindView(R.id.spinner_daemon) Spinner daemonSpinner; @BindView(R.id.spinner_controller) @@ -106,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); diff --git a/build.gradle b/build.gradle index 25c0c2a..d9e58b1 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.3' + classpath 'com.android.tools.build:gradle:2.3.1' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index d69e76f..d5cce2c 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jan 31 15:43:37 CET 2017 +#Fri Apr 14 19:59:17 CEST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip