anonfunc/LedD-Android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated to latest deps, needs some rework for incoming protobuf implementation

Browse Source
This commit is contained in:
Giovanni Harting
2017-04-14 20:07:30 +02:00
parent 96a0bf9ed4
commit 97b1f37164
9 changed files with 18 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@@ -27,12 +27,9 @@ buildscript {
dependencies { dependencies {
classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1' classpath 'com.jakewharton.hugo:hugo-plugin:1.2.1'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.13.0' 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.android.application'
apply plugin: 'com.jakewharton.hugo' apply plugin: 'com.jakewharton.hugo'
apply plugin: 'com.github.ben-manes.versions' apply plugin: 'com.github.ben-manes.versions'
@@ -41,7 +38,6 @@ repositories {
maven { url "https://jitpack.io" } maven { url "https://jitpack.io" }
} }
android { android {
compileSdkVersion 25 compileSdkVersion 25
buildToolsVersion '25.0.2' buildToolsVersion '25.0.2'
@@ -81,14 +77,14 @@ android {
dependencies { dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs') compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.1.1' compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:support-v4:25.1.1' compile 'com.android.support:support-v4:25.3.1'
compile 'com.squareup.okhttp:okhttp:2.7.5' compile 'com.squareup.okhttp:okhttp:2.7.5'
compile 'com.jakewharton.timber:timber:4.5.1' compile 'com.jakewharton.timber:timber:4.5.1'
compile 'com.google.code.gson:gson:2.8.0' compile 'com.google.code.gson:gson:2.8.0'
compile 'com.jakewharton:butterknife:8.5.1' compile 'com.jakewharton:butterknife:8.5.1'
compile 'com.koushikdutta.async:androidasync:2.1.9' 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.larswerkman:HoloColorPicker:1.5@aar'
compile 'com.google.guava:guava:21.0' compile 'com.google.guava:guava:21.0'
compile 'com.thetransactioncompany:jsonrpc2-base:1.38' compile 'com.thetransactioncompany:jsonrpc2-base:1.38'

4
app/src/main/java/com/idlegandalf/ledd/ColorApplication.java
View File

@@ -81,9 +81,7 @@ public class ColorApplication extends Application {
} }
public void teardown() { 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())).apply(); PreferenceManager.getDefaultSharedPreferences(this).edit().putString("daemons", new Gson().toJson(ledDHelpers.keySet())).apply();
} }

4
app/src/main/java/com/idlegandalf/ledd/components/HSV.java
View File

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

6
app/src/main/java/com/idlegandalf/ledd/fragments/AddControllerDialog.java
View File

@@ -141,7 +141,7 @@ public class AddControllerDialog extends DialogFragment implements DialogInterfa
}); });
alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> { alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> {
AddStripeDialog.instance.onResume(); // TODO: AddStripeDialog.instance.onResume();
alertDialog.dismiss(); alertDialog.dismiss();
}); });
@@ -182,14 +182,14 @@ public class AddControllerDialog extends DialogFragment implements DialogInterfa
@Override @Override
public void onAddFailed(final int code, final String msg) { 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()); 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(); dismiss();
} }
@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), dDaemon, message), Snackbar.LENGTH_LONG).show()); 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(); dismiss();
} }
}); });

6
app/src/main/java/com/idlegandalf/ledd/fragments/AddDaemonDialog.java
View File

@@ -110,7 +110,7 @@ public class AddDaemonDialog extends DialogFragment implements DialogInterface.O
alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> { alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setOnClickListener(v -> {
mNsdManager.stopServiceDiscovery(AddDaemonDialog.this); mNsdManager.stopServiceDiscovery(AddDaemonDialog.this);
AddStripeDialog.instance.onResume(); // TODO: AddStripeDialog.instance.onResume();
alertDialog.dismiss(); alertDialog.dismiss();
}); });
@@ -275,7 +275,7 @@ public class AddDaemonDialog extends DialogFragment implements DialogInterface.O
@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(() -> 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(); 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()); getActivity().getString(R.string.snackbar_added_daemon_version, version), Snackbar.LENGTH_LONG).show());
((ColorActivity) getActivity()).refreshStripes(); ((ColorActivity) getActivity()).refreshStripes();
AddStripeDialog.instance.onResume(); // TODO: AddStripeDialog.instance.onResume();
dismiss(); dismiss();
} }
}); });

7
app/src/main/java/com/idlegandalf/ledd/fragments/AddProfileDialog.java
View File

@@ -28,6 +28,7 @@ import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.View; import android.view.View;
import android.widget.CheckBox; import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.EditText; import android.widget.EditText;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.Toast; import android.widget.Toast;
@@ -127,12 +128,10 @@ public class AddProfileDialog extends DialogFragment implements DialogInterface.
Profile profile = new Profile(nameText.getText().toString()); Profile profile = new Profile(nameText.getText().toString());
for (CheckBox c : mCheckboxes) { mCheckboxes.stream().filter(CompoundButton::isChecked).forEach(c -> {
if (c.isChecked()) {
LedStripe stripe = mStripes.get(checkboxContainer.indexOfChild(c)); LedStripe stripe = mStripes.get(checkboxContainer.indexOfChild(c));
profile.getValues().append(stripe.getId(), stripe.getColor()); profile.getValues().append(stripe.getId(), stripe.getColor());
} });
}
((ColorActivity) getActivity()).addProfile(profile); ((ColorActivity) getActivity()).addProfile(profile);
Toast.makeText(getActivity(), "Added profile " + nameText.getText().toString(), Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), "Added profile " + nameText.getText().toString(), Toast.LENGTH_SHORT).show();

2
app/src/main/java/com/idlegandalf/ledd/fragments/AddStripeDialog.java
View File

@@ -60,7 +60,6 @@ import butterknife.OnClick;
public class AddStripeDialog extends DialogFragment implements DialogInterface.OnShowListener { public class AddStripeDialog extends DialogFragment implements DialogInterface.OnShowListener {
public static AddStripeDialog instance;
@BindView(R.id.spinner_daemon) @BindView(R.id.spinner_daemon)
Spinner daemonSpinner; Spinner daemonSpinner;
@BindView(R.id.spinner_controller) @BindView(R.id.spinner_controller)
@@ -106,7 +105,6 @@ public class AddStripeDialog extends DialogFragment implements DialogInterface.O
public Dialog onCreateDialog(Bundle savedInstanceState) { public Dialog onCreateDialog(Bundle savedInstanceState) {
View v = View.inflate(getActivity(), R.layout.fragment_addstripe, null); View v = View.inflate(getActivity(), R.layout.fragment_addstripe, null);
ButterKnife.bind(this, v); ButterKnife.bind(this, v);
instance = this;
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()); AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
builder.setView(v).setPositiveButton("Add", null).setNegativeButton("Cancel", null); builder.setView(v).setPositiveButton("Add", null).setNegativeButton("Cancel", null);

2
build.gradle
View File

@@ -21,7 +21,7 @@ buildscript {
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:2.2.3' classpath 'com.android.tools.build:gradle:2.3.1'
} }
} }

4
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -1,6 +1,6 @@
#Tue Jan 31 15:43:37 CET 2017 #Fri Apr 14 19:59:17 CEST 2017
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists 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