demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2025-02-10 23:57:31 +01:00
Code Issues 1 Packages Projects Releases Wiki Activity

Added all tasker plugin classes.

Browse Source
This commit is contained in:
nightoftune 2019-01-27 20:19:31 +01:00
parent 3fb1c703a7
commit 015898d2d0
10 changed files with 289 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/xwatch/XWatchTaskerSpec.java
View File

@ -7,10 +7,15 @@ import java.util.Arrays;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.tasker.event.TaskerEventType;
import nodomain.freeyourgadget.gadgetbridge.tasker.plugin.TaskerDevice;
import nodomain.freeyourgadget.gadgetbridge.tasker.spec.AbstractTaskerSpec;
public class XWatchTaskerSpec extends AbstractTaskerSpec {
protected XWatchTaskerSpec(TaskerDevice device) {
super(device);
}
@Override
public TaskerEventType getEventType(BluetoothGatt gatt, BluetoothGattCharacteristic characteristic) {
if (XWatchService.UUID_NOTIFY.equals(characteristic.getUuid())) {

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/plugin/TaskerBleProfile.java
View File

@ -44,7 +44,7 @@ public class TaskerBleProfile<T extends AbstractBTLEDeviceSupport> extends Abstr
} catch (NoTaskDefinedException e) {
TaskerUtil.noTaskDefinedInformation().show();
}
if (settings.isConsumingEvents().isPresent() && settings.isConsumingEvents().get()) {
if (settings.isConsumeEvent().isPresent() && settings.isConsumeEvent().get()) {
return run;
}
}

1
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/plugin/TaskerConstants.java
View File

@ -31,6 +31,7 @@ public class TaskerConstants {
* Correspond to {@link nodomain.freeyourgadget.gadgetbridge.tasker.settings.activities.TaskerEventActivity}.
*/
public static final String ACTIVITY_TASK_ADD = "act_tasker_task_add";
public static final ScopedString ACTIVITY_CONSUME_EVENT = new ScopedString("act_tasker_consume_event");
public static final ScopedString ACTIVITY_THRESHOLD = new ScopedString("act_tasker_threshold");
public static final ScopedString ACTIVITY_TASK = new ScopedString("act_tasker_task");
public static final ScopedString ACTIVITY_THRESHOLD_ENABLED = new ScopedString("act_tasker_threshold_enabled");

102
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/settings/PreferenceSettingSupplier.java Normal file
View File

@ -0,0 +1,102 @@
package nodomain.freeyourgadget.gadgetbridge.tasker.settings;
import android.content.SharedPreferences;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.HashSet;
import java.util.Set;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
public final class PreferenceSettingSupplier<T> implements SettingSupplier<T> {
private String key;
private Class<T> type;
private SharedPreferences sharedPreferences;
public PreferenceSettingSupplier(String key, Type type) {
if (key == null || key.isEmpty()) {
throw new SettingsException("Undefined", "Key can not be empty!");
}
if (type == null ||
!Boolean.class.isAssignableFrom(type.getClass()) ||
!Long.class.isAssignableFrom(type.getClass()) ||
!Integer.class.isAssignableFrom(type.getClass()) ||
!Float.class.isAssignableFrom(type.getClass()) ||
!String.class.isAssignableFrom(type.getClass()) ||
(Set.class.isAssignableFrom(type.getClass()) &&
!(((ParameterizedType) type).getActualTypeArguments()[0] instanceof Class) &&
!String.class.isAssignableFrom((Class<?>) ((ParameterizedType) type).getActualTypeArguments()[0]))) {
throw new SettingsException(key, "Type is must be one of [types={Boolean,Long,Integer,Float,String, Set<String>}]");
}
this.key = key;
this.type = (Class<T>) ((type instanceof Class) ? type : ((ParameterizedType) type).getRawType());
this.sharedPreferences = GBApplication.getPrefs().getPreferences();
}
@Override
public T get() {
if (!isPresent()) {
return null;
}
if (Boolean.class.isAssignableFrom(type)) {
return (T) Boolean.valueOf(sharedPreferences.getBoolean(key, false));
}
if (Long.class.isAssignableFrom(type)) {
return (T) Long.valueOf(sharedPreferences.getLong(key, 0L));
}
if (Integer.class.isAssignableFrom(type)) {
return (T) Integer.valueOf(sharedPreferences.getInt(key, 0));
}
if (Float.class.isAssignableFrom(type)) {
return (T) Float.valueOf(sharedPreferences.getFloat(key, 0F));
}
if (Set.class.isAssignableFrom(type)) {
return (T) sharedPreferences.getStringSet(key, new HashSet<String>());
}
return (T) sharedPreferences.getString(key, "");
}
@Override
public void set(T object) {
if (object == null) {
sharedPreferences.edit().remove(key).commit();
}
if (Boolean.class.isAssignableFrom(type)) {
sharedPreferences.edit().putBoolean(key, (Boolean) object).commit();
}
if (Long.class.isAssignableFrom(type)) {
sharedPreferences.edit().putLong(key, (Long) object).commit();
}
if (Integer.class.isAssignableFrom(type)) {
sharedPreferences.edit().putInt(key, (Integer) object).commit();
}
if (Float.class.isAssignableFrom(type)) {
sharedPreferences.edit().putFloat(key, (Float) object).commit();
}
if (Set.class.isAssignableFrom(type)) {
sharedPreferences.edit().putStringSet(key, (Set<String>) object).commit();
}
if (String.class.isAssignableFrom(type)) {
sharedPreferences.edit().putString(key, (String) object).commit();
}
}
@Override
public boolean isPresent() {
return sharedPreferences.contains(key);
}
@Override
public SettingSupplier<T> onChanged(final SettingListener<T> onChanged) {
sharedPreferences.registerOnSharedPreferenceChangeListener(new SharedPreferences.OnSharedPreferenceChangeListener() {
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
onChanged.changed(get());
}
});
return this;
}
}

13
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/settings/SettingsException.java Normal file
View File

@ -0,0 +1,13 @@
package nodomain.freeyourgadget.gadgetbridge.tasker.settings;
public class SettingsException extends RuntimeException {
public SettingsException(String setting, String message) {
super("Exception in setting [name=" + setting + "]: " + message);
}
public SettingsException(String setting, String message, Throwable cause) {
super("Exception in setting [name=" + setting + "]: " + message, cause);
}
}

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/settings/TaskerSettings.java
View File

@ -18,7 +18,7 @@ public interface TaskerSettings {
*
* @return True if consumes events.
*/
SettingSupplier<Boolean> isConsumingEvents();
SettingSupplier<Boolean> isConsumeEvent();
/**
* Enables the settings.

83
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/settings/activities/TaskerEventActivity.java
View File

@ -70,7 +70,6 @@ public class TaskerEventActivity extends AbstractSettingsActivity {
private TaskerDevice device;
private TaskerEventType eventType;
private TaskerSettings settings;
private Prefs prefs = GBApplication.getPrefs();
private SwitchPreference enableEvent;
@ -85,7 +84,6 @@ public class TaskerEventActivity extends AbstractSettingsActivity {
setPreferenceScreen(getPreferenceManager().createPreferenceScreen(getActivity()));
device = (TaskerDevice) getArguments().get(TaskerConstants.INTENT_DEVICE);
eventType = (TaskerEventType) getArguments().get(TaskerConstants.INTENT_EVENT);
settings = device.getSpec().getSettings(eventType);
initEnableEvent();
initAddTask();
initEnableThreshold();
@ -103,14 +101,14 @@ public class TaskerEventActivity extends AbstractSettingsActivity {
enableEvent = new SwitchPreference(getActivity());
enableEvent.setKey(key);
enableEvent.setTitle(R.string.tasker_event_enabled);
enableEvent.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
settings.isEnabled().set((Boolean) newValue);
return true;
}
});
settings.isEnabled().set(prefs.getBoolean(key, false));
// enableEvent.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
// @Override
// public boolean onPreferenceChange(Preference preference, Object newValue) {
// settings.isEnabled().set((Boolean) newValue);
// return true;
// }
// });
// settings.isEnabled().set(prefs.getBoolean(key, false));
getPreferenceScreen().addPreference(enableEvent);
}
@ -124,24 +122,24 @@ public class TaskerEventActivity extends AbstractSettingsActivity {
}
private void initThreshold() {
String key = scoped(TaskerConstants.ACTIVITY_THRESHOLD);
final String key = scoped(TaskerConstants.ACTIVITY_THRESHOLD);
threshold = new NumberPreference(getActivity());
threshold.setKey(key);
threshold.setTitle(R.string.tasker_threshold);
threshold.setSummary(R.string.tasker_threshold_sum);
threshold.getNumberPicker().setMinValue(50);
threshold.getNumberPicker().setMaxValue(10000);
setThresholdIfDefined(settings);
threshold.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
settings.getThreshold().set(Long.valueOf(newValue.toString()));
return true;
}
});
if (prefs.getBoolean(scoped(TaskerConstants.ACTIVITY_THRESHOLD_ENABLED), false)) {
settings.getThreshold().set(null);
}
// setThresholdIfDefined(settings);
// threshold.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
// @Override
// public boolean onPreferenceChange(Preference preference, Object newValue) {
// settings.getThreshold().set(Long.valueOf(newValue.toString()));
// return true;
// }
// });
// if (prefs.getBoolean(scoped(TaskerConstants.ACTIVITY_THRESHOLD_ENABLED), false)) {
// settings.getThreshold().set(null);
// }
enableThreshold.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
@ -151,10 +149,8 @@ public class TaskerEventActivity extends AbstractSettingsActivity {
getPreferenceScreen().removePreference(taskPreference);
}
}
settings.getThreshold().set(null);
return true;
prefs.getPreferences().edit().remove(key).commit();
}
setThresholdIfDefined(settings);
return true;
}
});
@ -173,13 +169,6 @@ public class TaskerEventActivity extends AbstractSettingsActivity {
return scopedString.withScope(device.name()).withScope(eventType.getType()).toString();
}
private void setThresholdIfDefined(TaskerSettings settings) {
long thresholdValue = prefs.getLong(scoped(TaskerConstants.ACTIVITY_THRESHOLD), 0L);
if (thresholdValue != 0L) {
settings.getThreshold().set(prefs.getLong(scoped(TaskerConstants.ACTIVITY_THRESHOLD), 50L));
}
}
private void loadTasks() {
tasks = new ArrayList<>();
for (int i = 0; i < 10; i++) {
@ -211,21 +200,21 @@ public class TaskerEventActivity extends AbstractSettingsActivity {
}
}
});
TaskerTaskProvider taskerTaskProvider = new TaskerTaskProvider() {
@Override
public String getTask(TaskerEvent event) {
if (event.getCount() < tasks.size()) {
String text = tasks.get(event.getCount()).getText();
if (text == null || StringUtils.isEmpty(text)) {
throw new NoTaskDefinedException();
}
return text;
}
return null;
}
};
settings.getTaskProvider().set(taskerTaskProvider);
// TaskerTaskProvider taskerTaskProvider = new TaskerTaskProvider() {
// @Override
// public String getTask(TaskerEvent event) {
// if (event.getCount() < tasks.size()) {
// String text = tasks.get(event.getCount()).getText();
// if (text == null || StringUtils.isEmpty(text)) {
// throw new NoTaskDefinedException();
// }
// return text;
// }
// return null;
// }
//
// };
// settings.getTaskProvider().set(taskerTaskProvider);
}
private EditTextPreference task(String key) {

38
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/spec/AbstractTaskerSpec.java
View File

@ -3,6 +3,7 @@ package nodomain.freeyourgadget.gadgetbridge.tasker.spec;
import java.util.HashMap;
import java.util.Map;
import nodomain.freeyourgadget.gadgetbridge.tasker.plugin.TaskerDevice;
import nodomain.freeyourgadget.gadgetbridge.tasker.settings.SettingSupplier;
import nodomain.freeyourgadget.gadgetbridge.tasker.settings.SettingSupplierImpl;
import nodomain.freeyourgadget.gadgetbridge.tasker.event.TaskerEventType;
@ -19,6 +20,11 @@ import nodomain.freeyourgadget.gadgetbridge.tasker.task.TaskerTaskProvider;
public abstract class AbstractTaskerSpec implements TaskerSpec {
private Map<TaskerEventType, TaskerSettings> settings = new HashMap<>();
private TaskerDevice device;
protected AbstractTaskerSpec(TaskerDevice device) {
this.device = device;
}
@Override
public TaskerSettings getSettings(TaskerEventType eventType) {
@ -26,43 +32,15 @@ public abstract class AbstractTaskerSpec implements TaskerSpec {
if (!getSupportedTypes().contains(eventType)) {
settings.put(eventType, new NoOpTaskerSettings());
} else {
settings.put(eventType, new SimpleTaskerSettings());
settings.put(eventType, new PreferenceTaskerSettings(device, eventType));
}
}
return settings.get(eventType);
}
private class SimpleTaskerSettings implements TaskerSettings {
private SettingSupplier<Boolean> consumingEvents = new SettingSupplierImpl<>();
private SettingSupplier<Boolean> enabled = new SettingSupplierImpl<>();
private SettingSupplier<Long> threshold = new SettingSupplierImpl<>();
private SettingSupplier<TaskerTaskProvider> taskProvider = new SettingSupplierImpl<>();
@Override
public SettingSupplier<Boolean> isConsumingEvents() {
return consumingEvents;
}
@Override
public SettingSupplier<Boolean> isEnabled() {
return enabled;
}
@Override
public SettingSupplier<Long> getThreshold() {
return threshold;
}
@Override
public SettingSupplier<TaskerTaskProvider> getTaskProvider() {
return taskProvider;
}
}
private class NoOpTaskerSettings implements TaskerSettings {
@Override
public SettingSupplier<Boolean> isConsumingEvents() {
public SettingSupplier<Boolean> isConsumeEvent() {
return new NoOpSupplier<>();
}

113
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/spec/PreferenceTaskerSettings.java Normal file
View File

@ -0,0 +1,113 @@
package nodomain.freeyourgadget.gadgetbridge.tasker.spec;
import android.content.SharedPreferences;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.tasker.event.TaskerEvent;
import nodomain.freeyourgadget.gadgetbridge.tasker.event.TaskerEventType;
import nodomain.freeyourgadget.gadgetbridge.tasker.plugin.TaskerConstants;
import nodomain.freeyourgadget.gadgetbridge.tasker.plugin.TaskerDevice;
import nodomain.freeyourgadget.gadgetbridge.tasker.settings.PreferenceSettingSupplier;
import nodomain.freeyourgadget.gadgetbridge.tasker.settings.SettingSupplier;
import nodomain.freeyourgadget.gadgetbridge.tasker.settings.TaskerSettings;
import nodomain.freeyourgadget.gadgetbridge.tasker.settings.activities.TaskerEventActivity;
import nodomain.freeyourgadget.gadgetbridge.tasker.task.TaskerTaskProvider;
/**
* {@link SharedPreferences} implementation of {@link TaskerSettings}.
* Scoped with {@link TaskerDevice} and {@link TaskerEventType}.
* <p>
* If used the user settings are already implemented with {@link TaskerEventActivity}.
*/
public class PreferenceTaskerSettings implements TaskerSettings {
private TaskerDevice device;
private TaskerEventType eventType;
private SettingSupplier<Boolean> consumingEvents;
private SettingSupplier<Boolean> enabled;
private SettingSupplier<Long> threshold;
private SettingSupplier<TaskerTaskProvider> taskProvider;
private SharedPreferences preferences;
public PreferenceTaskerSettings(TaskerDevice device, TaskerEventType eventType) {
this.device = device;
this.eventType = eventType;
this.preferences = GBApplication.getPrefs().getPreferences();
consumingEvents = new PreferenceSettingSupplier<>(scope(TaskerConstants.ACTIVITY_CONSUME_EVENT).toString(), Boolean.class);
enabled = new PreferenceSettingSupplier<>(scope(TaskerConstants.ACTIVITY_EVENT_ENABLED).toString(), Boolean.class);
threshold = new PreferenceSettingSupplier<>(scope(TaskerConstants.ACTIVITY_THRESHOLD).toString(), Long.class);
taskProvider = new TaskerTaskProviderPreferenceSettingSupplier();
}
@Override
public SettingSupplier<Boolean> isConsumeEvent() {
return consumingEvents;
}
@Override
public SettingSupplier<Boolean> isEnabled() {
return enabled;
}
@Override
public SettingSupplier<Long> getThreshold() {
return threshold;
}
@Override
public SettingSupplier<TaskerTaskProvider> getTaskProvider() {
return taskProvider;
}
private class TaskerTaskProviderPreferenceSettingSupplier implements SettingSupplier<TaskerTaskProvider> {
private TaskerTaskProvider provider = new TaskerTaskProvider() {
@Override
public String getTask(TaskerEvent event) {
String key = scope(TaskerConstants.ACTIVITY_TASK).withScope(String.valueOf(event.getCount())).toString();
if (event.getType().equals(eventType) && preferences.contains(key)) {
return preferences.getString(key, "");
}
return null;
}
@Override
public void addTask(TaskerEvent event, String task) {
preferences.edit().putString(scope(TaskerConstants.ACTIVITY_TASK).withScope(String.valueOf(event.getCount())).toString(), task).commit();
}
};
@Override
public TaskerTaskProvider get() {
return provider;
}
@Override
public void set(TaskerTaskProvider object) {
// Not supported
}
@Override
public boolean isPresent() {
return true;
}
@Override
public SettingSupplier<TaskerTaskProvider> onChanged(final SettingListener<TaskerTaskProvider> onChanged) {
preferences.registerOnSharedPreferenceChangeListener(new SharedPreferences.OnSharedPreferenceChangeListener() {
@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
if (key.startsWith(scope(TaskerConstants.ACTIVITY_TASK).toString())) {
onChanged.changed(get());
}
}
});
return this;
}
}
private TaskerConstants.ScopedString scope(TaskerConstants.ScopedString constant) {
return constant.withScope(device.name()).withScope(eventType.getType());
}
}

10
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/task/TaskerTaskProvider.java
View File

@ -10,9 +10,17 @@ public interface TaskerTaskProvider {
/**
* Task name for specific {@link TaskerEvent}
*
* @param event
* @param event {@link TaskerEvent}
* @return Task name
*/
String getTask(TaskerEvent event);
/**
* Add a task to the task provider and specific {@link TaskerEvent}.
*
* @param event {@link TaskerEvent}
* @param task Task name
*/
void addTask(TaskerEvent event, String task);
}