* (0 means no signal.)
*/
- int defaultsValue();
+ int value();
}
diff --git a/opentasks/src/main/java/org/dmfs/tasks/notification/signals/SettingsSignal.java b/opentasks/src/main/java/org/dmfs/tasks/notification/signals/SettingsSignal.java
index 11c61c085..aa3bdfb0b 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/notification/signals/SettingsSignal.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/notification/signals/SettingsSignal.java
@@ -40,13 +40,13 @@ public SettingsSignal(Context context)
@Override
- public int defaultsValue()
+ public int value()
{
SharedPreferences settings = PreferenceManager.getDefaultSharedPreferences(mContext);
boolean sound = settings.getBoolean(mContext.getString(R.string.opentasks_pref_notification_sound), true);
boolean vibrate = settings.getBoolean(mContext.getString(R.string.opentasks_pref_notification_vibrate), true);
boolean lights = settings.getBoolean(mContext.getString(R.string.opentasks_pref_notification_lights), true);
- return new CustomizableSignal(sound, vibrate, lights).defaultsValue();
+ return new Lights(lights, new Vibrate(vibrate, new Sound(sound, new AllSignal()))).value();
}
}
diff --git a/opentasks/src/main/java/org/dmfs/tasks/notification/signals/Sound.java b/opentasks/src/main/java/org/dmfs/tasks/notification/signals/Sound.java
new file mode 100644
index 000000000..83f2ef819
--- /dev/null
+++ b/opentasks/src/main/java/org/dmfs/tasks/notification/signals/Sound.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 dmfs GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.dmfs.tasks.notification.signals;
+
+import android.app.Notification;
+
+
+/**
+ * {@link NotificationSignal} for representing, adding, or toggling {@link Notification#DEFAULT_SOUND}
+ * value.
+ *
+ * @author Gabor Keszthelyi
+ */
+public final class Sound extends DelegatingNotificationSignal
+{
+ public Sound(boolean enable, NotificationSignal original)
+ {
+ super(new Toggled(Notification.DEFAULT_SOUND, enable, original));
+ }
+
+
+ public Sound(NotificationSignal original)
+ {
+ super(new Toggled(Notification.DEFAULT_SOUND, true, original));
+ }
+
+
+ public Sound()
+ {
+ super(new Toggled(Notification.DEFAULT_SOUND, true, new NoSignal()));
+ }
+
+}
diff --git a/opentasks/src/main/java/org/dmfs/tasks/notification/signals/SwitchableSignal.java b/opentasks/src/main/java/org/dmfs/tasks/notification/signals/SwitchableSignal.java
index 0ed7faa43..b199f1b5c 100644
--- a/opentasks/src/main/java/org/dmfs/tasks/notification/signals/SwitchableSignal.java
+++ b/opentasks/src/main/java/org/dmfs/tasks/notification/signals/SwitchableSignal.java
@@ -20,24 +20,26 @@
/**
- * {@link NotificationSignal} that delegates to either {@link NoSignal} or {@link SettingsSignal} based on the received boolean.
+ * {@link NotificationSignal} that evaluates to either {@link NoSignal} or {@link SettingsSignal} based on the received boolean.
*
* @author Gabor Keszthelyi
*/
public final class SwitchableSignal implements NotificationSignal
{
- private final NotificationSignal mDelegate;
+ private final Context mContext;
+ private final boolean mWithoutSignal;
public SwitchableSignal(Context context, boolean withoutSignal)
{
- mDelegate = withoutSignal ? new NoSignal() : new SettingsSignal(context);
+ mContext = context;
+ mWithoutSignal = withoutSignal;
}
@Override
- public int defaultsValue()
+ public int value()
{
- return mDelegate.defaultsValue();
+ return (mWithoutSignal ? new NoSignal() : new SettingsSignal(mContext)).value();
}
}
diff --git a/opentasks/src/main/java/org/dmfs/tasks/notification/signals/Toggled.java b/opentasks/src/main/java/org/dmfs/tasks/notification/signals/Toggled.java
new file mode 100644
index 000000000..ae8d9fd0b
--- /dev/null
+++ b/opentasks/src/main/java/org/dmfs/tasks/notification/signals/Toggled.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2017 dmfs GmbH
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.dmfs.tasks.notification.signals;
+
+import android.app.Notification;
+
+import org.dmfs.tasks.utils.BitFlagUtils;
+
+
+/**
+ * Decorator for {@link NotificationSignal} that toggles a flag value. Flag must be one of
+ * {@link Notification#DEFAULT_LIGHTS}, {@link Notification#DEFAULT_SOUND}, {@link Notification#DEFAULT_VIBRATE}.
+ *
+ * Intended for internal use in the package only since it exposes the bit flag mechanism. + * + * @author Gabor Keszthelyi + */ +final class Toggled implements NotificationSignal +{ + private final int mFlag; + private final boolean mEnable; + private final NotificationSignal mOriginal; + + + /** + * @param flag + * must be one of {@link Notification#DEFAULT_LIGHTS}, {@link Notification#DEFAULT_SOUND}, {@link Notification#DEFAULT_VIBRATE} + */ + Toggled(int flag, boolean enable, NotificationSignal original) + { + if (flag != Notification.DEFAULT_VIBRATE && flag != Notification.DEFAULT_SOUND && flag != Notification.DEFAULT_LIGHTS) + { + throw new IllegalArgumentException("Notification signal flag is not valid: " + flag); + } + mFlag = flag; + mEnable = enable; + mOriginal = original; + } + + + @Override + public int value() + { + return mEnable ? BitFlagUtils.addFlag(mOriginal.value(), mFlag) : mOriginal.value(); + } +} diff --git a/opentasks/src/main/java/org/dmfs/tasks/notification/signals/Vibrate.java b/opentasks/src/main/java/org/dmfs/tasks/notification/signals/Vibrate.java new file mode 100644 index 000000000..c163d41cf --- /dev/null +++ b/opentasks/src/main/java/org/dmfs/tasks/notification/signals/Vibrate.java @@ -0,0 +1,47 @@ +/* + * Copyright 2017 dmfs GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.dmfs.tasks.notification.signals; + +import android.app.Notification; + + +/** + * {@link NotificationSignal} for representing, adding, or toggling {@link Notification#DEFAULT_VIBRATE} + * value. + * + * @author Gabor Keszthelyi + */ +public final class Vibrate extends DelegatingNotificationSignal +{ + public Vibrate(boolean enable, NotificationSignal original) + { + super(new Toggled(Notification.DEFAULT_VIBRATE, enable, original)); + } + + + public Vibrate(NotificationSignal original) + { + super(new Toggled(Notification.DEFAULT_VIBRATE, true, original)); + } + + + public Vibrate() + { + super(new Toggled(Notification.DEFAULT_VIBRATE, true, new NoSignal())); + } + +} diff --git a/opentasks/src/test/java/org/dmfs/tasks/notification/signals/ToggledTest.java b/opentasks/src/test/java/org/dmfs/tasks/notification/signals/ToggledTest.java new file mode 100644 index 000000000..70ac4d04a --- /dev/null +++ b/opentasks/src/test/java/org/dmfs/tasks/notification/signals/ToggledTest.java @@ -0,0 +1,62 @@ +/* + * Copyright 2017 dmfs GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.dmfs.tasks.notification.signals; + +import android.app.Notification; + +import org.junit.Test; + +import static org.dmfs.tasks.utils.BitFlagUtils.containsFlag; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; + + +/** + * Unit test for {@link Toggled}. + * + * @author Gabor Keszthelyi + */ +public final class ToggledTest +{ + @Test + public void testValidFlags() + { + new Toggled(Notification.DEFAULT_SOUND, true, new NoSignal()); + new Toggled(Notification.DEFAULT_VIBRATE, true, new NoSignal()); + new Toggled(Notification.DEFAULT_LIGHTS, true, new NoSignal()); + } + + + @Test(expected = IllegalArgumentException.class) + public void testInValidFlag() + { + new Toggled(15, true, new NoSignal()); + } + + + @Test + public void testAddingFlag() + { + assertTrue(containsFlag( + new Toggled(Notification.DEFAULT_SOUND, true, new NoSignal()).value(), + Notification.DEFAULT_SOUND)); + + assertFalse(containsFlag( + new Toggled(Notification.DEFAULT_SOUND, false, new NoSignal()).value(), + Notification.DEFAULT_SOUND)); + } +}