From 4beacfffd7c8b5164434699a8ec3b8c9426022aa Mon Sep 17 00:00:00 2001
From: Just-D-A
Date: Sun, 11 Oct 2020 17:40:34 +0300
Subject: [PATCH 1/7] add DismissAlarmIntentBuilder
---
.../omegaintentbuilder/OmegaIntentBuilder.kt | 7 +++++-
.../builders/DismissAlarmIntentBuilder.kt | 22 +++++++++++++++++++
.../omegaintentbuilder/MainActivity.java | 10 +++++++++
.../src/main/res/layout/activity_main.xml | 7 ++++++
examples/src/main/res/values/strings.xml | 1 +
5 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
index 64597ce..5ed91f7 100644
--- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
@@ -163,4 +163,9 @@ object OmegaIntentBuilder {
@RequiresApi(Build.VERSION_CODES.KITKAT)
fun createAlarm() = AlarmIntentBuilder()
-}
\ No newline at end of file
+ /**
+ * @return DismissAlarmIntentBuilder
+ */
+ @JvmStatic
+ fun dismissAlarm() = DismissAlarmIntentBuilder()
+}
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
new file mode 100644
index 0000000..83388f9
--- /dev/null
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
@@ -0,0 +1,22 @@
+package com.omega_r.libs.omegaintentbuilder.builders
+
+import android.content.Context
+import android.content.Intent
+import android.os.Build
+import android.provider.AlarmClock
+import android.provider.AlarmClock.*
+import androidx.annotation.RequiresApi
+
+class DismissAlarmIntentBuilder : BaseActivityBuilder() {
+
+ @RequiresApi(Build.VERSION_CODES.M)
+ override fun createIntent(context: Context): Intent {
+ return Intent(ACTION_DISMISS_ALARM)/*.apply {
+ putExtra(EXTRA_ALARM_SEARCH_MODE, ALARM_SEARCH_MODE_TIME)
+ putExtra(EXTRA_IS_PM, true);
+ putExtra(EXTRA_HOUR, 2);
+ putExtra(EXTRA_MINUTES, 19);
+ }*/
+ }
+
+}
\ No newline at end of file
diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
index 942cab0..7dde5da 100644
--- a/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
+++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
@@ -44,6 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
findViewById(R.id.button_insert_contact).setOnClickListener(this);
findViewById(R.id.button_search_web).setOnClickListener(this);
findViewById(R.id.button_create_timer).setOnClickListener(this);
+ findViewById(R.id.button_dismiss_alarm).setOnClickListener(this);
}
@Override
@@ -109,6 +110,9 @@ public void onClick(View v) {
case R.id.button_create_timer:
onCreateTimerClicked();
break;
+ case R.id.button_dismiss_alarm:
+ onDismissAlarmClicked();
+ break;
}
}
@@ -313,4 +317,10 @@ private void onCreateTimerClicked() {
.startActivity(this);
}
+ private void onDismissAlarmClicked() {
+ OmegaIntentBuilder
+ .dismissAlarm()
+ .startActivity(this);
+ }
+
}
diff --git a/examples/src/main/res/layout/activity_main.xml b/examples/src/main/res/layout/activity_main.xml
index 85eeb6a..6643a7b 100644
--- a/examples/src/main/res/layout/activity_main.xml
+++ b/examples/src/main/res/layout/activity_main.xml
@@ -167,6 +167,13 @@
android:theme="@style/ButtonStyle"
android:text="@string/create_timer"/>
+
+
\ No newline at end of file
diff --git a/examples/src/main/res/values/strings.xml b/examples/src/main/res/values/strings.xml
index 40af145..242e144 100644
--- a/examples/src/main/res/values/strings.xml
+++ b/examples/src/main/res/values/strings.xml
@@ -25,4 +25,5 @@
Create Timer
Insert Contact
Search Web
+ Dismiss Alarm
From 2ca14c81dc56f36cff71626584a629f30c551647 Mon Sep 17 00:00:00 2001
From: just-d-a
Date: Mon, 12 Oct 2020 10:40:22 +0300
Subject: [PATCH 2/7] add SearchMode Label
---
.../builders/DismissAlarmIntentBuilder.kt | 19 ++++++++++++-------
.../omegaintentbuilder/MainActivity.java | 1 +
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
index 83388f9..e1d8eba 100644
--- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
@@ -3,20 +3,25 @@ package com.omega_r.libs.omegaintentbuilder.builders
import android.content.Context
import android.content.Intent
import android.os.Build
-import android.provider.AlarmClock
import android.provider.AlarmClock.*
import androidx.annotation.RequiresApi
class DismissAlarmIntentBuilder : BaseActivityBuilder() {
+ private var label: String? = null
+
+ fun label(label: String): DismissAlarmIntentBuilder {
+ this.label = label
+ return this
+ }
@RequiresApi(Build.VERSION_CODES.M)
override fun createIntent(context: Context): Intent {
- return Intent(ACTION_DISMISS_ALARM)/*.apply {
- putExtra(EXTRA_ALARM_SEARCH_MODE, ALARM_SEARCH_MODE_TIME)
- putExtra(EXTRA_IS_PM, true);
- putExtra(EXTRA_HOUR, 2);
- putExtra(EXTRA_MINUTES, 19);
- }*/
+ return Intent(ACTION_DISMISS_ALARM).apply {
+ label?.let {
+ putExtra(EXTRA_ALARM_SEARCH_MODE, ALARM_SEARCH_MODE_LABEL)
+ putExtra(EXTRA_MESSAGE, it)
+ }
+ }
}
}
\ No newline at end of file
diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
index 7dde5da..219e935 100644
--- a/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
+++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
@@ -320,6 +320,7 @@ private void onCreateTimerClicked() {
private void onDismissAlarmClicked() {
OmegaIntentBuilder
.dismissAlarm()
+ // .label("It's your alarm")
.startActivity(this);
}
From dd8c08281d79f780d4436b1480f627e523c6a736 Mon Sep 17 00:00:00 2001
From: just-d-a
Date: Mon, 12 Oct 2020 12:15:34 +0300
Subject: [PATCH 3/7] add dismiss alarm feature
---
.../omegaintentbuilder/OmegaIntentBuilder.kt | 1 +
.../builders/DismissAlarmIntentBuilder.kt | 19 ++++++-------------
.../omegaintentbuilder/MainActivity.java | 1 -
3 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
index 5ed91f7..cc78621 100644
--- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
@@ -167,5 +167,6 @@ object OmegaIntentBuilder {
* @return DismissAlarmIntentBuilder
*/
@JvmStatic
+ @RequiresApi(Build.VERSION_CODES.M)
fun dismissAlarm() = DismissAlarmIntentBuilder()
}
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
index e1d8eba..a40f948 100644
--- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
@@ -2,25 +2,18 @@ package com.omega_r.libs.omegaintentbuilder.builders
import android.content.Context
import android.content.Intent
-import android.os.Build
import android.provider.AlarmClock.*
-import androidx.annotation.RequiresApi
class DismissAlarmIntentBuilder : BaseActivityBuilder() {
- private var label: String? = null
- fun label(label: String): DismissAlarmIntentBuilder {
- this.label = label
- return this
- }
-
- @RequiresApi(Build.VERSION_CODES.M)
+ /**
+ * If exactly one active alarm exists, it is dismissed.
+ * If more than one active alarm exists, the user is prompted to choose the alarm to
+ * dismiss.
+ */
override fun createIntent(context: Context): Intent {
return Intent(ACTION_DISMISS_ALARM).apply {
- label?.let {
- putExtra(EXTRA_ALARM_SEARCH_MODE, ALARM_SEARCH_MODE_LABEL)
- putExtra(EXTRA_MESSAGE, it)
- }
+ putExtra(EXTRA_ALARM_SEARCH_MODE, ALARM_SEARCH_MODE_ALL);
}
}
diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
index 219e935..7dde5da 100644
--- a/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
+++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
@@ -320,7 +320,6 @@ private void onCreateTimerClicked() {
private void onDismissAlarmClicked() {
OmegaIntentBuilder
.dismissAlarm()
- // .label("It's your alarm")
.startActivity(this);
}
From 1af50615a8087a04a44af848cf4144a35e7de0f2 Mon Sep 17 00:00:00 2001
From: just-d-a
Date: Mon, 12 Oct 2020 13:55:08 +0300
Subject: [PATCH 4/7] add Search Modes
---
.../builders/DismissAlarmIntentBuilder.kt | 102 +++++++++++++++++-
.../omegaintentbuilder/MainActivity.java | 9 ++
2 files changed, 110 insertions(+), 1 deletion(-)
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
index a40f948..d62856e 100644
--- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
@@ -6,6 +6,83 @@ import android.provider.AlarmClock.*
class DismissAlarmIntentBuilder : BaseActivityBuilder() {
+ private var hour: Int? = null
+ private var minute: Int? = null
+ private var isPM: Boolean? = null
+ private var label: String? = null
+ private var next: Boolean? = null
+
+ /**
+ *
+ * The value is an {@link Integer} and ranges from 0 to 23.
+ *
+ *
+ * @param hour Integer
+ * @return This DismissAlarmIntentBuilder for method chaining
+ */
+ fun hour(hour: Int): DismissAlarmIntentBuilder {
+ label = null
+ next = null
+ this.hour = hour
+ return this
+ }
+
+ /**
+ *
+ * The value is an {@link Integer} and ranges from 0 to 59. If not provided, it defaults to 0.
+ *
+ *
+ * @param minute Integer
+ * @return This DismissAlarmIntentBuilder for method chaining
+ */
+ fun minute(minute: Int): DismissAlarmIntentBuilder {
+ label = null
+ next = null
+ this.minute = minute
+ return this
+ }
+
+ /**
+ *
+ * The value is an {@link Integer} and ranges from 0 to 59. If not provided, it defaults to 0.
+ *
+ *
+ * @param isPM Integer
+ * @return This DismissAlarmIntentBuilder for method chaining
+ */
+ fun isPM(isPM: Boolean): DismissAlarmIntentBuilder {
+ label = null
+ next = null
+ this.isPM = isPM
+ return this
+ }
+
+ /**
+ * Search alarm by label
+ *
+ * @param label String
+ * @return This DismissAlarmIntentBuilder for method chaining
+ */
+ fun label(label: String): DismissAlarmIntentBuilder {
+ hour = null
+ minute = null
+ isPM = null
+ next = null
+ this.label = label
+ return this
+ }
+
+ /**
+ * For activate search mode NEXT
+ * Search next alarm
+ *
+ * @return This DismissAlarmIntentBuilder for method chaining
+ */
+ fun next(): DismissAlarmIntentBuilder {
+ next = true
+ return this
+ }
+
/**
* If exactly one active alarm exists, it is dismissed.
* If more than one active alarm exists, the user is prompted to choose the alarm to
@@ -13,7 +90,30 @@ class DismissAlarmIntentBuilder : BaseActivityBuilder() {
*/
override fun createIntent(context: Context): Intent {
return Intent(ACTION_DISMISS_ALARM).apply {
- putExtra(EXTRA_ALARM_SEARCH_MODE, ALARM_SEARCH_MODE_ALL);
+ if (hour != null && minute != null && isPM != null) {
+ putExtra(EXTRA_ALARM_SEARCH_MODE, ALARM_SEARCH_MODE_TIME)
+
+ hour?.let {
+ putExtra(EXTRA_HOUR, it)
+ }
+
+ minute?.let {
+ putExtra(EXTRA_MINUTES, it)
+ }
+
+ isPM?.let {
+ putExtra(EXTRA_IS_PM, it)
+ }
+ } else if (label != null) {
+ putExtra(EXTRA_ALARM_SEARCH_MODE, ALARM_SEARCH_MODE_LABEL)
+ putExtra(EXTRA_MESSAGE, label)
+ } else if (next != null) {
+ putExtra(EXTRA_ALARM_SEARCH_MODE, ALARM_SEARCH_MODE_NEXT)
+ } else {
+ putExtra(EXTRA_ALARM_SEARCH_MODE, ALARM_SEARCH_MODE_ALL)
+ }
+
+
}
}
diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
index 7dde5da..f6e5ee2 100644
--- a/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
+++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
@@ -320,6 +320,15 @@ private void onCreateTimerClicked() {
private void onDismissAlarmClicked() {
OmegaIntentBuilder
.dismissAlarm()
+ //BY LABEL
+ //.label("It's your alarm")
+ //or BY TIME
+ //.hour(0)
+ //.minute(0)
+ //.isPM(true)
+ //or DISMISS NEXT
+ //.next()
+ //or SEARCH ALL
.startActivity(this);
}
From 5f3a20bbc7ac99195cafe1092be7864cc9ac001d Mon Sep 17 00:00:00 2001
From: just-d-a
Date: Mon, 12 Oct 2020 14:01:52 +0300
Subject: [PATCH 5/7] merge
---
.../com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt | 1 +
1 file changed, 1 insertion(+)
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
index 6c8ad2e..04c8250 100644
--- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
@@ -22,6 +22,7 @@ import com.omega_r.libs.omegaintentbuilder.builders.share.EmailIntentBuilder
import com.omega_r.libs.omegaintentbuilder.builders.share.ShareIntentBuilder
import com.omega_r.libs.omegaintentbuilder.types.CalendarActionTypes
import com.omega_r.libs.omegaintentbuilder.types.MapTypes
+import com.omega_r.libs.omegaintentbuilder.types.ShowType
/**
* OmegaIntentBuilder class for creating supports createdIntent builders.
From d06b95443d19381ca3cbeb0ecc13884be8bc533d Mon Sep 17 00:00:00 2001
From: just-d-a
Date: Mon, 12 Oct 2020 17:34:18 +0300
Subject: [PATCH 6/7] change annotation place
---
.../omegaintentbuilder/OmegaIntentBuilder.kt | 26 +++----------------
.../builders/ShowAlarmsTimersIntentBuilder.kt | 13 ----------
.../builders/alarm/AlarmBuilder.kt | 24 +++++++++++++++++
.../CreateAlarmIntentBuilder.kt} | 21 ++++++++-------
.../{ => alarm}/DismissAlarmIntentBuilder.kt | 3 ++-
.../builders/alarm/ShowAlarmsIntentBuilder.kt | 14 ++++++++++
.../omegaintentbuilder/MainActivity.java | 13 ++++++----
7 files changed, 63 insertions(+), 51 deletions(-)
delete mode 100644 core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/ShowAlarmsTimersIntentBuilder.kt
create mode 100644 core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/AlarmBuilder.kt
rename core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/{AlarmIntentBuilder.kt => alarm/CreateAlarmIntentBuilder.kt} (83%)
rename core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/{ => alarm}/DismissAlarmIntentBuilder.kt (96%)
create mode 100644 core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/ShowAlarmsIntentBuilder.kt
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
index 04c8250..aa6c813 100644
--- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/OmegaIntentBuilder.kt
@@ -17,12 +17,12 @@ import android.net.Uri
import android.os.Build
import androidx.annotation.RequiresApi
import com.omega_r.libs.omegaintentbuilder.builders.*
+import com.omega_r.libs.omegaintentbuilder.builders.alarm.AlarmBuilder
import com.omega_r.libs.omegaintentbuilder.builders.pick.PickBuilder
import com.omega_r.libs.omegaintentbuilder.builders.share.EmailIntentBuilder
import com.omega_r.libs.omegaintentbuilder.builders.share.ShareIntentBuilder
import com.omega_r.libs.omegaintentbuilder.types.CalendarActionTypes
import com.omega_r.libs.omegaintentbuilder.types.MapTypes
-import com.omega_r.libs.omegaintentbuilder.types.ShowType
/**
* OmegaIntentBuilder class for creating supports createdIntent builders.
@@ -157,25 +157,6 @@ object OmegaIntentBuilder {
@JvmStatic
fun searchWeb() = SearchWebIntentBuilder()
- /**
- * @return AlarmIntentBuilder
- */
- @JvmStatic
- @RequiresApi(Build.VERSION_CODES.KITKAT)
- fun createAlarm() = AlarmIntentBuilder()
-
- /**
- * @return ShowAlarmsTimersIntentBuilder
- */
- @JvmStatic
- fun showTimers() = ShowAlarmsTimersIntentBuilder(ShowType.TIMERS)
-
- /**
- * @return ShowAlarmsTimersIntentBuilder
- */
- @JvmStatic
- fun showAlarms() = ShowAlarmsTimersIntentBuilder(ShowType.ALARMS)
-
/**
* @return VideoRecordBuilder
*/
@@ -183,9 +164,8 @@ object OmegaIntentBuilder {
fun recordVideo() = VideoRecordBuilder()
/**
- * @return DismissAlarmIntentBuilder
+ * @return VideoRecordBuilder
*/
@JvmStatic
- @RequiresApi(Build.VERSION_CODES.M)
- fun dismissAlarm() = DismissAlarmIntentBuilder()
+ fun alarm() = AlarmBuilder
}
\ No newline at end of file
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/ShowAlarmsTimersIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/ShowAlarmsTimersIntentBuilder.kt
deleted file mode 100644
index 9b5c00a..0000000
--- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/ShowAlarmsTimersIntentBuilder.kt
+++ /dev/null
@@ -1,13 +0,0 @@
-package com.omega_r.libs.omegaintentbuilder.builders
-
-import android.content.Context
-import android.content.Intent
-import com.omega_r.libs.omegaintentbuilder.types.ShowType
-
-class ShowAlarmsTimersIntentBuilder(private val showType: ShowType) : BaseActivityBuilder() {
-
- override fun createIntent(context: Context): Intent {
- return Intent(showType.actionType)
- }
-
-}
\ No newline at end of file
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/AlarmBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/AlarmBuilder.kt
new file mode 100644
index 0000000..cf57870
--- /dev/null
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/AlarmBuilder.kt
@@ -0,0 +1,24 @@
+package com.omega_r.libs.omegaintentbuilder.builders.alarm
+
+import android.os.Build
+import androidx.annotation.RequiresApi
+
+object AlarmBuilder {
+ /**
+ * @return CreateAlarmIntentBuilder for creating intent to set alarm
+ */
+ @RequiresApi(Build.VERSION_CODES.KITKAT)
+ fun create() = CreateAlarmIntentBuilder()
+
+ /**
+ * @return DismissAlarmIntentBuilder for creating intent to dismiss alarm
+ */
+ @RequiresApi(Build.VERSION_CODES.M)
+ fun dismiss() = DismissAlarmIntentBuilder()
+
+ /**
+ * @return DismissAlarmIntentBuilder for creating intent to dismiss alarm
+ */
+ @RequiresApi(Build.VERSION_CODES.KITKAT)
+ fun show() = ShowAlarmsIntentBuilder()
+}
\ No newline at end of file
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/AlarmIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/CreateAlarmIntentBuilder.kt
similarity index 83%
rename from core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/AlarmIntentBuilder.kt
rename to core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/CreateAlarmIntentBuilder.kt
index 441aa34..3d165b7 100644
--- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/AlarmIntentBuilder.kt
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/CreateAlarmIntentBuilder.kt
@@ -1,10 +1,13 @@
-package com.omega_r.libs.omegaintentbuilder.builders
+package com.omega_r.libs.omegaintentbuilder.builders.alarm
import android.content.Context
import android.content.Intent
+import android.os.Build
import android.provider.AlarmClock.*
+import androidx.annotation.RequiresApi
+import com.omega_r.libs.omegaintentbuilder.builders.BaseActivityBuilder
-class AlarmIntentBuilder : BaseActivityBuilder() {
+class CreateAlarmIntentBuilder : BaseActivityBuilder() {
private var message: String? = null
private var hour: Int? = null
private var minutes: Int? = null
@@ -22,7 +25,7 @@ class AlarmIntentBuilder : BaseActivityBuilder() {
* @param message String
* @return This AlarmIntentBuilder for method chaining
*/
- fun message(message: String): AlarmIntentBuilder {
+ fun message(message: String): CreateAlarmIntentBuilder {
this.message = message
return this
}
@@ -36,7 +39,7 @@ class AlarmIntentBuilder : BaseActivityBuilder() {
* @param hour String
* @return This AlarmIntentBuilder for method chaining
*/
- fun hour(hour: Int): AlarmIntentBuilder {
+ fun hour(hour: Int): CreateAlarmIntentBuilder {
this.hour = hour
return this
}
@@ -47,7 +50,7 @@ class AlarmIntentBuilder : BaseActivityBuilder() {
* @param minutes String
* @return This AlarmIntentBuilder for method chaining
*/
- fun minutes(minutes: Int): AlarmIntentBuilder {
+ fun minutes(minutes: Int): CreateAlarmIntentBuilder {
this.minutes = minutes
return this
}
@@ -62,7 +65,7 @@ class AlarmIntentBuilder : BaseActivityBuilder() {
* @param ringtone String
* @return This AlarmIntentBuilder for method chaining
*/
- fun ringtone(ringtone: String): AlarmIntentBuilder {
+ fun ringtone(ringtone: String): CreateAlarmIntentBuilder {
this.ringtone = ringtone
return this
}
@@ -73,7 +76,7 @@ class AlarmIntentBuilder : BaseActivityBuilder() {
*
* @return This AlarmIntentBuilder for method chaining
*/
- fun skipUI(): AlarmIntentBuilder {
+ fun skipUI(): CreateAlarmIntentBuilder {
skipUI = true
return this
}
@@ -86,7 +89,7 @@ class AlarmIntentBuilder : BaseActivityBuilder() {
* @return This AlarmIntentBuilder for method chaining
*/
@JvmOverloads
- fun vibrate(vibrate: Boolean = true): AlarmIntentBuilder {
+ fun vibrate(vibrate: Boolean = true): CreateAlarmIntentBuilder {
this.vibrate = vibrate
return this
}
@@ -96,7 +99,7 @@ class AlarmIntentBuilder : BaseActivityBuilder() {
*
* @return This AlarmIntentBuilder for method chaining
*/
- fun ringtoneSilent(): AlarmIntentBuilder {
+ fun ringtoneSilent(): CreateAlarmIntentBuilder {
ringtoneSilent = true
return this
}
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/DismissAlarmIntentBuilder.kt
similarity index 96%
rename from core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
rename to core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/DismissAlarmIntentBuilder.kt
index d62856e..a6c59a7 100644
--- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/DismissAlarmIntentBuilder.kt
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/DismissAlarmIntentBuilder.kt
@@ -1,8 +1,9 @@
-package com.omega_r.libs.omegaintentbuilder.builders
+package com.omega_r.libs.omegaintentbuilder.builders.alarm
import android.content.Context
import android.content.Intent
import android.provider.AlarmClock.*
+import com.omega_r.libs.omegaintentbuilder.builders.BaseActivityBuilder
class DismissAlarmIntentBuilder : BaseActivityBuilder() {
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/ShowAlarmsIntentBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/ShowAlarmsIntentBuilder.kt
new file mode 100644
index 0000000..2be20b3
--- /dev/null
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/ShowAlarmsIntentBuilder.kt
@@ -0,0 +1,14 @@
+package com.omega_r.libs.omegaintentbuilder.builders.alarm
+
+import android.content.Context
+import android.content.Intent
+import android.provider.AlarmClock
+import com.omega_r.libs.omegaintentbuilder.builders.BaseActivityBuilder
+
+class ShowAlarmsIntentBuilder() : BaseActivityBuilder() {
+
+ override fun createIntent(context: Context): Intent {
+ return Intent(AlarmClock.ACTION_SHOW_ALARMS)
+ }
+
+}
\ No newline at end of file
diff --git a/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java b/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
index 7944d76..a5655c0 100644
--- a/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
+++ b/examples/src/main/java/com/omega_r/omegaintentbuilder/MainActivity.java
@@ -276,7 +276,8 @@ private void onExtrasToFragmentClicked() {
private void onCreateAlarmClicked() {
OmegaIntentBuilder
- .createAlarm()
+ .alarm()
+ .create()
.message("It's your alarm")
.hour(15)
.vibrate()
@@ -330,14 +331,15 @@ private void onCreateTimerClicked() {
}
private void onShowTimersClicked() {
- OmegaIntentBuilder
+ /* OmegaIntentBuilder
.showTimers()
- .startActivity(this);
+ .startActivity(this);*/
}
private void onShowAlarmsClicked() {
OmegaIntentBuilder
- .showAlarms()
+ .alarm()
+ .show()
.startActivity(this);
}
@@ -349,7 +351,8 @@ private void onRecordVideoClicked() {
private void onDismissAlarmClicked() {
OmegaIntentBuilder
- .dismissAlarm()
+ .alarm()
+ .dismiss()
//BY LABEL
//.label("It's your alarm")
//or BY TIME
From 8fe82e4d431c509d691d498539a7e29e8ec818a2 Mon Sep 17 00:00:00 2001
From: just-d-a
Date: Mon, 12 Oct 2020 17:36:22 +0300
Subject: [PATCH 7/7] change show fun comment
---
.../libs/omegaintentbuilder/builders/alarm/AlarmBuilder.kt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/AlarmBuilder.kt b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/AlarmBuilder.kt
index cf57870..bcc323c 100644
--- a/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/AlarmBuilder.kt
+++ b/core/src/main/java/com/omega_r/libs/omegaintentbuilder/builders/alarm/AlarmBuilder.kt
@@ -17,7 +17,7 @@ object AlarmBuilder {
fun dismiss() = DismissAlarmIntentBuilder()
/**
- * @return DismissAlarmIntentBuilder for creating intent to dismiss alarm
+ * @return ShowAlarmsIntentBuilder for creating intent to show alarm
*/
@RequiresApi(Build.VERSION_CODES.KITKAT)
fun show() = ShowAlarmsIntentBuilder()