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

Started bug fixing.

Browse Source
This commit is contained in:
nightoftune 2019-01-31 20:54:02 +01:00
parent 015898d2d0
commit b54b30690c
12 changed files with 66 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,13 +6,13 @@ import android.bluetooth.BluetoothGattCharacteristic;
import java.util.Arrays;
import java.util.List;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
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) {
public XWatchTaskerSpec(DeviceType device) {
super(device);
}

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

@ -2,6 +2,9 @@ package nodomain.freeyourgadget.gadgetbridge.tasker.plugin;
import android.bluetooth.BluetoothGatt;
import android.bluetooth.BluetoothGattCharacteristic;
import android.os.AsyncTask;
import android.os.Handler;
import android.os.Looper;
import nodomain.freeyourgadget.gadgetbridge.service.btle.AbstractBTLEDeviceSupport;
import nodomain.freeyourgadget.gadgetbridge.service.btle.profiles.AbstractBleProfile;
@ -42,7 +45,7 @@ public class TaskerBleProfile<T extends AbstractBTLEDeviceSupport> extends Abstr
try {
run = taskerService.runForType(eventType);
} catch (NoTaskDefinedException e) {
TaskerUtil.noTaskDefinedInformation().show();
TaskerUtil.noTaskDefinedInformation();
}
if (settings.isConsumeEvent().isPresent() && settings.isConsumeEvent().get()) {
return run;

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

@ -13,7 +13,7 @@ import nodomain.freeyourgadget.gadgetbridge.tasker.spec.TaskerSpec;
*/
public enum TaskerDevice implements Serializable {
XWATCH(DeviceType.XWATCH, new XWatchTaskerSpec());
XWATCH(DeviceType.XWATCH, new XWatchTaskerSpec(DeviceType.XWATCH));
private DeviceType type;
private TaskerSpec spec;

13
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/service/TaskerUtil.java
View File

@ -1,5 +1,7 @@
package nodomain.freeyourgadget.gadgetbridge.tasker.service;
import android.os.Handler;
import android.os.Looper;
import android.widget.Toast;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
@ -33,11 +35,14 @@ public class TaskerUtil {
/**
* Creates a {@link android.widget.Toast} for the user to show that Tasker is enabled but no task is defined.
*
* @return {@link Toast}
*/
public static Toast noTaskDefinedInformation() {
return Toast.makeText(GBApplication.getContext(), R.string.tasker_no_task_defined, Toast.LENGTH_LONG);
public static void noTaskDefinedInformation() {
new Handler(Looper.getMainLooper()).post(new Runnable() {
@Override
public void run() {
Toast.makeText(GBApplication.getContext(), R.string.tasker_no_task_defined, Toast.LENGTH_LONG).show();
}
});
}
}

10
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/settings/PreferenceSettingSupplier.java
View File

@ -20,11 +20,11 @@ public final class PreferenceSettingSupplier<T> implements SettingSupplier<T> {
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()) ||
!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]))) {

32
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/settings/activities/ButtonPreference.java
View File

@ -2,7 +2,9 @@ package nodomain.freeyourgadget.gadgetbridge.tasker.settings.activities;
import android.content.Context;
import android.preference.EditTextPreference;
import android.preference.Preference;
import android.util.AttributeSet;
import android.view.MotionEvent;
import android.view.View;
import android.widget.Button;
@ -16,7 +18,7 @@ import nodomain.freeyourgadget.gadgetbridge.R;
public class ButtonPreference extends EditTextPreference {
private View.OnClickListener onClickListener;
private Button button;
private int buttonTextResource;
public ButtonPreference(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
@ -25,20 +27,36 @@ public class ButtonPreference extends EditTextPreference {
public ButtonPreference(Context context, AttributeSet attrs) {
super(context, attrs);
setWidgetLayoutResource(R.layout.button_preference_layout);
}
public ButtonPreference(Context context) {
super(context);
setWidgetLayoutResource(R.layout.button_preference_layout);
}
@Override
protected void onBindView(View view) {
super.onBindView(view);
View button = view.findViewById(R.id.tasker_button);
protected void onBindView(final View view) {
Button button = view.findViewById(R.id.tasker_button);
if (button != null) {
button.setOnClickListener(onClickListener);
this.button = (Button) button;
button.setText(buttonTextResource);
}
view.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (getDialog() != null && getDialog().isShowing()) {
return;
}
showDialog(null);
}
});
super.onBindView(view);
}
@Override
protected void onClick() {
super.onClick();
}
/**
@ -56,8 +74,6 @@ public class ButtonPreference extends EditTextPreference {
* @param resourceId {@link R.string}
*/
public void setButtonText(int resourceId) {
if (button != null) {
button.setText(resourceId);
}
buttonTextResource = resourceId;
}
}

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

@ -85,9 +85,9 @@ public class TaskerEventActivity extends AbstractSettingsActivity {
device = (TaskerDevice) getArguments().get(TaskerConstants.INTENT_DEVICE);
eventType = (TaskerEventType) getArguments().get(TaskerConstants.INTENT_EVENT);
initEnableEvent();
initAddTask();
initEnableThreshold();
initThreshold();
initAddTask();
initTasks();
}
@ -101,14 +101,6 @@ 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));
getPreferenceScreen().addPreference(enableEvent);
}
@ -129,17 +121,6 @@ public class TaskerEventActivity extends AbstractSettingsActivity {
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);
// }
enableThreshold.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
@ -160,6 +141,7 @@ public class TaskerEventActivity extends AbstractSettingsActivity {
private void initAddTask() {
addTask = new ButtonPreference(getActivity());
addTask.setTitle(R.string.tasker_task);
addTask.setButtonText(R.string.tasker_add);
addTask.setSummary(R.string.tasker_task_sum);
getPreferenceScreen().addPreference(addTask);
}
@ -191,7 +173,6 @@ public class TaskerEventActivity extends AbstractSettingsActivity {
}
private void initTasks() {
loadTasks();
addTask.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@ -200,29 +181,14 @@ 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);
loadTasks();
}
private EditTextPreference task(String key) {
final ButtonPreference task = new ButtonPreference(getActivity());
task.setKey(key);
task.setSummary(R.string.tasker_task_sum);
task.setSummary(R.string.tasker_task_name);
task.setButtonText(R.string.tasker_remove);
task.setWidgetLayoutResource(R.layout.button_preference_layout);
task.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

5
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.model.DeviceType;
import nodomain.freeyourgadget.gadgetbridge.tasker.plugin.TaskerDevice;
import nodomain.freeyourgadget.gadgetbridge.tasker.settings.SettingSupplier;
import nodomain.freeyourgadget.gadgetbridge.tasker.settings.SettingSupplierImpl;
@ -20,9 +21,9 @@ import nodomain.freeyourgadget.gadgetbridge.tasker.task.TaskerTaskProvider;
public abstract class AbstractTaskerSpec implements TaskerSpec {
private Map<TaskerEventType, TaskerSettings> settings = new HashMap<>();
private TaskerDevice device;
private DeviceType device;
protected AbstractTaskerSpec(TaskerDevice device) {
protected AbstractTaskerSpec(DeviceType device) {
this.device = device;
}

17
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/spec/PreferenceTaskerSettings.java
View File

@ -3,10 +3,12 @@ package nodomain.freeyourgadget.gadgetbridge.tasker.spec;
import android.content.SharedPreferences;
import nodomain.freeyourgadget.gadgetbridge.GBApplication;
import nodomain.freeyourgadget.gadgetbridge.model.DeviceType;
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.service.NoTaskDefinedException;
import nodomain.freeyourgadget.gadgetbridge.tasker.settings.PreferenceSettingSupplier;
import nodomain.freeyourgadget.gadgetbridge.tasker.settings.SettingSupplier;
import nodomain.freeyourgadget.gadgetbridge.tasker.settings.TaskerSettings;
@ -21,7 +23,7 @@ import nodomain.freeyourgadget.gadgetbridge.tasker.task.TaskerTaskProvider;
*/
public class PreferenceTaskerSettings implements TaskerSettings {
private TaskerDevice device;
private DeviceType device;
private TaskerEventType eventType;
private SettingSupplier<Boolean> consumingEvents;
private SettingSupplier<Boolean> enabled;
@ -29,7 +31,7 @@ public class PreferenceTaskerSettings implements TaskerSettings {
private SettingSupplier<TaskerTaskProvider> taskProvider;
private SharedPreferences preferences;
public PreferenceTaskerSettings(TaskerDevice device, TaskerEventType eventType) {
public PreferenceTaskerSettings(DeviceType device, TaskerEventType eventType) {
this.device = device;
this.eventType = eventType;
this.preferences = GBApplication.getPrefs().getPreferences();
@ -67,15 +69,14 @@ public class PreferenceTaskerSettings implements TaskerSettings {
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, "");
String taskName = preferences.getString(key, null);
if(taskName != null && !taskName.isEmpty()){
return taskName;
}
}
return null;
throw new NoTaskDefinedException();
}
@Override
public void addTask(TaskerEvent event, String task) {
preferences.edit().putString(scope(TaskerConstants.ACTIVITY_TASK).withScope(String.valueOf(event.getCount())).toString(), task).commit();
}
};
@Override

2
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/tasker/task/TaskerTask.java
View File

@ -54,7 +54,7 @@ public class TaskerTask implements Runnable {
}
}
} catch (NoTaskDefinedException e) {
TaskerUtil.noTaskDefinedInformation().show();
TaskerUtil.noTaskDefinedInformation();
}
}

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

@ -15,12 +15,4 @@ public interface TaskerTaskProvider {
*/
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);
}

7
app/src/main/res/layout/button_preference_layout.xml
View File

@ -1,14 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tasker_button_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
android:orientation="vertical"
android:clickable="true">
<Button xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tasker_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="@string/tasker_add">
android:layout_centerInParent="true">
</Button>
</RelativeLayout >