diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 00000000..e442406a
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a0de2a15..0dbe464b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,10 +7,11 @@
-
+
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index db4810bd..48a98ed0 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,7 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 1cf01017..924048d1 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -94,7 +94,7 @@
-
+
diff --git a/.idea/render.experimental.xml b/.idea/render.experimental.xml
new file mode 100644
index 00000000..8ec256a5
--- /dev/null
+++ b/.idea/render.experimental.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/api/.gitignore b/api/.gitignore
new file mode 100644
index 00000000..42afabfd
--- /dev/null
+++ b/api/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/api/build.gradle b/api/build.gradle
new file mode 100644
index 00000000..650ba93b
--- /dev/null
+++ b/api/build.gradle
@@ -0,0 +1,12 @@
+plugins {
+ id 'java-library'
+}
+
+java {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+}
+
+dependencies {
+ implementation 'org.jetbrains:annotations:15.0'
+}
\ No newline at end of file
diff --git a/api/src/main/java/com/fazziclay/opentoday/api/Event.java b/api/src/main/java/com/fazziclay/opentoday/api/Event.java
new file mode 100644
index 00000000..656b194e
--- /dev/null
+++ b/api/src/main/java/com/fazziclay/opentoday/api/Event.java
@@ -0,0 +1,4 @@
+package com.fazziclay.opentoday.api;
+
+public interface Event {
+}
diff --git a/api/src/main/java/com/fazziclay/opentoday/api/EventExceptionEvent.java b/api/src/main/java/com/fazziclay/opentoday/api/EventExceptionEvent.java
new file mode 100644
index 00000000..f3362bd4
--- /dev/null
+++ b/api/src/main/java/com/fazziclay/opentoday/api/EventExceptionEvent.java
@@ -0,0 +1,19 @@
+package com.fazziclay.opentoday.api;
+
+public class EventExceptionEvent implements Event {
+ private final Event event;
+ private final Exception exception;
+
+ public EventExceptionEvent(Event event, Exception e) {
+ this.event = event;
+ this.exception = e;
+ }
+
+ public Event getEvent() {
+ return event;
+ }
+
+ public Exception getException() {
+ return exception;
+ }
+}
diff --git a/api/src/main/java/com/fazziclay/opentoday/api/EventHandler.java b/api/src/main/java/com/fazziclay/opentoday/api/EventHandler.java
new file mode 100644
index 00000000..b695fa6e
--- /dev/null
+++ b/api/src/main/java/com/fazziclay/opentoday/api/EventHandler.java
@@ -0,0 +1,15 @@
+package com.fazziclay.opentoday.api;
+
+public class EventHandler {
+ public static void call(Event event) {
+ try {
+ PluginManager.callEvent(event);
+ } catch (Exception e) {
+ PluginManager.callEvent(new EventExceptionEvent(event, e));
+ }
+ }
+
+ public void handle(Event event) {
+
+ }
+}
diff --git a/api/src/main/java/com/fazziclay/opentoday/api/OpenTodayPlugin.java b/api/src/main/java/com/fazziclay/opentoday/api/OpenTodayPlugin.java
new file mode 100644
index 00000000..c14db17f
--- /dev/null
+++ b/api/src/main/java/com/fazziclay/opentoday/api/OpenTodayPlugin.java
@@ -0,0 +1,10 @@
+package com.fazziclay.opentoday.api;
+
+public abstract class OpenTodayPlugin {
+ public void onEnable() {}
+ public void onDisable() {}
+
+ public EventHandler[] getEventHandlers() {
+ return new EventHandler[0];
+ }
+}
diff --git a/api/src/main/java/com/fazziclay/opentoday/api/PluginException.java b/api/src/main/java/com/fazziclay/opentoday/api/PluginException.java
new file mode 100644
index 00000000..afd0fbe5
--- /dev/null
+++ b/api/src/main/java/com/fazziclay/opentoday/api/PluginException.java
@@ -0,0 +1,33 @@
+package com.fazziclay.opentoday.api;
+
+public class PluginException extends RuntimeException {
+ private final OpenTodayPlugin plugin;
+
+ public PluginException(OpenTodayPlugin plugin) {
+ this.plugin = plugin;
+ }
+
+ public PluginException(String message, OpenTodayPlugin plugin) {
+ super(message);
+ this.plugin = plugin;
+ }
+
+ public PluginException(String message, Throwable cause, OpenTodayPlugin plugin) {
+ super(message, cause);
+ this.plugin = plugin;
+ }
+
+ public PluginException(Throwable cause, OpenTodayPlugin plugin) {
+ super(cause);
+ this.plugin = plugin;
+ }
+
+ public PluginException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace, OpenTodayPlugin plugin) {
+ super(message, cause, enableSuppression, writableStackTrace);
+ this.plugin = plugin;
+ }
+
+ public OpenTodayPlugin getPlugin() {
+ return plugin;
+ }
+}
diff --git a/api/src/main/java/com/fazziclay/opentoday/api/PluginManager.java b/api/src/main/java/com/fazziclay/opentoday/api/PluginManager.java
new file mode 100644
index 00000000..2a8887db
--- /dev/null
+++ b/api/src/main/java/com/fazziclay/opentoday/api/PluginManager.java
@@ -0,0 +1,57 @@
+package com.fazziclay.opentoday.api;
+
+import java.util.HashMap;
+
+public class PluginManager {
+ private static final HashMap activePlugins = new HashMap<>();
+
+ public static void loadPlugin(String packageId, OpenTodayPlugin plugin) {
+ disablePlugin(packageId);
+ activePlugins.put(packageId, plugin);
+ plugin.onEnable();
+ }
+
+ public static void disablePlugin(String packageId) {
+ OpenTodayPlugin openTodayPlugin = activePlugins.get(packageId);
+ if (openTodayPlugin != null) {
+ openTodayPlugin.onDisable();
+ activePlugins.remove(packageId);
+ }
+ }
+
+ public static void disableAllPlugins() {
+ if (activePlugins.isEmpty()) return;
+ for (String s : activePlugins.keySet()) {
+ disablePlugin(s);
+ }
+ }
+
+ public static void callEvent(Event event) {
+ activePlugins.forEach((s, plugin) -> {
+ try {
+ for (EventHandler eventHandler : plugin.getEventHandlers()) {
+ eventHandler.handle(event);
+ }
+ } catch (Exception e) {
+ throw new PluginException("Exception while process eventHandlers in \"" + s + "\"(" + plugin + ") plugin", e, plugin);
+ }
+ });
+ }
+
+ public static OpenTodayPlugin getActivePlugin(String key) {
+ return activePlugins.get(key);
+ }
+
+ public static T getActivePlugin(Class clazz) {
+ for (OpenTodayPlugin value : activePlugins.values()) {
+ if (value.getClass() == clazz) {
+ return (T) value;
+ }
+ }
+ return null;
+ }
+
+ public static boolean isPluginActive(String key) {
+ return getActivePlugin(key) != null;
+ }
+}
diff --git a/app/build.gradle b/app/build.gradle
index 1aa18c03..f51128e1 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,20 +4,20 @@ plugins {
}
// =====
-var isDev = true
-var beta = false
-var appIdSuffix = "" // EMPTY FOR RELEASES!!!!
-var verBuild = 140
-var verName = "1.2+[patches:[fix-tick] + [special_widget] + [fixes-itemstorageviewer] + [item-sleepTime] + [notification-manager]"
-var verBranch = "fixes-itemstorageviewer + special_widget + item-sleepTime + notification-manager (currently main)" // use "RELEASE" for releases versions
-var verReleaseTime = 1689778441 // in seconds
+var isDev = false // add .dev to applicationId
+var beta = false // add .beta to applicationId
+var appIdSuffix = "" // add this to applicationId (E M P T Y F O R R E L E A S E S)
+var verBuild = 160 // versionCode
+var verName = "1.3" // versionName...
+var verBranch = "main" // branch
+var verReleaseTime = 1699198506 // releaseTime
android {
- compileSdk 33
+ compileSdk 34
defaultConfig {
applicationId "com.fazziclay.opentoday" + (isDev ? ".dev" : "") + (beta ? ".beta" : "") + appIdSuffix
minSdk 26
- targetSdk 33
+ targetSdk 34
versionCode verBuild
versionName verName + " (build " + verBuild + (isDev ? " dev" : "") + ")"
@@ -51,24 +51,27 @@ android {
testOptions {
unitTests.returnDefaultValues = true
}
+ packagingOptions {
+ resources.excludes.add("META-INF/*") // fix build errors
+ }
namespace 'com.fazziclay.opentoday'
}
dependencies {
// Application
- implementation files("./libs/OpenTodayTelemetry-v2-v11.jar")
- implementation files("./libs/NeoSocket-1.0.jar")
- implementation files("./libs/JavaNeoUtil-1.1.jar")
- implementation files("./libs/WarningRose-v0.4.1.jar")
- implementation 'com.github.martin-stone:hsv-alpha-color-picker-android:3.0.1'
+ implementation files("./libs/OpenTodayTelemetry-v2-v11.jar") // telemetry library for OpenToday SourceCode: https://github.com/FazziCLAY/OpenTodayTelemetry
+ implementation files("./libs/NeoSocket-1.0.jar") // for network (bad library...) uses by OpenTodayTelemetry SourceCode: https://github.com/FazziCLAY/NeoSocket
+ implementation files("./libs/JavaNeoUtil-1.1.jar") // java utils by FazziCLAY (uses FileUtil) SourceCode: https://github.com/FazziCLAY/JavaNeoUtil
+ implementation files("./libs/WarningRose-v0.4.1.jar") // for DebugTickCounter debug rose (only for developer) SourceCode: https://github.com/FazziCLAY/WarningRose
+ implementation 'com.github.leondzn:simple-analog-clock:1.0.1' // analog clock
+ implementation 'com.github.martin-stone:hsv-alpha-color-picker-android:3.0.1' // color picker
implementation 'androidx.appcompat:appcompat:1.6.1'
- implementation 'com.google.android.material:material:1.9.0'
- implementation 'com.google.code.gson:gson:2.8.9'
- implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
- implementation 'androidx.navigation:navigation-fragment:2.5.3'
- implementation 'androidx.navigation:navigation-ui:2.5.3'
+ implementation 'com.google.android.material:material:1.10.0'
+ implementation 'androidx.navigation:navigation-fragment-ktx:2.7.4'
+ implementation 'androidx.navigation:navigation-ui-ktx:2.7.4'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
- implementation 'androidx.core:core-ktx:1.10.1'
+ implementation 'androidx.core:core-ktx:1.12.0'
+ implementation project(path: ':api') // api
// Tests
androidTestImplementation 'org.junit.jupiter:junit-jupiter:5.9.3'
diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml
index e652d944..1415dbd3 100644
--- a/app/src/debug/res/values/strings.xml
+++ b/app/src/debug/res/values/strings.xml
@@ -1,4 +1,4 @@
- OpenToday (Debug)
+ OpenToday
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ed473a47..efae0b04 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -40,6 +40,7 @@
android:name="com.fazziclay.opentoday.gui.activity.AlarmActivity"
android:showWhenLocked="true"
android:showOnLockScreen="true"
+ android:excludeFromRecents="true"
android:turnScreenOn="true"
android:exported="true"
tools:targetApi="o_mr1">
diff --git a/app/src/main/assets/CHANGELOG b/app/src/main/assets/CHANGELOG
index ebdabfc4..b9185384 100644
--- a/app/src/main/assets/CHANGELOG
+++ b/app/src/main/assets/CHANGELOG
@@ -1,17 +1,55 @@
-TODO: changelog
-== branch: item-sleepTime
-* Added new item: SleepTimeItem - automatically calculate sleep time
-* DATA_VERSIONS now is 11
-
-== branch: fixes-itemstoragedrawer
-* Keyboard now shows automatically in ItemTextEditorFragment
-* Fixes memory-leaks in ItemsEditorFragment if item instance of FilterItemGroup (related with edit-filter buttons)
-* Fixes memory-leaks in CycleListItem while rendering
-* ItemsStorage: added "getItemAt(int)" method.
-* Basic logic of "ItemsStorageDrawer" moved to new parent "AbstractItemsStorageDrawer"
-* Drag&Drop re-order now not resets while item updated.
-* Drag&Drop re-order(and maybe swipes...) now available in child items
-* Fixed DeleteItemsFragment: now all items un-minimized
+$[@bold;-#00FF00;S25]# Changelog v160 1.3 (2023.11.05)$[||]
+$[@bold;-#44dd44]Innovation:$[@reset;-reset]
+ * Notification can now come as an alarm clock (full screen)
+ * When creating an item, its default background color is random (configurable)
+ * The analog clock can be enabled in the settings
+ * Tags have been added to items, now you can label them! (not used anywhere yet)
+ * To date&time format added NO_TIME presets
+ * The text editor can now edit bold, italic, strikeout and font size
+ * Added icons
+ * If the item has notifications, it will have the corresponding icon on it
+
+$[@bold]Gui Improvements:$[@reset]
+ * Animations added
+ * Item text editor now automatically show keyboard
+ * After closing the toolbar, the focus is set to QuickNote
+ * When deleting, child elements are now counted
+ * An (+) button has been added to the list of tabs
+ * Item margins increased
+ * When the item is clamped inside the group, a specific item is now moved, and not the whole group
+ * Inside DeleteItemsFragment, now all items are rendered not minimized
+ * More material style
+ * Uses new icons
+ * The color selection button has been changed
+
+$[@bold]Code Improvements:$[@reset]
+ * SettingsManager rewritten
+ * Startup performance improved: uses multi-threaded loading (BackendInitializer.java)
+ * Added minimal plugins support
+ * Basic logic of "ItemsStorageDrawer" moved to new parent "AbstractItemsStorageDrawer"
+ * Drag&Drop re-order(and maybe swipes...) now available in child items
+ * Notifications can now have a custom icon and color
+ * ColorUtil.colorize now fast if received plain text
+
+$[@bold]Fixes:$[@reset]
+ * Fixes memory-leaks in ItemsEditorFragment if item instance of FilterItemGroup (related with edit-filter buttons)
+ * Fixes memory-leaks in CycleListItem while rendering
+ * [GUI] Drag&Drop re-order now not reset while item updated.
+ * [GUI] With a large update of Items Storage, ItemsStorageDrawer did not have time to process it and caused a crash.
+
+$[@bold]Other:$[@reset]
+ * DATA_VERSION is 12
+ * DataFixer 10->11: nothing; 11->12: fix settings
+ * Target to android 34
+ * Secret item: SleepTime - automatically counts sleep time (still in development)
+ * Secret item: MissingNo - it turns into an item, the import of which failed, it still contains the parent's information, and when re-importing the error will try to be eliminated.
+ * ItemsStorage: added "getItemAt(int)" method.
+ * ItemsStorage: added "totalCount()" method.
+ * [GUI] "main" instead of "RELEASE" is now default branch in AboutFragment
+ * Added profiler: in releases it disabled.
+
+
+
$[@bold;-#00FF00;S25]# Changelog v134 1.2 (2023.06.18)$[||]
Correct release for 1.1.4
diff --git a/app/src/main/assets/beautify_colors.txt b/app/src/main/assets/beautify_colors.txt
new file mode 100644
index 00000000..07afd1d4
--- /dev/null
+++ b/app/src/main/assets/beautify_colors.txt
@@ -0,0 +1,14 @@
+// default colors for OpenToday
+#ff0000;fully red
+#d19b29;оранжевый
+#808000;тёмно-ораньжевый
+#2adc0e;хакерский-зелёный
+#008000;тёмнозелёный
+#6bc6d1;голубой
+#008080;цвет блока гвардианов
+#e02271;малиновая лада
+#0c7a89;цвел блока гвардианов
+#6338d3;цвет фиолетово-курсовый
+#a290f7;светло фиолетовый-курсовый
+#7801d9;цвет курсы-фиолетово
+#ff00f0;sorry brother
\ No newline at end of file
diff --git a/app/src/main/assets/LICENSE_JavaNeoUtil b/app/src/main/assets/licenses/LICENSE_JavaNeoUtil
similarity index 100%
rename from app/src/main/assets/LICENSE_JavaNeoUtil
rename to app/src/main/assets/licenses/LICENSE_JavaNeoUtil
diff --git a/app/src/main/assets/LICENSE_NeoSocket b/app/src/main/assets/licenses/LICENSE_NeoSocket
similarity index 100%
rename from app/src/main/assets/LICENSE_NeoSocket
rename to app/src/main/assets/licenses/LICENSE_NeoSocket
diff --git a/app/src/main/assets/LICENSE_OpenToday b/app/src/main/assets/licenses/LICENSE_OpenToday
similarity index 100%
rename from app/src/main/assets/LICENSE_OpenToday
rename to app/src/main/assets/licenses/LICENSE_OpenToday
diff --git a/app/src/main/assets/LICENSE_OpenTodayTelemetry b/app/src/main/assets/licenses/LICENSE_OpenTodayTelemetry
similarity index 100%
rename from app/src/main/assets/LICENSE_OpenTodayTelemetry
rename to app/src/main/assets/licenses/LICENSE_OpenTodayTelemetry
diff --git a/app/src/main/assets/LICENSE_hsv-alpha-color-picker-android b/app/src/main/assets/licenses/LICENSE_hsv-alpha-color-picker-android
similarity index 100%
rename from app/src/main/assets/LICENSE_hsv-alpha-color-picker-android
rename to app/src/main/assets/licenses/LICENSE_hsv-alpha-color-picker-android
diff --git a/app/src/main/assets/licenses/LICENSE_simple-analog-clock b/app/src/main/assets/licenses/LICENSE_simple-analog-clock
new file mode 100644
index 00000000..7a4a3ea2
--- /dev/null
+++ b/app/src/main/assets/licenses/LICENSE_simple-analog-clock
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ 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.
\ No newline at end of file
diff --git a/app/src/main/java/com/fazziclay/opentoday/Build.java b/app/src/main/java/com/fazziclay/opentoday/Build.java
new file mode 100644
index 00000000..7b126214
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/Build.java
@@ -0,0 +1,72 @@
+package com.fazziclay.opentoday;
+
+import androidx.annotation.NonNull;
+
+import com.fazziclay.opentoday.app.CustomBuildConfig;
+import com.fazziclay.opentoday.app.FeatureFlag;
+
+import java.util.Arrays;
+
+// I im happy!
+public class Build {
+ // Setting this :)
+ public static final BuildDebugStatus DEBUG_STATUS = BuildDebugStatus.AUTOMATIC;
+ public static final BuildLogsStatus LOGS_STATUS = BuildLogsStatus.OFF;
+ public static final boolean IS_SECRET_SETTINGS_AVAILABLE = true;
+ public static final boolean IS_SHADOW_CUSTOM_BUILD_CONFIG = false; // normally is FALSE
+ public static final FeatureFlag[] INITIAL_FEATURE_FLAGS = {
+ //FeatureFlag.TOOLBAR_DEBUG,
+ //FeatureFlag.ITEM_SLEEP_TIME,
+ //FeatureFlag.ITEM_DEBUG_TICK_COUNTER,
+ //FeatureFlag.DISABLE_DEBUG_MODE_NOTIFICATION,
+ };
+ public static final boolean PROFILERS = false; // normally is FALSE (long uses profilers causes crashes)
+
+
+ // work code
+ public static boolean isDebug() {
+ return switch (DEBUG_STATUS) {
+ case TRUE -> true;
+ case FALSE -> false;
+ case AUTOMATIC -> CustomBuildConfig.DEBUG;
+ };
+ }
+
+ public static boolean isLogs() {
+ return LOGS_STATUS != BuildLogsStatus.OFF;
+ }
+
+ public static boolean isLogsSave() {
+ return LOGS_STATUS == BuildLogsStatus.ON_WITH_FILE;
+ }
+
+ public static boolean isSecretSettingAvailable() {
+ return IS_SECRET_SETTINGS_AVAILABLE;
+ }
+
+ @NonNull
+ public static String getBuildDebugReport() {
+ return "DebugStatus=" + DEBUG_STATUS +
+ "; LogsStatus=" + LOGS_STATUS +
+ "; SecretSettings=" + IS_SECRET_SETTINGS_AVAILABLE +
+ "; ShadowCustomBuildConfig=" + IS_SHADOW_CUSTOM_BUILD_CONFIG +
+ "; InitialFeatureFlags=" + Arrays.toString(INITIAL_FEATURE_FLAGS) +
+ "; Profilers=" + PROFILERS;
+ }
+
+ public static boolean isProfilersEnabled() {
+ return PROFILERS;
+ }
+
+ public enum BuildDebugStatus {
+ TRUE,
+ FALSE,
+ AUTOMATIC
+ }
+
+ public enum BuildLogsStatus {
+ OFF,
+ ON,
+ ON_WITH_FILE
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/Debug.java b/app/src/main/java/com/fazziclay/opentoday/Debug.java
index 5029b087..afdcd6b2 100644
--- a/app/src/main/java/com/fazziclay/opentoday/Debug.java
+++ b/app/src/main/java/com/fazziclay/opentoday/Debug.java
@@ -1,21 +1,34 @@
package com.fazziclay.opentoday;
+import android.app.Activity;
import android.os.Build;
import androidx.annotation.NonNull;
import com.fazziclay.opentoday.app.App;
+import com.fazziclay.opentoday.debug.TestItemViewGenerator;
/**
* Collect debug info and other debug constants
*/
public class Debug {
+ public static final boolean DEBUG_TICK_NOTIFICATION = App.debug(false);
+ public static final int DEBUG_MAIN_ACTIVITY_START_SLEEP = App.debug(false) ? 6000 : 0;
+ public static final int DEBUG_APP_START_SLEEP = App.debug(false) ? 8000 : 0;
+ public static Class DEBUG_MAIN_ACTIVITY = App.debug(false) ? TestItemViewGenerator.class : null;
+ public static final boolean DEBUG_TEST_EXCEPTION_ON_LAUNCH = false;
+ public static final boolean DEBUG_IMPORTANT_NOTIFICATIONS = App.debug(false);
+ public static final boolean DEBUG_ALWAYS_SHOW_UI_NOTIFICATIONS = App.debug(false);
+ public static final boolean DEBUG_LOG_ALL_IN_MAINACTIVITY = App.debug(false);
+ public static final boolean DEBUG_NETWORK_UTIL_SHADOWCONTENT = App.debug(false);
+
public static final boolean CUSTOM_ITEMSTABINCLUDE_BACKGROUND = App.debug(false);
public static final boolean CUSTOM_MAINACTIVITY_BACKGROUND = App.debug(false);
public static final boolean SHOW_PATH_TO_ITEM_ON_ITEMTEXT = App.debug(false);
public static final boolean SHOW_ID_ON_ITEMTEXT = App.debug(false);
public static final boolean SHOW_GEN_ID_ON_ITEMTEXT = App.debug(false);
- public static final boolean DESTROY_ANY_TEXTITEM_CHILD = App.debug(true);
+ public static final boolean DESTROY_ANY_TEXTITEM_CHILD = App.debug(false);
+ public static final boolean SHOW_DEBUG_MESSAGE_TOAST_IN_ITEMSTICKRECEIVER = App.debug(false);
public static final int DEF = -1;
@@ -42,13 +55,13 @@ public static String getDebugInfoText() {
androidReleaseOrCodename = "sdk DEBUG_MAIN_ACTIVITY = debug(false) ? TestItemViewGenerator.class : null;
- public static final boolean DEBUG_TEST_EXCEPTION_ON_LAUNCH = false;
- public static final boolean DEBUG_IMPORTANT_NOTIFICATIONS = debug(false);
- public static final boolean DEBUG_ALWAYS_SHOW_UI_NOTIFICATIONS = debug(false);
- public static final boolean DEBUG_LOG_ALL_IN_MAINACTIVITY = debug(false);
- public static final boolean DEBUG_NETWORK_UTIL_SHADOWCONTENT = debug(false);
+ public static final boolean DEBUG = com.fazziclay.opentoday.Build.isDebug();
+ public static final boolean LOG = com.fazziclay.opentoday.Build.isLogs();
+ public static final boolean LOGS_SAVE = com.fazziclay.opentoday.Build.isLogsSave();
+ public static final boolean SECRET_SETTINGS_AVAILABLE = com.fazziclay.opentoday.Build.isSecretSettingAvailable();
public static boolean debug(boolean b) {
return (DEBUG && b);
@@ -115,18 +110,15 @@ public static App get() {
private final OptionalField colorHistoryManager = new OptionalField<>(() -> new ColorHistoryManager(new File(getExternalFilesDir(""), "color_history.json"), 10));
private final OptionalField pinCodeManager = new OptionalField<>(() -> new PinCodeManager(this));
private final OptionalField selectionManager = new OptionalField<>(SelectionManager::new);
- private final OptionalField telemetry = new OptionalField<>(() -> new Telemetry(this, getSettingsManager().isTelemetry()));
+ private final OptionalField telemetry = new OptionalField<>(() -> new Telemetry(this, SettingsManager.IS_TELEMETRY.get(getSettingsManager())));
private final OptionalField tickThread = new OptionalField<>(this::preCheckTickThread, TickThread::requestTerminate, this::validateTickThread);
private final OptionalField translation = new OptionalField<>(() -> new TranslationImpl(this::getString));
private final OptionalField> importantDebugCallbacks = new OptionalField<>(CallbackStorage::new);
- private final List featureFlags = new ArrayList<>(App.DEBUG ? Arrays.asList(
- FeatureFlag.ITEM_DEBUG_TICK_COUNTER,
- //FeatureFlag.ALWAYS_SHOW_SAVE_STATUS,
- //FeatureFlag.DISABLE_AUTOMATIC_TICK,
- FeatureFlag.DISABLE_DEBUG_MODE_NOTIFICATION,
- FeatureFlag.TOOLBAR_DEBUG
- ) : Collections.emptyList());
+ private final OptionalField beautifyColorManager = new OptionalField<>(() -> new BeautifyColorManager(this));
+ private final OptionalField itemNotificationHandler = new OptionalField<>(() -> new ItemNotificationHandler(this, this));
+ private final List featureFlags = new ArrayList<>(Arrays.asList(com.fazziclay.opentoday.Build.INITIAL_FEATURE_FLAGS));
private long appStartupTime = 0;
+ private boolean pluginsInitialized = false;
/**
* OPENTODAY APPLICATION INITIALIZE
@@ -144,8 +136,11 @@ public void onCreate() {
super.onCreate();
instance = this;
setupCrashReporter();
- DebugUtil.sleep(DEBUG_APP_START_SLEEP);
+ DebugUtil.sleep(Debug.DEBUG_APP_START_SLEEP);
CrashReportContext.BACK.push("App onCreate");
+ if (DEBUG) {
+ StrictMode.enableDefaults();
+ }
logsFile = new File(getExternalCacheDir(), "latest.log");
final FixResult fixResult = Logger.dur("App", "[DataFixer] fixToCurrentVersion", () -> getDataFixer().fixToCurrentVersion());
@@ -169,13 +164,7 @@ public void onLowMemory() {
Logger.i("App", "onLowMemory.");
openSourceLicenses.free();
dataFixer.free();
- tabsManager.free();
- settingsManager.free();
- colorHistoryManager.free();
pinCodeManager.free();
- selectionManager.free();
- telemetry.free();
- tickThread.free();
Debug.free();
TimeUtil.free();
@@ -196,15 +185,27 @@ public void onTrimMemory(int level) {
if (level >= TRIM_MEMORY_RUNNING_LOW) {
openSourceLicenses.free();
dataFixer.free();
- colorHistoryManager.free();
- //telemetry.free();
pinCodeManager.free();
Debug.free();
- TimeUtil.free();
- RandomUtil.free();
}
}
+ public static Profiler createProfiler(@NotNull String name) {
+ return com.fazziclay.opentoday.Build.isProfilersEnabled() ? addProfiler(new ProfilerImpl(name)) : Profiler.EMPTY;
+ }
+
+ public static ProfilerImpl addProfiler(ProfilerImpl profiler) {
+ if (ProfilerImpl.PROFILERS == null) {
+ ProfilerImpl.PROFILERS = new ArrayList<>();
+ }
+ ProfilerImpl.PROFILERS.add(profiler);
+ return profiler;
+ }
+
+ public List getProfilers() {
+ return ProfilerImpl.PROFILERS;
+ }
+
public boolean isPinCodeNeed() {
return this.getPinCodeManager().isPinCodeSet();
}
@@ -229,7 +230,60 @@ public int getPinCodeLength() {
private void registryNotificationsChannels() {
NotificationManager notificationManager = getSystemService(NotificationManager.class);
notificationManager.createNotificationChannel(new NotificationChannel(NOTIFICATION_QUCIKNOTE_CHANNEL, getString(R.string.notificationChannel_quickNote_title), NotificationManager.IMPORTANCE_HIGH));
- notificationManager.createNotificationChannel(new NotificationChannel(NOTIFICATION_ITEMS_CHANNEL, getString(R.string.notificationChannel_items_title), NotificationManager.IMPORTANCE_HIGH));
+ notificationManager.createNotificationChannel(new NotificationChannel(NOTIFICATION_ITEMS_CHANNEL, getString(R.string.notificationChannel_items_title), NotificationManager.IMPORTANCE_MAX));
+ }
+
+ public void tryInitPlugins() {
+ IPROF.push("reinitPlugins");
+ CrashReportContext.BACK.push("App::reinitPlugins");
+ if (!pluginsInitialized) {
+ CrashReportContext.BACK.push("disabling all...");
+ PluginManager.disableAllPlugins();
+ for (final String shortName : getSettingsManager().getPlugins().split(",")) {
+ CrashReportContext.BACK.swap("plugin: " + shortName.trim());
+
+ PluginsRegistry.PluginInfo pluginInfo = PluginsRegistry.REGISTRY.getByShortName(shortName);
+ try {
+ initPlugin(pluginInfo, 0);
+
+ } catch (Exception e) {
+ Logger.e("App", "failed init plugin: " + shortName, e);
+ }
+ }
+ pluginsInitialized = true;
+ CrashReportContext.BACK.pop();
+ }
+ CrashReportContext.BACK.pop();
+ IPROF.pop();
+ }
+
+ public void initPlugin(PluginsRegistry.PluginInfo pluginInfo, int i) throws Exception {
+ if (pluginInfo == null) {
+ throw new NullPointerException("pluginInfo is null");
+ }
+
+ if (PluginManager.isPluginActive(pluginInfo.getPackageId())) {
+ Logger.w("App:initPlugins", "plugin " + pluginInfo.getShortName() + " already active...");
+ return;
+ }
+
+ if (i > 10) {
+ Logger.w("App:initPlugins", "i > 10...");
+ return;
+ }
+
+ for (final String depend : pluginInfo.getDepends()) {
+ initPlugin(PluginsRegistry.REGISTRY.getByShortName(depend), i + 1);
+ }
+
+ PluginManager.loadPlugin(
+ pluginInfo.getPackageId(),
+ pluginInfo.getClazz().getConstructor().newInstance());
+ }
+
+ public void initPlugins() {
+ pluginsInitialized = false;
+ tryInitPlugins();
}
/**
@@ -291,11 +345,12 @@ private void updateVersionFile() {
private License[] createOpenSourceLicensesArray() {
// TODO: 19.10.2022 add v prefix to version to telemetry
return new License[]{
- new License("LICENSE_OpenToday", "OpenToday (this app)", "fazziclay@gmail.com\nhttps://fazziclay.github.io/opentoday"),
- new License("LICENSE_hsv-alpha-color-picker-android", "hsv-alpha-color-picker-android", "https://github.com/martin-stone/hsv-alpha-color-picker-android"),
- new License("LICENSE_JavaNeoUtil", "JavaNeoUtil v" + JavaNeoUtil.VERSION_NAME, "https://github.com/fazziclay/javaneoutil"),
- new License("LICENSE_NeoSocket", "NeoSocket v" + NeoSocket.VERSION_NAME, "https://github.com/fazziclay/neosocket"),
- new License("LICENSE_OpenTodayTelemetry", "OpenTodayTelemetry " + OpenTodayTelemetry.VERSION_NAME, getString(R.string.openSourceLicenses_telemetry_warn) + "\nhttps://github.com/fazziclay/opentodaytelemetry"),
+ new License("licenses/LICENSE_OpenToday", "OpenToday (this app)", "fazziclay@gmail.com\nhttps://fazziclay.github.io/opentoday"),
+ new License("licenses/LICENSE_hsv-alpha-color-picker-android", "hsv-alpha-color-picker-android", "https://github.com/martin-stone/hsv-alpha-color-picker-android"),
+ new License("licenses/LICENSE_JavaNeoUtil", "JavaNeoUtil v" + JavaNeoUtil.VERSION_NAME, "https://github.com/fazziclay/javaneoutil"),
+ new License("licenses/LICENSE_NeoSocket", "NeoSocket v" + NeoSocket.VERSION_NAME, "https://github.com/fazziclay/neosocket"),
+ new License("licenses/LICENSE_OpenTodayTelemetry", "OpenTodayTelemetry " + OpenTodayTelemetry.VERSION_NAME, getString(R.string.openSourceLicenses_telemetry_warn) + "\nhttps://github.com/fazziclay/opentodaytelemetry"),
+ new License("licenses/LICENSE_simple-analog-clock", "simple-analog-clock", "Analog clock\nhttps://github.com/leondzn/simple-analog-clock")
};
}
@@ -313,7 +368,7 @@ public static void exception(Context context, Exception exception) {
App.crash(context, CrashReport.create(exception), false);
}
- private static void crash(@Nullable Context context, @NotNull final CrashReport crashReport, boolean fatal) {
+ public static void crash(@Nullable Context context, @NotNull final CrashReport crashReport, boolean fatal) {
if (context == null) context = App.get();
crashReport.setFatal(CrashReport.FatalEnum.fromBoolean(fatal));
@@ -494,7 +549,15 @@ public ItemsRoot getItemsRoot() {
return getTabsManager();
}
+ public BeautifyColorManager getBeautifyColorManager() {
+ return beautifyColorManager.get();
+ }
+
public StringBuilder getLogs() {
return logs;
}
+
+ public ItemNotificationHandler getItemNotificationHandler() {
+ return itemNotificationHandler.get();
+ }
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/BeautifyColorManager.java b/app/src/main/java/com/fazziclay/opentoday/app/BeautifyColorManager.java
new file mode 100644
index 00000000..13b2dcac
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/BeautifyColorManager.java
@@ -0,0 +1,48 @@
+package com.fazziclay.opentoday.app;
+
+import android.content.Context;
+import android.graphics.Color;
+
+import com.fazziclay.opentoday.util.RandomUtil;
+import com.fazziclay.opentoday.util.StreamUtil;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+public class BeautifyColorManager {
+ private final Context context;
+ private final List colors = new ArrayList<>();
+
+ public BeautifyColorManager(Context context) {
+ this.context = context;
+ load();
+ }
+
+ public static int randomBackgroundColor(Context context) {
+ return App.get(context).getBeautifyColorManager().randomBackgroundColor();
+ }
+
+ public int randomBackgroundColor() {
+ if (colors.isEmpty()) {
+ return RandomUtil.nextInt();
+ }
+
+ int i = RandomUtil.nextInt(colors.size());
+ return colors.get(i);
+ }
+
+ private void load() {
+ try {
+ for (String s : StreamUtil.read(context.getAssets().open("beautify_colors.txt")).split("\n")) {
+ if (s.startsWith("//")) continue;
+ s = s.split(";")[0];
+ try {
+ colors.add(Color.parseColor(s));
+ } catch (Exception ignored) {}
+ }
+ } catch (IOException e) {
+ App.exception(App.get(), e);
+ }
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/CrashReport.java b/app/src/main/java/com/fazziclay/opentoday/app/CrashReport.java
index 0a720110..4c145280 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/CrashReport.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/CrashReport.java
@@ -74,7 +74,7 @@ public String convertToText() {
* DATA_VERSION: %_APPLICATION_DATA_VERSION_%
* RELEASE_TIME: %_APPLICATION_VERSION_RELEASE_TIME_%
* version-data: %_VERSION_DATA_%
- * SHADOW_RELEASE: %_SHADOW_RELEASE_%
+ * build-report: %_BUILD_REPORT_%
* DEBUG: %_APPLICATION_DEBUG_%
* DEBUG_TICK_NOTIFICATION: %_APPLICATION_DEBUG_TICK_NOTIFICATION_%
* DEBUG_MAIN_ACTIVITY_START_SLEEP: %_APPLICATION_DEBUG_MAIN_ACTIVITY_START_SLEEP_%
@@ -156,11 +156,11 @@ public String convertToText() {
text = text.replace("%_APPLICATION_DATA_VERSION_%", getText(App.APPLICATION_DATA_VERSION));
text = text.replace("%_VERSION_DATA_%", getText(() -> App.get().versionDataPutLatestStart(App.get().getVersionData()).toString()));
text = text.replace("%_APPLICATION_DEBUG_%", getText(App.DEBUG));
- text = text.replace("%_APPLICATION_DEBUG_TICK_NOTIFICATION_%", getText(App.DEBUG_TICK_NOTIFICATION));
- text = text.replace("%_APPLICATION_DEBUG_MAIN_ACTIVITY_START_SLEEP_%", getText(App.DEBUG_MAIN_ACTIVITY_START_SLEEP));
- text = text.replace("%_APPLICATION_DEBUG_APP_START_SLEEP_%", getText(App.DEBUG_APP_START_SLEEP));
- text = text.replace("%_APPLICATION_DEBUG_MAIN_ACTIVITY_%", getText(App.DEBUG_MAIN_ACTIVITY));
- text = text.replace("%_DEBUG_TEST_EXCEPTION_ON_LAUNCH_%", getText(App.DEBUG_TEST_EXCEPTION_ON_LAUNCH));
+ text = text.replace("%_APPLICATION_DEBUG_TICK_NOTIFICATION_%", getText(Debug.DEBUG_TICK_NOTIFICATION));
+ text = text.replace("%_APPLICATION_DEBUG_MAIN_ACTIVITY_START_SLEEP_%", getText(Debug.DEBUG_MAIN_ACTIVITY_START_SLEEP));
+ text = text.replace("%_APPLICATION_DEBUG_APP_START_SLEEP_%", getText(Debug.DEBUG_APP_START_SLEEP));
+ text = text.replace("%_APPLICATION_DEBUG_MAIN_ACTIVITY_%", getText(Debug.DEBUG_MAIN_ACTIVITY));
+ text = text.replace("%_DEBUG_TEST_EXCEPTION_ON_LAUNCH_%", getText(Debug.DEBUG_TEST_EXCEPTION_ON_LAUNCH));
text = text.replace("%_TIME_FORMATTED_%", getText(() -> {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy.MM.dd HH:mm:ss SSS", Locale.ENGLISH);
return dateFormat.format(new Date(this.crashTimeMillis));
@@ -188,7 +188,7 @@ public String convertToText() {
text = text.replace("%_DEVICE_DISPLAY_%", getText(Build.DISPLAY));
text = text.replace("%_DEVICE_BOOTLOADER_%", getText(() -> Build.BOOTLOADER));
text = text.replace("%_L_LOGS_%", getText(() -> startAllLines("| ", App.get().getLogs().toString())));
- text = text.replace("%_SHADOW_RELEASE_%", getText(() -> !App.SHADOW_RELEASE ? "false" : "WARNING! SHADOW RELEASE IS TRUE (ENABLED)"));
+ text = text.replace("%_BUILD_REPORT_%", getText(com.fazziclay.opentoday.Build::getBuildDebugReport));
return text;
}
@@ -277,7 +277,16 @@ private String generateRandomComment() {
"MathGame added in 1.1.4",
"CrashReportContext added in 1.1.4",
"Summer love OpenToday developing.. :cry:",
- "Stretchly, thanks!"
+ "Stretchly, thanks!",
+
+ // 2023.10.22 (15:33 UTC)
+ "{no-fun}Celeste - Lena Raine",
+ "{no-fun}but, C418 - Excursions",
+ "{no-fun}r2I4I",
+ "{no-fun}r5T",
+ "{no-fun}r1N",
+ "{no-fun}r7[SPACE]",
+ "This is only tags hehe",
};
Random random = new Random();
int max = comments.length;
@@ -298,6 +307,13 @@ private String generateRandomComment() {
}
}
+ if (result.startsWith("{no-fun}")) {
+ return (random.nextInt(1000) == 753 ? "oOOoOOoOOoOOo 1000 == 753, AND " : "")+result
+ .replace("{no-fun}", "")
+ .replace(":)", ":(")
+ .replace(":/", ":(");
+ }
+
if (random.nextInt(1000) == 753) {
return "OooOOooOOOOOooo 1000 == 753";
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/CrashReportContext.java b/app/src/main/java/com/fazziclay/opentoday/app/CrashReportContext.java
index 9f27b99e..73c6f41a 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/CrashReportContext.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/CrashReportContext.java
@@ -76,5 +76,10 @@ public void push(String s) {
public void pop() {
stack.pop();
}
+
+ public void swap(String s) {
+ pop();
+ push(s);
+ }
}
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/CustomBuildConfig.java b/app/src/main/java/com/fazziclay/opentoday/app/CustomBuildConfig.java
index af3505e5..a3361e4c 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/CustomBuildConfig.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/CustomBuildConfig.java
@@ -1,9 +1,10 @@
package com.fazziclay.opentoday.app;
+import com.fazziclay.opentoday.Build;
import com.fazziclay.opentoday.BuildConfig;
public class CustomBuildConfig {
- public static final boolean SHADOW_BUILD_CONFIG = false;
+ public static final boolean SHADOW_BUILD_CONFIG = Build.IS_SHADOW_CUSTOM_BUILD_CONFIG;
public static final String VERSION_NAME;
public static final int VERSION_CODE;
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/ItemNotificationHandler.java b/app/src/main/java/com/fazziclay/opentoday/app/ItemNotificationHandler.java
new file mode 100644
index 00000000..215ff313
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/ItemNotificationHandler.java
@@ -0,0 +1,129 @@
+package com.fazziclay.opentoday.app;
+
+import android.app.AlarmManager;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.os.Build;
+
+import androidx.core.app.NotificationCompat;
+
+import com.fazziclay.opentoday.app.items.item.Item;
+import com.fazziclay.opentoday.app.items.notification.DayItemNotification;
+import com.fazziclay.opentoday.app.items.notification.ItemNotification;
+import com.fazziclay.opentoday.app.items.tick.ItemsTickReceiver;
+import com.fazziclay.opentoday.gui.activity.AlarmActivity;
+import com.fazziclay.opentoday.util.ColorUtil;
+import com.fazziclay.opentoday.util.Logger;
+import com.fazziclay.opentoday.util.RandomUtil;
+import com.fazziclay.opentoday.util.time.TimeUtil;
+
+import java.util.HashMap;
+
+public class ItemNotificationHandler {
+ private static final String TAG = "ItemNotificationHandler";
+ private static boolean exceptionOnce = true;
+
+ private final Context context;
+ private final App app;
+
+ private final HashMap cachedAlarms = new HashMap<>();
+
+ public ItemNotificationHandler(Context context, App app) {
+ this.context = context;
+ this.app = app;
+ }
+
+ public void setAlarm(ItemNotification itemNotification, long triggerAtMs) {
+ if (!itemNotification.isAttached()) {
+ throw new IllegalArgumentException("setAlarm required attached ItemNotification for working...");
+ }
+ int requestId = itemNotification.getId().hashCode();
+
+ boolean isCached = isCachedAlarm(requestId, triggerAtMs);
+ if (isCached) {
+ return;
+ }
+
+ int flags = PendingIntent.FLAG_UPDATE_CURRENT;
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ flags = flags | PendingIntent.FLAG_IMMUTABLE;
+ }
+
+ try {
+ var intent = ItemsTickReceiver.createNotificationTriggerIntent(context, itemNotification);
+ var pendingIntent = PendingIntent.getBroadcast(context,
+ requestId,
+ intent,
+ flags);
+
+ final AlarmManager alarmManager = context.getSystemService(AlarmManager.class);
+ // owoo
+ {
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
+ if (alarmManager.canScheduleExactAlarms()) {
+ alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, triggerAtMs, pendingIntent);
+
+ } else {
+ Logger.w(TAG, "alarm canScheduleExactAlarms=false. for " + itemNotification + " to " + triggerAtMs + "unix-ms: " + TimeUtil.getDebugDate(triggerAtMs));
+ return;
+ }
+ } else {
+ alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, triggerAtMs, pendingIntent);
+ }
+ }
+ cachedAlarms.put(requestId, triggerAtMs);
+ Logger.d(TAG, "alarm set for " + itemNotification + " to " + triggerAtMs + "unix-ms: " + TimeUtil.getDebugDate(triggerAtMs));
+
+ } catch (Exception e) {
+ if (exceptionOnce) {
+ App.exception(null, e);
+ exceptionOnce = false;
+ }
+ }
+ }
+
+ private boolean isCachedAlarm(int requestId, long triggerAtMs) {
+ if (cachedAlarms.containsKey(requestId)) {
+ return cachedAlarms.get(requestId) == triggerAtMs;
+ }
+ return false;
+ }
+
+ public void handle(Item item, ItemNotification notification) {
+ if (notification instanceof DayItemNotification dayItemNotification) {
+ final String nTitle = dayItemNotification.isNotifyTitleFromItemText() ? (item.isParagraphColorize() ? ColorUtil.colorizeToPlain(item.getText()) : item.getText()) : dayItemNotification.getNotifyTitle();
+ final String nText = dayItemNotification.isNotifyTextFromItemText() ? (item.isParagraphColorize() ? ColorUtil.colorizeToPlain(item.getText()) : item.getText()) : dayItemNotification.getNotifyText();
+
+ NotificationCompat.Builder builder = new NotificationCompat.Builder(context, App.NOTIFICATION_ITEMS_CHANNEL)
+ .setSmallIcon(dayItemNotification.getIcon().getResId())
+ .setContentTitle(nTitle)
+ .setContentText(nText)
+ .setSubText(dayItemNotification.getNotifySubText())
+ .setPriority(NotificationCompat.PRIORITY_MAX);
+
+ if (notification.getColor() != ItemNotification.DEFAULT_COLOR) {
+ builder.setColor(notification.getColor());
+ }
+
+ if (dayItemNotification.isFullScreen()) {
+ PendingIntent pending = PendingIntent.getActivity(context,
+ RandomUtil.nextInt(),
+ AlarmActivity.createIntent(context,
+ item.getId(),
+ dayItemNotification.isPreRenderPreviewMode(),
+ nTitle,
+ dayItemNotification.isSound(),
+ dayItemNotification.getNotificationId()),
+ PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
+ builder.setFullScreenIntent(pending, true);
+ builder.setCategory(NotificationCompat.CATEGORY_ALARM);
+ }
+ builder.setUsesChronometer(true);
+ NotificationManager systemService = context.getSystemService(NotificationManager.class);
+ if (systemService.areNotificationsEnabled()) {
+ systemService.notify(dayItemNotification.getNotificationId(), builder.build());
+ }
+ }
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/OptionalField.java b/app/src/main/java/com/fazziclay/opentoday/app/OptionalField.java
index d165851e..72c081a9 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/OptionalField.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/OptionalField.java
@@ -2,9 +2,13 @@
import androidx.annotation.NonNull;
+import com.fazziclay.opentoday.util.profiler.Profiler;
+
import org.jetbrains.annotations.NotNull;
public class OptionalField {
+ private static final Profiler PROFILER = App.createProfiler("OptionalField");
+
private final InitSupplier supplier;
private final FreeRunnable freeRunnable;
private final Validator validator;
@@ -38,12 +42,18 @@ public OptionalField(final InitSupplier supplier, final FreeRunnable freeR
@NonNull
@NotNull
public T get() {
+ PROFILER.push("get");
if (value == null) {
+ PROFILER.push("supplier");
value = supplier.supplier();
+ PROFILER.pop();
}
if (validator != null) {
+ PROFILER.push("validate");
value = validator.validate(value);
+ PROFILER.pop();
}
+ PROFILER.pop();
return value;
}
@@ -52,10 +62,12 @@ public boolean isSet() {
}
public void free() {
+ PROFILER.push("free");
if (isSet()) {
if (freeRunnable != null) freeRunnable.preFree(value);
}
value = null;
+ PROFILER.pop();
}
public interface InitSupplier {
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/Registry.kt b/app/src/main/java/com/fazziclay/opentoday/app/Registry.kt
index 99f04ce7..15da5fd0 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/Registry.kt
+++ b/app/src/main/java/com/fazziclay/opentoday/app/Registry.kt
@@ -1,6 +1,7 @@
package com.fazziclay.opentoday.app
import com.fazziclay.neosocket.packet.PacketsRegistry
+import com.fazziclay.opentoday.app.icons.IconsRegistry
import com.fazziclay.opentoday.app.items.item.ItemsRegistry
import com.fazziclay.opentoday.app.items.item.filter.FiltersRegistry
import com.fazziclay.opentoday.app.items.notification.ItemNotificationsRegistry
@@ -12,4 +13,5 @@ val TABS: TabsRegistry = TabsRegistry.REGISTRY
val ITEM_NOTIFICATIONS: ItemNotificationsRegistry = ItemNotificationsRegistry.REGISTRY
val TELEMETRY_PACKETS: PacketsRegistry = Telemetry.REGISTRY
val FILTERS: FiltersRegistry = FiltersRegistry.REGISTRY
-val ENUMS : EnumsRegistry = EnumsRegistry
\ No newline at end of file
+val ENUMS: EnumsRegistry = EnumsRegistry
+val ICONS: IconsRegistry = IconsRegistry.REGISTRY
\ No newline at end of file
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/SettingsManager.java b/app/src/main/java/com/fazziclay/opentoday/app/SettingsManager.java
deleted file mode 100644
index eb69539d..00000000
--- a/app/src/main/java/com/fazziclay/opentoday/app/SettingsManager.java
+++ /dev/null
@@ -1,285 +0,0 @@
-package com.fazziclay.opentoday.app;
-
-import androidx.appcompat.app.AppCompatDelegate;
-
-import com.fazziclay.javaneoutil.FileUtil;
-import com.fazziclay.opentoday.app.items.item.ItemsRegistry;
-import com.fazziclay.opentoday.app.items.item.TextItem;
-import com.fazziclay.opentoday.util.Logger;
-import com.fazziclay.opentoday.util.annotation.Getter;
-import com.fazziclay.opentoday.util.annotation.Setter;
-
-import org.json.JSONException;
-import org.json.JSONObject;
-
-import java.io.File;
-import java.util.Calendar;
-import java.util.UUID;
-
-public class SettingsManager {
- private static final String TAG = "SettingsManager";
- // Theme
- private static final String KEY_THEME = "theme";
- private static final String THEME_SYSTEM = "system";
- private static final String THEME_NIGHT = "night";
- private static final String THEME_LIGHT = "light";
-
- // First day of week
- private static final String KEY_FIRST_DAY_OF_WEEK = "firstDayOfWeek";
- private static final String FIRST_DAY_OF_WEEK_SATURDAY = "saturday";
- private static final String FIRST_DAY_OF_WEEK_MONDAY = "monday";
-
- private static final String KEY_QUICK_NOTE_NOTIFICATION = "quickNote"; // TODO: 14.10.2022 rename & add to DataFixer
- private static final String KEY_PARSETIMEFROMQUICKNOTE = "parseTimeFromQuickNote"; // TODO: 14.10.2022 add to datafixer
- private static final String KEY_ISMINIMIZEGRAYCOLOR = "isMinimizeGrayColor"; // TODO: 14.10.2022 add to datafixer
- private static final String KEY_TRIMITEMNAMESONEDIT = "trimItemNamesOnEdit";
-
- // local
- private final File saveFile;
-
- private int firstDayOfWeek = Calendar.SUNDAY;
- private int theme = AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
- private boolean quickNoteNotification = true;
- private boolean parseTimeFromQuickNote = true;
- private boolean isMinimizeGrayColor = false;
- private boolean trimItemNamesOnEdit = true;
- private ItemAction itemOnClickAction = ItemAction.OPEN_EDITOR;
- private ItemAction itemOnLeftAction = ItemAction.MINIMIZE_REVERT;
- private UUID quickNoteNotificationItemsStorageId = null;
- private boolean isTelemetry = true;
- private ItemsRegistry.ItemInfo defaultQuickNoteType = ItemsRegistry.REGISTRY.get(TextItem.class);
- private FirstTab firstTab = FirstTab.TAB_ON_CLOSING;
- private String datePattern = "yyyy.MM.dd EE";
- private String timePattern = "HH:mm:ss";
- private ItemAddPosition itemAddPosition = ItemAddPosition.BOTTOM;
- private boolean confirmFastChanges = true;
- private boolean isAutoCloseToolbar = true;
- private boolean isScrollToAddedItem = true;
- private boolean isItemEditorBackgroundFromItem = false;
-
-
- public SettingsManager(File saveFile) {
- this.saveFile = saveFile;
- load();
- }
-
- @Getter public int getFirstDayOfWeek() { return firstDayOfWeek; }
- @Setter public void setFirstDayOfWeek(int firstDayOfWeek) { this.firstDayOfWeek = firstDayOfWeek; }
- @Getter public int getTheme() { return theme; }
- @Setter public void setTheme(int theme) { this.theme = theme; }
- @Getter public boolean isQuickNoteNotification() { return quickNoteNotification; }
- @Setter public void setQuickNoteNotification(boolean quickNoteNotification) { this.quickNoteNotification = quickNoteNotification; }
- @Getter public boolean isMinimizeGrayColor() { return isMinimizeGrayColor; }
- @Setter public void setMinimizeGrayColor(boolean minimizeGrayColor) {isMinimizeGrayColor = minimizeGrayColor;}
- @Getter public boolean isParseTimeFromQuickNote() { return parseTimeFromQuickNote; }
- @Setter public void setParseTimeFromQuickNote(boolean parseTimeFromQuickNote) {this.parseTimeFromQuickNote = parseTimeFromQuickNote;}
- @Getter public boolean isTrimItemNamesOnEdit() {return trimItemNamesOnEdit;}
- @Setter public void setTrimItemNamesOnEdit(boolean trimItemNamesOnEdit) {this.trimItemNamesOnEdit = trimItemNamesOnEdit;}
- @Getter public ItemAction getItemOnClickAction() {return itemOnClickAction;}
- @Setter public void setItemOnClickAction(ItemAction itemOnClickAction) {this.itemOnClickAction = itemOnClickAction;}
- @Getter public ItemAction getItemOnLeftAction() {return itemOnLeftAction;}
- @Setter public void setItemOnLeftAction(ItemAction itemOnLeftAction) {this.itemOnLeftAction = itemOnLeftAction;}
- @Getter public UUID getQuickNoteNotificationItemsStorageId() {return quickNoteNotificationItemsStorageId;}
- @Setter public void setQuickNoteNotificationItemsStorageId(UUID quickNoteNotificationItemsStorageId) {this.quickNoteNotificationItemsStorageId = quickNoteNotificationItemsStorageId;}
- @Getter public boolean isTelemetry() {return isTelemetry;}
- @Setter public void setTelemetry(boolean b) {this.isTelemetry = b;}
- @Getter public ItemsRegistry.ItemInfo getDefaultQuickNoteType() {return defaultQuickNoteType;}
- @Setter public void setDefaultQuickNoteType(ItemsRegistry.ItemInfo defaultQuickNoteType) {this.defaultQuickNoteType = defaultQuickNoteType;}
- @Getter public FirstTab getFirstTab() {return firstTab;}
- @Setter public void setFirstTab(FirstTab firstTab) {this.firstTab = firstTab;}
- @Getter public String getDatePattern() {return datePattern;}
- @Setter public void setDatePattern(String datePattern) {this.datePattern = datePattern;}
- @Getter public String getTimePattern() {return timePattern;}
- @Setter public void setTimePattern(String timePattern) {this.timePattern = timePattern;}
- public void applyDateAndTimePreset(DateAndTimePreset p) {
- setDatePattern(p.getDate());
- setTimePattern(p.getTime());
- }
- @Setter public void setItemAddPosition(ItemAddPosition e) {this.itemAddPosition = e;}
- @Getter public ItemAddPosition getItemAddPosition() {return itemAddPosition;}
-
- @Getter public boolean isConfirmFastChanges() {return confirmFastChanges;}
- @Setter public void setConfirmFastChanges(boolean confirmFastChanges) {this.confirmFastChanges = confirmFastChanges;}
-
-
-
- public boolean isItemEditorBackgroundFromItem() {
- return isItemEditorBackgroundFromItem;
- }
-
- public boolean isScrollToAddedItem() {
- return isScrollToAddedItem;
- }
-
- public boolean isAutoCloseToolbar() {
- return isAutoCloseToolbar;
- }
-
- public void setAutoCloseToolbar(boolean autoCloseToolbar) {
- isAutoCloseToolbar = autoCloseToolbar;
- }
-
- public void setItemEditorBackgroundFromItem(boolean itemEditorBackgroundFromItem) {
- isItemEditorBackgroundFromItem = itemEditorBackgroundFromItem;
- }
-
- public void setScrollToAddedItem(boolean scrollToAddedItem) {
- isScrollToAddedItem = scrollToAddedItem;
- }
-
- private void load() {
- if (!FileUtil.isExist(saveFile)) {
- return;
- }
- try {
- JSONObject j = new JSONObject(FileUtil.getText(saveFile, "{}"));
- // first day of week
- String dayOfWeek = j.optString(KEY_FIRST_DAY_OF_WEEK, FIRST_DAY_OF_WEEK_SATURDAY);
- if (dayOfWeek.equalsIgnoreCase(FIRST_DAY_OF_WEEK_MONDAY)) {
- this.firstDayOfWeek = Calendar.MONDAY;
- } else {
- this.firstDayOfWeek = Calendar.SATURDAY;
- }
-
- // theme
- String them = j.optString(KEY_THEME, THEME_SYSTEM);
- if (them.equalsIgnoreCase(THEME_LIGHT)) {
- this.theme = AppCompatDelegate.MODE_NIGHT_NO;
- } else if (them.equalsIgnoreCase(THEME_NIGHT)) {
- this.theme = AppCompatDelegate.MODE_NIGHT_YES;
- } else {
- this.theme = AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
- }
-
- // Quick note and etc...
- this.quickNoteNotification = j.optBoolean(KEY_QUICK_NOTE_NOTIFICATION, this.quickNoteNotification);
- this.parseTimeFromQuickNote = j.optBoolean(KEY_PARSETIMEFROMQUICKNOTE, this.parseTimeFromQuickNote);
- this.isMinimizeGrayColor = j.optBoolean(KEY_ISMINIMIZEGRAYCOLOR, this.isMinimizeGrayColor);
- this.trimItemNamesOnEdit = j.optBoolean(KEY_TRIMITEMNAMESONEDIT, this.trimItemNamesOnEdit);
- try {
- this.itemOnClickAction = ItemAction.valueOf(j.optString("itemOnClickAction"));
- } catch (Exception ignored) {}
- try {
- this.itemOnLeftAction = ItemAction.valueOf(j.optString("itemOnLeftAction"));
- } catch (Exception ignored) {}
- try {
- this.quickNoteNotificationItemsStorageId = UUID.fromString(j.optString("quickNoteNotificationItemsStorageId"));
- } catch (Exception ignored) {}
- this.isTelemetry = j.optBoolean("isTelemetry", isTelemetry);
- try {
- this.defaultQuickNoteType = ItemsRegistry.REGISTRY.get(j.getString("defaultQuickNoteType"));
- } catch (Exception ignored) {}
-
- try {
- this.firstTab = FirstTab.valueOf(j.getString("firstTab"));
- } catch (Exception ignored) {}
- datePattern = j.optString("datePattern", datePattern);
- timePattern = j.optString("timePattern", timePattern);
-
- try {
- this.itemAddPosition = ItemAddPosition.valueOf(j.getString("itemAddPosition"));
- } catch (Exception ignored) {}
- this.confirmFastChanges = j.optBoolean("confirmFastChanges", this.confirmFastChanges);
- this.isAutoCloseToolbar = j.optBoolean("isAutoCloseToolbar", this.isAutoCloseToolbar);
- this.isScrollToAddedItem = j.optBoolean("isScrollToAddedItem", this.isScrollToAddedItem);
- this.isItemEditorBackgroundFromItem = j.optBoolean("isItemEditorBackgroundFromItem", this.isItemEditorBackgroundFromItem);
-
- } catch (Exception e) {
- Logger.e(TAG, "load", e);
- App.exception(null, e);
- }
- }
-
- public void save() {
- try {
- JSONObject j = exportJSONSettings();
- FileUtil.setText(saveFile, j.toString());
- } catch (Exception e) {
- Logger.e(TAG, "save", e);
- App.exception(null, e);
- }
- }
-
- public JSONObject exportJSONSettings() throws JSONException {
- JSONObject j = new JSONObject();
-
- String temp_firstDayOfWeek = this.firstDayOfWeek == Calendar.MONDAY ? FIRST_DAY_OF_WEEK_MONDAY : FIRST_DAY_OF_WEEK_SATURDAY;
- String temp_theme = THEME_SYSTEM;
- if (this.theme == AppCompatDelegate.MODE_NIGHT_YES) temp_theme = THEME_NIGHT;
- if (this.theme == AppCompatDelegate.MODE_NIGHT_NO) temp_theme = THEME_LIGHT;
-
- j.put(KEY_THEME, temp_theme);
- j.put(KEY_FIRST_DAY_OF_WEEK, temp_firstDayOfWeek);
- j.put(KEY_QUICK_NOTE_NOTIFICATION, this.quickNoteNotification);
- j.put(KEY_PARSETIMEFROMQUICKNOTE, this.parseTimeFromQuickNote);
- j.put(KEY_ISMINIMIZEGRAYCOLOR, this.isMinimizeGrayColor);
- j.put(KEY_TRIMITEMNAMESONEDIT, this.trimItemNamesOnEdit);
- j.put("itemOnClickAction", itemOnClickAction.name());
- j.put("itemOnLeftAction", itemOnLeftAction.name());
- j.put("quickNoteNotificationItemsStorageId", quickNoteNotificationItemsStorageId != null ? quickNoteNotificationItemsStorageId.toString() : null);
- j.put("isTelemetry", this.isTelemetry);
- j.put("defaultQuickNoteType", this.defaultQuickNoteType.getStringType());
- j.put("firstTab", this.firstTab.name());
- j.put("datePattern", this.datePattern);
- j.put("timePattern", this.timePattern);
- j.put("itemAddPosition", this.itemAddPosition.name());
- j.put("confirmFastChanges", this.confirmFastChanges);
- j.put("isAutoCloseToolbar", this.isAutoCloseToolbar);
- j.put("isScrollToAddedItem", this.isScrollToAddedItem);
- j.put("isItemEditorBackgroundFromItem", this.isItemEditorBackgroundFromItem);
- return j;
- }
-
- public void importData(JSONObject settings) {
- FileUtil.setText(saveFile, settings.toString());
- load();
- }
-
- public enum ItemAction {
- OPEN_EDITOR,
- OPEN_TEXT_EDITOR,
- SELECT_REVERT,
- SELECT_ON,
- SELECT_OFF,
- DELETE_REQUEST,
- MINIMIZE_REVERT,
- MINIMIZE_ON,
- MINIMIZE_OFF
- }
-
- public enum FirstTab {
- FIRST,
- TAB_ON_CLOSING
- }
-
- public enum DateAndTimePreset {
- DEFAULT("HH:mm:ss", "yyyy.MM.dd EE"),
- DEFAULT_FULLY_WEEKDAY("HH:mm:ss", "yyyy.MM.dd EEEE"),
- NO_SECONDS("HH:mm", "yyyy.MM.dd EE"),
- NO_SECONDS_FULLY_WEEKDAY("HH:mm", "yyyy.MM.dd EEEE"),
- INVERT_DATE("HH:mm:ss", "dd.MM.yyyy EE"),
- INVERT_DATE_FULLY_WEEKDAY("HH:mm:ss", "dd.MM.yyyy EEEE"),
- ;
-
- private final String time;
- private final String date;
-
- DateAndTimePreset(String time, String date) {
- this.time = time;
- this.date = date;
- }
-
- public String getTime() {
- return time;
- }
-
- public String getDate() {
- return date;
- }
- }
-
- public enum ItemAddPosition {
- TOP,
- BOTTOM
- }
-}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/Telemetry.java b/app/src/main/java/com/fazziclay/opentoday/app/Telemetry.java
index 3fb64247..6624a098 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/Telemetry.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/Telemetry.java
@@ -1,5 +1,7 @@
package com.fazziclay.opentoday.app;
+import static com.fazziclay.opentoday.util.InlineUtil.IPROF;
+
import androidx.annotation.NonNull;
import com.fazziclay.javaneoutil.FileUtil;
@@ -77,7 +79,11 @@ public void queryTelemetryStatus() {
}
public void send(LPacket lPacket) {
- if (!isEnabled) return;
+ IPROF.push("Telemetry:send");
+ if (!isEnabled) {
+ IPROF.pop();
+ return;
+ }
Logger.d(TAG, "send(): " + lPacket);
if (lPacket.isDelay() && !NO_DELAY) {
long last = getLastSend(lPacket.getClass().getName());
@@ -93,6 +99,7 @@ public void send(LPacket lPacket) {
int d2 = g.get(Calendar.DAY_OF_MONTH);
Logger.d(TAG, "send() d1=", d1, "d2=", d2 + " sanding-canceled: " + (d1 == d2));
if (d1 == d2) {
+ IPROF.pop();
return;
}
}
@@ -106,6 +113,7 @@ public void send(LPacket lPacket) {
}
Logger.d(TAG, "send(): wait: done");
setLastSend(lPacket.getClass().getName());
+ IPROF.pop();
}
@NonNull
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/UpdateChecker.java b/app/src/main/java/com/fazziclay/opentoday/app/UpdateChecker.java
index f2796679..0f02b27a 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/UpdateChecker.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/UpdateChecker.java
@@ -14,7 +14,7 @@ public class UpdateChecker {
private static final String V2_URL_LATEST_BUILD = "https://fazziclay.github.io/api/project_3/v2/latest_build";
private static final String V2_URL_LATEST = "https://fazziclay.github.io/api/project_3/v2/latest.json";
- private static final long CACHE_TIMEOUT_MILLIS = 5 * 60 * 60 * 1000; // 5 hours
+ private static final long CACHE_TIMEOUT_MILLIS = 48 * 60 * 60 * 1000; // 48 hours
private static final String TAG = "UpdateChecker";
public static void check(Context context, Result result) {
@@ -31,6 +31,7 @@ private static class UpdateCheckedThread extends Thread {
private final File cacheFile;
public UpdateCheckedThread(Context context, Result result) {
+ setName("UpdateCheckerThread");
this.result = result;
this.cacheFile = new File(context.getExternalCacheDir(), "latest_update_check");
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/data/Cherry.java b/app/src/main/java/com/fazziclay/opentoday/app/data/Cherry.java
index da615ce2..590d03f9 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/data/Cherry.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/data/Cherry.java
@@ -1,6 +1,7 @@
package com.fazziclay.opentoday.app.data;
import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -202,6 +203,7 @@ public String toString() {
return "Cherry"+json.toString();
}
+ @Nullable
public String getString(String key) {
if (!has(key)) return null;
try {
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/data/CherryOrchard.java b/app/src/main/java/com/fazziclay/opentoday/app/data/CherryOrchard.java
index 0892ea7a..d9617c7a 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/data/CherryOrchard.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/data/CherryOrchard.java
@@ -131,6 +131,12 @@ public void forEachCherry(CherryProvider provider) {
}
}
+ public Cherry createAndAdd() {
+ Cherry cherry = new Cherry();
+ put(cherry);
+ return cherry;
+ }
+
public interface CherryProvider {
void provide(int index, Cherry cherry);
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/datafixer/DataFixer.java b/app/src/main/java/com/fazziclay/opentoday/app/datafixer/DataFixer.java
index dd61619b..edd43e7d 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/datafixer/DataFixer.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/datafixer/DataFixer.java
@@ -155,9 +155,116 @@ private int tryFix(int dataVersion) {
isUpdated = true;
}
+ if (dataVersion == 11) {
+ log("v11 -> v12", "Fixing settings");
+ fix11versionTo12();
+ dataVersion = 12;
+ isUpdated = true;
+ }
+
return dataVersion;
}
+ private void fix11versionTo12() {
+ final String TAG = "v11 -> v12";
+ // DO NOT EDIT
+ try {
+ File file = new File(context.getExternalFilesDir(""), "settings.json");
+ JSONObject old = new JSONObject(FileUtil.getText(file));
+ JSONObject nev = new JSONObject();
+
+ if (old.has("theme")) {
+ String val = old.getString("theme");
+ if (val.equals("night")) {
+ nev.put("theme", "NIGHT");
+ } else if (val.equals("light")) {
+ nev.put("theme", "LIGHT");
+ } else {
+ nev.put("theme", "AUTO");
+ }
+ }
+
+ if (old.has("firstDayOfWeek")) {
+ String val = old.getString("firstDayOfWeek");
+ if (val.equals("saturday")) {
+ nev.put("first_day_of_week", "SATURDAY");
+ } else if (val.equals("monday")) {
+ nev.put("first_day_of_week", "MONDAY");
+ }
+ }
+
+ if (old.has("quickNote")) {
+ nev.put("quick_note.notification.enable", old.getBoolean("quickNote"));
+ }
+
+ if (old.has("parseTimeFromQuickNote")) {
+ nev.put("quick_note.parse_time_from_item", old.getBoolean("parseTimeFromQuickNote"));
+ }
+
+ if (old.has("isMinimizeGrayColor")) {
+ nev.put("item.minimize.gray_color", old.getBoolean("isMinimizeGrayColor"));
+ }
+
+ if (old.has("trimItemNamesOnEdit")) {
+ nev.put("item.editor.trim_names", old.getBoolean("trimItemNamesOnEdit"));
+ }
+
+ if (old.has("itemOnClickAction")) {
+ nev.put("item.action.click", old.getString("itemOnClickAction"));
+ }
+
+ if (old.has("itemOnLeftAction")) {
+ nev.put("item.action.left_swipe", old.getString("itemOnLeftAction"));
+ }
+
+ if (old.has("isTelemetry")) {
+ nev.put("telemetry.enable", old.getBoolean("isTelemetry"));
+ }
+
+ if (old.has("defaultQuickNoteType")) {
+ String defaultQuickNoteType = old.getString("defaultQuickNoteType");
+ String c = switch (defaultQuickNoteType) {
+ case "CheckboxItem" -> "CHECKBOX";
+ case "GroupItem" -> "GROUP";
+ case "FilterGroupItem" -> "FILTER_GROUP";
+ case "LongTextItem" -> "LONG_TEXT";
+ case "DayRepeatableCheckboxItem" -> "CHECKBOX_DAY_REPEATABLE";
+ default -> "TEXT";
+ };
+ nev.put("quick_note.item_type", c);
+ }
+
+ if (old.has("firstTab")) {
+ nev.put("first_tab", old.getString("firstTab"));
+ }
+
+ if (old.has("itemAddPosition")) {
+ nev.put("item.add_position", old.getString("itemAddPosition"));
+ }
+
+ if (old.has("confirmFastChanges")) {
+ nev.put("fast_changes.confirm", old.getBoolean("confirmFastChanges"));
+ }
+
+ if (old.has("isAutoCloseToolbar")) {
+ nev.put("toolbar.auto_close", old.getBoolean("isAutoCloseToolbar"));
+ }
+
+ if (old.has("isScrollToAddedItem")) {
+ nev.put("item.is_scroll_to_added", old.getBoolean("isScrollToAddedItem"));
+ }
+
+ if (old.has("isItemEditorBackgroundFromItem")) {
+ nev.put("item.use_container_editor_background_from_item", old.getBoolean("isItemEditorBackgroundFromItem"));
+ }
+
+
+ FileUtil.setText(file, nev.toString());
+ } catch (Exception e) {
+ log(TAG, "exception: " + e);
+ }
+ }
+
private void fix8versionTo9() {
final String TAG = "v8 -> v9";
log(TAG, "FIX START");
@@ -378,6 +485,11 @@ public JSONArray fixItems(int from, JSONArray items) throws Exception {
from = 11;
}
+ if (from == 11) {
+ // nothing to fix
+ from = 12;
+ }
+
return result;
}
@@ -400,6 +512,11 @@ public JSONArray fixTabs(int from, JSONArray tabs) throws Exception {
// nothing to fix
from = 11;
}
+
+ if (from == 11) {
+ // nothing to fix
+ from = 12;
+ }
return result;
}
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/events/gui/CurrentItemsStorageContextChanged.java b/app/src/main/java/com/fazziclay/opentoday/app/events/gui/CurrentItemsStorageContextChanged.java
new file mode 100644
index 00000000..44e95954
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/events/gui/CurrentItemsStorageContextChanged.java
@@ -0,0 +1,16 @@
+package com.fazziclay.opentoday.app.events.gui;
+
+import com.fazziclay.opentoday.api.Event;
+import com.fazziclay.opentoday.app.items.ItemsStorage;
+
+public class CurrentItemsStorageContextChanged implements Event {
+ private final ItemsStorage currentItemsStorage;
+
+ public CurrentItemsStorageContextChanged(ItemsStorage currentItemsStorage) {
+ this.currentItemsStorage = currentItemsStorage;
+ }
+
+ public ItemsStorage getCurrentItemsStorage() {
+ return currentItemsStorage;
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/events/gui/toolbar/AppToolbarSelectionClickEvent.java b/app/src/main/java/com/fazziclay/opentoday/app/events/gui/toolbar/AppToolbarSelectionClickEvent.java
new file mode 100644
index 00000000..7f1f2c85
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/events/gui/toolbar/AppToolbarSelectionClickEvent.java
@@ -0,0 +1,31 @@
+package com.fazziclay.opentoday.app.events.gui.toolbar;
+
+import android.app.Activity;
+
+import com.fazziclay.opentoday.api.Event;
+import com.fazziclay.opentoday.app.items.selection.SelectionManager;
+import com.fazziclay.opentoday.databinding.ToolbarMoreSelectionBinding;
+
+public class AppToolbarSelectionClickEvent implements Event {
+ private final Activity activity;
+ private final com.fazziclay.opentoday.databinding.ToolbarMoreSelectionBinding localBinding;
+ private final SelectionManager selectionManager;
+
+ public AppToolbarSelectionClickEvent(Activity activity, ToolbarMoreSelectionBinding localBinding, SelectionManager selectionManager) {
+ this.activity = activity;
+ this.localBinding = localBinding;
+ this.selectionManager = selectionManager;
+ }
+
+ public Activity getActivity() {
+ return activity;
+ }
+
+ public SelectionManager getSelectionManager() {
+ return selectionManager;
+ }
+
+ public ToolbarMoreSelectionBinding getLocalBinding() {
+ return localBinding;
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/events/items/ItemsRootDestroyedEvent.java b/app/src/main/java/com/fazziclay/opentoday/app/events/items/ItemsRootDestroyedEvent.java
new file mode 100644
index 00000000..1bd147bd
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/events/items/ItemsRootDestroyedEvent.java
@@ -0,0 +1,16 @@
+package com.fazziclay.opentoday.app.events.items;
+
+import com.fazziclay.opentoday.api.Event;
+import com.fazziclay.opentoday.app.items.ItemsRoot;
+
+public class ItemsRootDestroyedEvent implements Event {
+ private final ItemsRoot itemsRoot;
+
+ public ItemsRootDestroyedEvent(ItemsRoot itemsRoot) {
+ this.itemsRoot = itemsRoot;
+ }
+
+ public ItemsRoot getItemsRoot() {
+ return itemsRoot;
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/events/items/ItemsRootInitializedEvent.java b/app/src/main/java/com/fazziclay/opentoday/app/events/items/ItemsRootInitializedEvent.java
new file mode 100644
index 00000000..48a255f1
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/events/items/ItemsRootInitializedEvent.java
@@ -0,0 +1,16 @@
+package com.fazziclay.opentoday.app.events.items;
+
+import com.fazziclay.opentoday.api.Event;
+import com.fazziclay.opentoday.app.items.ItemsRoot;
+
+public class ItemsRootInitializedEvent implements Event {
+ private final ItemsRoot itemsRoot;
+
+ public ItemsRootInitializedEvent(ItemsRoot itemsRoot) {
+ this.itemsRoot = itemsRoot;
+ }
+
+ public ItemsRoot getItemsRoot() {
+ return itemsRoot;
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/icons/IconsRegistry.java b/app/src/main/java/com/fazziclay/opentoday/app/icons/IconsRegistry.java
new file mode 100644
index 00000000..9ae71f4f
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/icons/IconsRegistry.java
@@ -0,0 +1,137 @@
+package com.fazziclay.opentoday.app.icons;
+
+import androidx.annotation.DrawableRes;
+
+import com.fazziclay.opentoday.R;
+import com.fazziclay.opentoday.util.Logger;
+import com.fazziclay.opentoday.util.RandomUtil;
+
+import java.util.Arrays;
+
+public class IconsRegistry {
+ private static final String TAG = "IconsRegistry";
+ public static final IconsRegistry REGISTRY = new IconsRegistry();
+
+ private final Icon[] ICONS = new Icon[]{
+ new Icon("opentoday", R.mipmap.ic_launcher),
+ new Icon("opentoday_beta", R.mipmap.ic_launcher_beta),
+ new Icon("none", R.drawable.close_24px), // special icon
+
+
+
+ new Icon("add", R.drawable.add_24px),
+ new Icon("aspect_ratio", R.drawable.aspect_ratio_24px),
+ new Icon("background_replace", R.drawable.background_replace_24px),
+ new Icon("barefoot", R.drawable.barefoot_24px),
+ new Icon("baseline_account_tree", R.drawable.baseline_account_tree_24),
+ new Icon("baseline_add_alert", R.drawable.baseline_add_alert_24),
+ new Icon("baseline_celebration", R.drawable.baseline_celebration_24),
+ new Icon("baseline_thumb_up", R.drawable.baseline_thumb_up_24),
+ new Icon("baseline_upcoming", R.drawable.baseline_upcoming_24),
+ new Icon("baseline_waves", R.drawable.baseline_waves_24),
+ new Icon("baseline_weekend", R.drawable.baseline_weekend_24),
+ new Icon("baseline_window", R.drawable.baseline_window_24),
+ new Icon("baseline_yard", R.drawable.baseline_yard_24),
+ new Icon("bed", R.drawable.bed_24px),
+ new Icon("bedtime", R.drawable.bedtime_24px),
+ new Icon("calendar_clock", R.drawable.calendar_clock_24px),
+ new Icon("calendar_today", R.drawable.calendar_today_24px),
+ new Icon("check_box_outline_blank", R.drawable.check_box_outline_blank_24px),
+ new Icon("close", R.drawable.close_24px),
+ new Icon("cloudy_snowing", R.drawable.cloudy_snowing_24px),
+ new Icon("content_copy", R.drawable.content_copy_24px),
+ new Icon("delete", R.drawable.delete_24px),
+ new Icon("edit", R.drawable.edit_24px),
+ new Icon("edit_note", R.drawable.edit_note_24px),
+ new Icon("emoji_flags", R.drawable.emoji_flags_24px),
+ new Icon("emoji_food_beverage", R.drawable.emoji_food_beverage_24px),
+ new Icon("emoji_objects", R.drawable.emoji_objects_24px),
+ new Icon("export_notes", R.drawable.export_notes_24px),
+ new Icon("face_2", R.drawable.face_2_24px),
+ new Icon("fluid", R.drawable.fluid_24px),
+ new Icon("format_bold", R.drawable.format_bold_24px),
+ new Icon("format_italic", R.drawable.format_italic_24px),
+ new Icon("format_size", R.drawable.format_size_24px),
+ new Icon("format_strikethrough", R.drawable.format_strikethrough_24px),
+ new Icon("gastroenterology", R.drawable.gastroenterology_24px),
+ new Icon("handyman", R.drawable.handyman_24px),
+ new Icon("home_health", R.drawable.home_health_24px),
+ new Icon("home_work", R.drawable.home_work_24px),
+ new Icon("info_i", R.drawable.info_i_24px),
+ new Icon("minimize", R.drawable.minimize_24px),
+ new Icon("new_label", R.drawable.new_label_24px),
+ new Icon("notifications", R.drawable.notifications_24px),
+ new Icon("opacity", R.drawable.opacity_24px),
+ new Icon("palette", R.drawable.palette_24px),
+ new Icon("pause_presentation", R.drawable.pause_presentation_24px),
+ new Icon("pill", R.drawable.pill_24px),
+ new Icon("procedure", R.drawable.procedure_24px),
+ new Icon("psychiatry", R.drawable.psychiatry_24px),
+ new Icon("recommend", R.drawable.recommend_24px),
+ new Icon("redeem", R.drawable.redeem_24px),
+ new Icon("repeat", R.drawable.repeat_24px),
+ new Icon("rocket", R.drawable.rocket_24px),
+ new Icon("rocket_launch", R.drawable.rocket_launch_24px),
+ new Icon("save", R.drawable.save_24px),
+ new Icon("select", R.drawable.select_24px),
+ new Icon("sentiment_stressed", R.drawable.sentiment_stressed_24px),
+ new Icon("sentiment_very_dissatisfied", R.drawable.sentiment_very_dissatisfied_24px),
+ new Icon("sentiment_worried", R.drawable.sentiment_worried_24px),
+ new Icon("shopping_basket", R.drawable.shopping_basket_24px),
+ new Icon("shopping_cart", R.drawable.shopping_cart_24px),
+ new Icon("store", R.drawable.store_24px),
+ new Icon("surgical", R.drawable.surgical_24px),
+ new Icon("swipe_left", R.drawable.swipe_left_24px),
+ new Icon("syringe", R.drawable.syringe_24px),
+ new Icon("taunt", R.drawable.taunt_24px),
+ new Icon("touch_app", R.drawable.touch_app_24px),
+ new Icon("tune", R.drawable.tune_24px),
+
+ };
+ public final Icon OPENTODAY = getById("opentoday");
+ public final Icon NONE = getById("none");
+
+ private IconsRegistry() {
+ }
+
+ public Icon randomIcon() {
+ return getIconsList()[RandomUtil.bounds(0, getIconsList().length)];
+ }
+
+
+ public class Icon {
+ private final String id;
+ private final int resId;
+
+ public Icon(String id, @DrawableRes int resId) {
+ this.id = id;
+ this.resId = resId;
+ }
+
+ @DrawableRes
+ public int getResId() {
+ return resId;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public boolean isNone() {
+ return this == NONE;
+ }
+ }
+
+ public Icon[] getIconsList() {
+ return ICONS.clone();
+ }
+
+ public Icon getById(String id) {
+ for (Icon icon : ICONS) {
+ if (icon.id.equalsIgnoreCase(id)) {
+ return icon;
+ }
+ }
+ return OPENTODAY;
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/ItemsStorage.java b/app/src/main/java/com/fazziclay/opentoday/app/items/ItemsStorage.java
index 2eeecfe8..7ae46eab 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/ItemsStorage.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/ItemsStorage.java
@@ -108,6 +108,12 @@ public interface ItemsStorage extends Tickable {
*/
int size();
+ /**
+ * get items count include children item
+ * @return count of total items
+ */
+ int totalSize();
+
/**
* Get OnItemStorageUpdate CallbackStorage
* @return callbackStorage
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/QuickNoteReceiver.java b/app/src/main/java/com/fazziclay/opentoday/app/items/QuickNoteReceiver.java
index 25d86b5c..746c1fac 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/QuickNoteReceiver.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/QuickNoteReceiver.java
@@ -12,10 +12,11 @@
import com.fazziclay.opentoday.R;
import com.fazziclay.opentoday.app.App;
-import com.fazziclay.opentoday.app.SettingsManager;
-import com.fazziclay.opentoday.app.items.item.TextItem;
+import com.fazziclay.opentoday.app.items.item.Item;
+import com.fazziclay.opentoday.app.settings.SettingsManager;
import com.fazziclay.opentoday.app.items.tab.TabsManager;
-import com.fazziclay.opentoday.gui.fragment.ItemsTabIncludeFragment;
+import com.fazziclay.opentoday.gui.GuiItemsHelper;
+import com.fazziclay.opentoday.gui.fragment.item.ItemsTabIncludeFragment;
import com.fazziclay.opentoday.util.RandomUtil;
import java.util.UUID;
@@ -73,8 +74,10 @@ public void onReceive(final Context context, final Intent intent) {
}
}
if (rawText != null) {
- final TextItem item = new TextItem(context.getString(R.string.quickNote_notificationPattern, rawText));
- if (settingsManager.isParseTimeFromQuickNote()) item.getNotifications().addAll(ItemsTabIncludeFragment.QUICK_NOTE_NOTIFICATIONS_PARSE.run(rawText));
+ final Item item = GuiItemsHelper.createItem(context, settingsManager.getDefaultQuickNoteType(), context.getString(R.string.quickNote_notificationPattern, rawText), settingsManager);
+ if (settingsManager.isParseTimeFromQuickNote()) {
+ item.addNotifications(ItemsTabIncludeFragment.QUICK_NOTE_NOTIFICATIONS_PARSE.run(rawText));
+ }
UUID itemsStorageIdForQuickNote = settingsManager.getQuickNoteNotificationItemsStorageId();
ItemsStorage itemsStorage;
if (itemsStorageIdForQuickNote == null) {
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/callback/ItemCallback.java b/app/src/main/java/com/fazziclay/opentoday/app/items/callback/ItemCallback.java
index e42416ad..c0e6c22a 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/callback/ItemCallback.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/callback/ItemCallback.java
@@ -28,4 +28,13 @@ public Status detached(Item item) {
public Status tick(Item item) {
return Status.NONE;
}
+
+ // debug function...
+ public Status click(Item item) {
+ return Status.NONE;
+ }
+
+ public Status cachedNotificationStatusChanged(Item item, boolean isUpdateNotifications) {
+ return Status.NONE;
+ }
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/callback/OnTabsChanged.java b/app/src/main/java/com/fazziclay/opentoday/app/items/callback/OnTabsChanged.java
index 13c5c2cb..28616933 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/callback/OnTabsChanged.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/callback/OnTabsChanged.java
@@ -35,4 +35,8 @@ public Status onTabMoved(Tab tab, int fromPos, int toPos) {
public Status onTabRenamed(Tab tab, int position) {
return Status.NONE;
}
+
+ public Status onTabIconChanged(Tab tab, int position) {
+ return Status.NONE;
+ }
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/CheckboxItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/CheckboxItem.java
index 46425187..88be9d12 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/CheckboxItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/CheckboxItem.java
@@ -62,6 +62,11 @@ public CheckboxItem(CheckboxItem copy) {
this.checked = copy.checked;
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.CHECKBOX;
+ }
+
@Override
protected void updateStat() {
super.updateStat();
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/CounterItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/CounterItem.java
index 585091a6..1118929a 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/CounterItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/CounterItem.java
@@ -58,6 +58,11 @@ public CounterItem(CounterItem copy) {
this.step = copy.step;
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.COUNTER;
+ }
+
public void up() {
counter = counter + step;
visibleChanged();
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/CycleListItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/CycleListItem.java
index 8c9f419e..22248a3a 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/CycleListItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/CycleListItem.java
@@ -17,6 +17,9 @@
import com.fazziclay.opentoday.util.callback.CallbackStorage;
import com.fazziclay.opentoday.util.callback.Status;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
import java.util.UUID;
public class CycleListItem extends TextItem implements ContainerItem, ItemsStorage, CurrentItemStorage {
@@ -81,6 +84,11 @@ public CycleListItem(CycleListItem copy) {
}
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.CYCLE_LIST;
+ }
+
@Override
public Item getCurrentItem() {
if (size() == 0) {
@@ -128,18 +136,31 @@ public void previous() {
public void tick(TickSession tickSession) {
if (!tickSession.isAllowed(this)) return;
super.tick(tickSession);
- if (tickBehavior != TickBehavior.ALL) ItemUtil.tickOnlyImportantTargets(tickSession, getAllItems());
+ final List- planned = new ArrayList<>();
if (tickBehavior == TickBehavior.ALL) {
- itemsCycleStorage.tick(tickSession);
+ planned.addAll(Arrays.asList(getAllItems()));
+
} else if (tickBehavior == TickBehavior.CURRENT) {
Item c = getCurrentItem();
- if (c != null && tickSession.isAllowed(c)) c.tick(tickSession);
+ if (c != null && tickSession.isAllowed(c)) {
+ planned.add(c);
+ }
} else if (tickBehavior == TickBehavior.NOT_CURRENT) {
Item c = getCurrentItem();
for (Item item : getAllItems()) {
- if (item != c && tickSession.isAllowed(item)) item.tick(tickSession);
+ if (item != c && tickSession.isAllowed(item)) {
+ planned.add(item);
+ }
}
}
+
+ if (tickBehavior != TickBehavior.ALL) {
+ tickSession.runWithPlannedNormalTick(planned, null, () -> ItemUtil.tickOnlyImportantTargets(tickSession, getAllItems()));
+ }
+
+ for (Item item : planned) {
+ item.tick(tickSession);
+ }
}
@Override
@@ -192,6 +213,11 @@ public int size() {
return itemsCycleStorage.size();
}
+ @Override
+ public int totalSize() {
+ return itemsCycleStorage.totalSize();
+ }
+
@Override
public void addItem(Item item) {
Item p = getCurrentItem();
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/DayRepeatableCheckboxItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/DayRepeatableCheckboxItem.java
index bf2b22ab..a9c734c8 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/DayRepeatableCheckboxItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/DayRepeatableCheckboxItem.java
@@ -74,6 +74,11 @@ public DayRepeatableCheckboxItem(DayRepeatableCheckboxItem copy) {
this.latestDayOfYear = copy.latestDayOfYear;
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.CHECKBOX_DAY_REPEATABLE;
+ }
+
@Override
public void setChecked(boolean s) {
latestDayOfYear = new GregorianCalendar().get(Calendar.DAY_OF_YEAR);
@@ -86,6 +91,7 @@ public void tick(TickSession tickSession) {
super.tick(tickSession);
if (tickSession.isTickTargetAllowed(TickTarget.ITEM_DAY_REPEATABLE_CHECKBOX_UPDATE)) {
+ profPush(tickSession, "checkbox_day_repeatable_update");
int dayOfYear = tickSession.getGregorianCalendar().get(Calendar.DAY_OF_YEAR);
if (dayOfYear != latestDayOfYear) {
latestDayOfYear = dayOfYear;
@@ -103,6 +109,7 @@ public void tick(TickSession tickSession) {
tickSession.saveNeeded();
}
}
+ profPop(tickSession);
}
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/DebugTickCounterItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/DebugTickCounterItem.java
index 4bc13beb..f1f11155 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/DebugTickCounterItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/DebugTickCounterItem.java
@@ -49,6 +49,7 @@ public static DebugTickCounterItem createEmpty() {
}
@SaveKey(key = "counter") @RequireSave private int counter;
+ private long plannedCounter;
private String debugStat = "";
private Rose rose;
@@ -75,6 +76,11 @@ public DebugTickCounterItem(DebugTickCounterItem copy) {
this.rose = copy.rose; // warning!
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.DEBUG_TICK_COUNTER;
+ }
+
@Override
public void tick(TickSession tickSession) {
if (!tickSession.isAllowed(this)) {
@@ -89,6 +95,9 @@ public void tick(TickSession tickSession) {
} else {
counter++;
+ if (tickSession.isPlannedTick(this)) {
+ plannedCounter++;
+ }
final List targets = new ArrayList<>();
for (TickTarget value : TickTarget.values()) {
boolean allow = tickSession.isTickTargetAllowed(value);
@@ -103,10 +112,11 @@ public void tick(TickSession tickSession) {
=== Debug tick counter ===
ID: %s
$[-#ffff00;S16]Counter: $[-#00aaff] %s$[||]
+ $[-#ffff00;S14]PlannedCounter: $[-#00aaff] %s$[||]
$[-#f0f0f0]Allowed targets: %s$[||]
$[-#00ffff]Whitelist(%s): %s$[||]
$[-$fff00f]PathToMe: %s$[||]
- """, getId(), counter, targets, tickSession._isWhitelist(), tickSession._getWhitelist(),
+ """, getId(), counter, plannedCounter, targets, tickSession._isWhitelist(), tickSession._getWhitelist(),
Arrays.toString(ItemUtil.getPathToItem(this)));
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/FilterGroupItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/FilterGroupItem.java
index 968e622b..f11daef6 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/FilterGroupItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/FilterGroupItem.java
@@ -30,6 +30,7 @@
import java.util.List;
import java.util.Set;
import java.util.UUID;
+import java.util.function.Function;
public class FilterGroupItem extends TextItem implements ContainerItem, ItemsStorage {
// START - Save
@@ -130,6 +131,11 @@ public FilterGroupItem(FilterGroupItem copy) {
}
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.FILTER_GROUP;
+ }
+
@Setter public void setTickBehavior(@NonNull TickBehavior o) {this.tickBehavior = o;}
@Getter @NonNull public TickBehavior getTickBehavior() {
return tickBehavior;
@@ -200,6 +206,16 @@ public int size() {
return items.size();
}
+ @Override
+ public int totalSize() {
+ int c = 0;
+ for (ItemFilterWrapper item : items) {
+ c++;
+ c+= item.item.getChildrenItemCount();
+ }
+ return c;
+ }
+
private void addItem(ItemFilterWrapper item) {
addItem(item, items.size());
}
@@ -314,8 +330,8 @@ public void tick(TickSession tickSession) {
if (!tickSession.isAllowed(this)) return;
super.tick(tickSession);
- if (tickBehavior != TickBehavior.ALL) ItemUtil.tickOnlyImportantTargets(tickSession, getAllItems());
if (tickSession.isTickTargetAllowed(TickTarget.ITEM_FILTER_GROUP_TICK)) {
+ profPush(tickSession, "filter_group_tick");
recalculate(tickSession.getGregorianCalendar());
updateStat();
@@ -333,6 +349,10 @@ public void tick(TickSession tickSession) {
default -> throw new RuntimeException(TAG + ": Unexpected tickBehavior: " + tickBehavior);
}
+ profPop(tickSession);
+ if (tickBehavior != TickBehavior.ALL) {
+ tickSession.runWithPlannedNormalTick(tickList, (Function) itemFilterWrapper -> itemFilterWrapper.item, () -> ItemUtil.tickOnlyImportantTargets(tickSession, getAllItems()));
+ }
// NOTE: No use 'for-loop' (self-delete item in tick => ConcurrentModificationException)
int i = tickList.size() - 1;
while (i >= 0) {
@@ -342,9 +362,11 @@ public void tick(TickSession tickSession) {
}
i--;
}
+ profPush(tickSession, "filter_group_tick");
recalculate(tickSession.getGregorianCalendar());
updateStat();
+ profPop(tickSession);
}
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/GroupItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/GroupItem.java
index 3b298315..e62c977a 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/GroupItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/GroupItem.java
@@ -68,6 +68,11 @@ public GroupItem(GroupItem copy) {
if (copy != null) this.itemsStorage.copyData(copy.getAllItems());
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.GROUP;
+ }
+
@Override
public void tick(TickSession tickSession) {
if (!tickSession.isAllowed(this)) return;
@@ -121,6 +126,11 @@ public int size() {
return itemsStorage.size();
}
+ @Override
+ public int totalSize() {
+ return itemsStorage.totalSize();
+ }
+
@Override
public void addItem(Item item) {
itemsStorage.addItem(item);
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/Item.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/Item.java
index c57396a8..0190d8ce 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/Item.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/Item.java
@@ -11,9 +11,14 @@
import com.fazziclay.opentoday.app.items.ItemsStorage;
import com.fazziclay.opentoday.app.items.Unique;
import com.fazziclay.opentoday.app.items.callback.ItemCallback;
+import com.fazziclay.opentoday.app.items.notification.DayItemNotification;
import com.fazziclay.opentoday.app.items.notification.ItemNotification;
import com.fazziclay.opentoday.app.items.notification.ItemNotificationCodecUtil;
import com.fazziclay.opentoday.app.items.notification.ItemNotificationUtil;
+import com.fazziclay.opentoday.app.items.notification.NotificationController;
+import com.fazziclay.opentoday.app.items.tag.ItemTag;
+import com.fazziclay.opentoday.app.items.tag.TagsCodecUtil;
+import com.fazziclay.opentoday.app.items.tag.TagsUtil;
import com.fazziclay.opentoday.app.items.tick.TickSession;
import com.fazziclay.opentoday.app.items.tick.TickTarget;
import com.fazziclay.opentoday.app.items.tick.Tickable;
@@ -22,6 +27,7 @@
import com.fazziclay.opentoday.util.annotation.SaveKey;
import com.fazziclay.opentoday.util.annotation.Setter;
import com.fazziclay.opentoday.util.callback.CallbackStorage;
+import com.fazziclay.opentoday.util.callback.Status;
import org.jetbrains.annotations.NotNull;
@@ -51,6 +57,8 @@ public static class ItemCodec extends AbstractItemCodec {
private static final String KEY_VIEW_CUSTOM_BACKGROUND_COLOR = "viewCustomBackgroundColor";
private static final String KEY_NOTIFICATIONS = "notifications";
private static final String KEY_MINIMIZE = "minimize";
+ private static final String KEY_TAGS = "tags";
+
@NonNull
@Override
public Cherry exportItem(@NonNull Item item) {
@@ -60,10 +68,16 @@ public Cherry exportItem(@NonNull Item item) {
.put(KEY_VIEW_BACKGROUND_COLOR, item.viewBackgroundColor)
.put(KEY_VIEW_CUSTOM_BACKGROUND_COLOR, item.viewCustomBackgroundColor)
.put(KEY_MINIMIZE, item.minimize)
- .put(KEY_NOTIFICATIONS, ItemNotificationCodecUtil.exportNotificationList(item.notifications));
+ .put(KEY_NOTIFICATIONS, ItemNotificationCodecUtil.exportNotificationList(item.notifications))
+ .put(KEY_TAGS, TagsCodecUtil.exportTagsList(item.tags));
}
- private final Item defaultValues = new Item(){};
+ private final Item defaultValues = new Item(){
+ @Override
+ public ItemType getItemType() {
+ throw new UnsupportedOperationException("This method of this instance never executed!");
+ }
+ };
@NonNull
@Override
public Item importItem(@NonNull Cherry cherry, Item item) {
@@ -74,6 +88,14 @@ public Item importItem(@NonNull Cherry cherry, Item item) {
item.viewCustomBackgroundColor = cherry.optBoolean(KEY_VIEW_CUSTOM_BACKGROUND_COLOR, defaultValues.viewCustomBackgroundColor);
item.minimize = cherry.optBoolean(KEY_MINIMIZE, defaultValues.minimize);
item.notifications = ItemNotificationCodecUtil.importNotificationList(cherry.optOrchard(KEY_NOTIFICATIONS));
+ for (ItemNotification notification : item.notifications) {
+ if (notification.getId() == null) {
+ notification.attach(item.notificationController);
+ } else {
+ notification.setController(item.notificationController);
+ }
+ }
+ item.tags = TagsCodecUtil.importTagsList(cherry.optOrchard(KEY_TAGS));
return item;
}
@@ -103,12 +125,16 @@ private void applyId(Item item, Cherry cherry) {
@SaveKey(key = "viewCustomBackgroundColor") @RequireSave private boolean viewCustomBackgroundColor = false; // юзаем ли фоновый цвет
@SaveKey(key = "minimize") @RequireSave private boolean minimize = false;
@NonNull @SaveKey(key = "notifications") @RequireSave private List notifications = new ArrayList<>();
+ @NonNull @SaveKey(key = "tags") @RequireSave private List tags = new ArrayList<>();
+ @NonNull private final NotificationController notificationController = new ItemNotificationController();
+ private boolean cachedNotificationStatus;
// Copy constructor
- public Item(@Nullable Item copy) {
+ protected Item(@Nullable Item copy) {
// unattached
this.id = null;
this.controller = null;
+ this.cachedNotificationStatus = true;
// copy
if (copy != null) {
@@ -117,13 +143,19 @@ public Item(@Nullable Item copy) {
this.viewCustomBackgroundColor = copy.viewCustomBackgroundColor;
this.minimize = copy.minimize;
this.notifications = ItemNotificationUtil.copy(copy.notifications);
+ for (ItemNotification notification : this.notifications) {
+ notification.attach(notificationController);
+ }
+ this.tags = TagsUtil.copy(copy.tags);
}
}
- public Item() {
+ protected Item() {
this(null);
}
+ public abstract ItemType getItemType();
+
// For fast get text (method overrides by TextItem)
public String getText() {
return "[Item not have text. Ops...]";
@@ -177,8 +209,36 @@ protected void detach() {
public void tick(TickSession tickSession) {
if (!tickSession.isAllowed(this)) return;
Debug.tickedItems++;
- if (tickSession.isTickTargetAllowed(TickTarget.ITEM_NOTIFICATIONS)) ItemNotificationUtil.tick(tickSession, notifications, this);
- if (tickSession.isTickTargetAllowed(TickTarget.ITEM_CALLBACKS)) itemCallbacks.run((callbackStorage, callback) -> callback.tick(Item.this));
+ if (tickSession.isTickTargetAllowed(TickTarget.ITEM_NOTIFICATIONS)) {
+ profPush(tickSession, "item_notifications_tick");
+ ItemNotificationUtil.tick(tickSession, notifications);
+ profPop(tickSession);
+ }
+ if (tickSession.isTickTargetAllowed(TickTarget.ITEM_CALLBACKS)) {
+ profPush(tickSession, "callbacks");
+ itemCallbacks.run((callbackStorage, callback) -> callback.tick(Item.this));
+ profPop(tickSession);
+ }
+
+ profPush(tickSession, "cachedNotificationStatus");
+ boolean isUpdateNotifications = tickSession.isTickTargetAllowed(TickTarget.ITEM_NOTIFICATION_UPDATE);
+ if (isUpdateNotifications != cachedNotificationStatus && !tickSession.isPlannedTick(this)) {
+ cachedNotificationStatus = isUpdateNotifications;
+ itemCallbacks.run((callbackStorage, callback) -> callback.cachedNotificationStatusChanged(Item.this, isUpdateNotifications));
+ }
+ profPop(tickSession);
+ }
+
+ protected void profPush(TickSession t, String s) {
+ t.getProfiler().push(s);
+ }
+
+ protected void profSwap(TickSession t, String s) {
+ t.getProfiler().swap(s);
+ }
+
+ protected void profPop(TickSession t) {
+ t.getProfiler().pop();
}
protected void regenerateId() {
@@ -197,6 +257,7 @@ public int getChildrenItemCount() {
}
protected void updateStat() {
+ stat.setNotifications(notifications.size());
stat.tick();
}
@@ -204,6 +265,10 @@ public CallbackStorage getItemCallbacks() {
return itemCallbacks;
}
+ public void dispatchClick() {
+ itemCallbacks.run((callbackStorage, callback) -> callback.click(Item.this));
+ }
+
// Getters & Setters
@Nullable @Override @Getter public UUID getId() { return id; }
@@ -224,7 +289,53 @@ public CallbackStorage getItemCallbacks() {
@Getter public boolean isMinimize() { return minimize; }
@Setter public void setMinimize(boolean minimize) { this.minimize = minimize; }
- @Getter @NonNull public List getNotifications() { return notifications; }
+ @Getter @NonNull public ItemNotification[] getNotifications() { return notifications.toArray(new ItemNotification[0]); }
+
+ public void addNotifications(ItemNotification... notifications) {
+ for (ItemNotification notification : notifications) {
+ notification.attach(notificationController);
+ this.notifications.add(notification);
+ }
+ updateStat();
+ visibleChanged();
+ }
+
+ public void removeNotifications(ItemNotification... notifications) {
+ for (ItemNotification notification : notifications) {
+ notification.detach();
+ this.notifications.remove(notification);
+ }
+ updateStat();
+ visibleChanged();
+ }
+
+ public ItemNotification getNotificationById(UUID notifyId) {
+ for (ItemNotification notification : notifications) {
+ if (notifyId.equals(notification.getId())) return notification;
+ }
+ return null;
+ }
+
+ public void moveNotifications(int positionFrom, int positionTo) {
+ if (!(positionFrom >= 0 && positionTo >= 0 && positionFrom < notifications.size() && positionTo < notifications.size())) {
+ throw new IndexOutOfBoundsException("failed move notifications... from=" + positionFrom + "; to=" + positionTo);
+ }
+ ItemNotification itemNotification = notifications.get(positionFrom);
+ notifications.remove(itemNotification);
+ notifications.add(positionTo, itemNotification);
+ }
+
+ public void removeAllNotifications() {
+ removeNotifications(getNotifications());
+ }
+
+ public boolean isNotifications() {
+ return !notifications.isEmpty();
+ }
+
+ public boolean getCachedNotificationStatus() {
+ return cachedNotificationStatus;
+ }
@Getter @NonNull public ItemStat getStat() {
return stat;
@@ -237,6 +348,20 @@ public CallbackStorage getItemCallbacks() {
return null;
}
+ @NonNull
+ public ItemTag[] getTags() {
+ return tags.toArray(new ItemTag[0]);
+ }
+
+ public void removeTag(ItemTag t) {
+ tags.remove(t);
+ }
+
+ public void addTag(ItemTag t) {
+ t.bind();
+ tags.add(t);
+ }
+
@NotNull
@Override
public String toString() {
@@ -245,4 +370,16 @@ public String toString() {
text = text.substring(0, max);
return getClass().getSimpleName()+"@[ID:"+getId()+" HASH:"+hashCode() +" TEXT:'"+text+"']";
}
+
+ private class ItemNotificationController implements NotificationController {
+ @Override
+ public UUID generateId(ItemNotification notification) {
+ return UUID.randomUUID();
+ }
+
+ @Override
+ public Item getParentItem(ItemNotification itemNotification) {
+ return Item.this;
+ }
+ }
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/ItemCodecUtil.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/ItemCodecUtil.java
index f9fff796..40a2e57f 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/ItemCodecUtil.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/ItemCodecUtil.java
@@ -50,13 +50,18 @@ public static Item importItem(Cherry cherry) {
// export item (Item -> JSON)
public static Cherry exportItem(Item item) {
- /*IETool from itemClass*/
- AbstractItemCodec codec = ItemsRegistry.REGISTRY.get(item.getClass()).getCodec();
- /*Export from IETool*/Cherry cherry = codec.exportItem(item);
- /*Put itemType to json*/
- if (!(item instanceof MissingNoItem)) {
- cherry.put(KEY_ITEMTYPE, ItemsRegistry.REGISTRY.get(item.getClass()).getStringType());
+ try {
+ /*IETool from itemClass*/
+ AbstractItemCodec codec = ItemsRegistry.REGISTRY.get(item.getClass()).getCodec();
+ /*Export from IETool*/
+ Cherry cherry = codec.exportItem(item);
+ /*Put itemType to json*/
+ if (!(item instanceof MissingNoItem)) {
+ cherry.put(KEY_ITEMTYPE, ItemsRegistry.REGISTRY.get(item.getClass()).getStringType());
+ }
+ return cherry;
+ } catch (Exception e) {
+ throw new RuntimeException("Exception while export item " + item, e);
}
- return cherry;
}
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/ItemStat.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/ItemStat.java
index fe8b19dc..a91f0736 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/ItemStat.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/ItemStat.java
@@ -4,6 +4,7 @@ public class ItemStat {
private int totalTicks = 0;
private int containerItems;
private int activeItems;
+ private int notifications;
private boolean isChecked;
public int getContainerItems() {
@@ -34,6 +35,14 @@ public int getTotalTicks() {
return totalTicks;
}
+ public void setNotifications(int notifications) {
+ this.notifications = notifications;
+ }
+
+ public int getNotifications() {
+ return notifications;
+ }
+
public void tick() {
totalTicks++;
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/LongTextItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/LongTextItem.java
index 068c9041..ac83ec39 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/LongTextItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/LongTextItem.java
@@ -86,6 +86,11 @@ public LongTextItem(LongTextItem copy) {
this.isCustomLongTextSize = copy.isCustomLongTextSize;
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.LONG_TEXT;
+ }
+
@Setter
public void setLongTextColor(int longTextColor) {this.longTextColor = longTextColor;}
@Getter
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/MathGameItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/MathGameItem.java
index 7c5dd0dd..376c279e 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/MathGameItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/MathGameItem.java
@@ -89,6 +89,11 @@ public MathGameItem(TextItem append) {
this.primitiveAllowedOperations.add("+");
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.MATH_GAME;
+ }
+
@Override
public void tick(TickSession tickSession) {
if (!tickSession.isAllowed(this)) return;
@@ -96,10 +101,12 @@ public void tick(TickSession tickSession) {
super.tick(tickSession);
if (tickSession.isTickTargetAllowed(TickTarget.ITEM_MATH_GAME_UPDATE)) {
+ profPush(tickSession, "math_game_update");
if (!quest.isInitialize()) {
generateQuest();
visibleChanged();
}
+ profPop(tickSession);
}
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/MissingNoItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/MissingNoItem.java
index a81c3ce9..4b587f41 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/MissingNoItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/MissingNoItem.java
@@ -8,6 +8,7 @@
import java.util.ArrayList;
import java.util.List;
+// un-imported item :(
public class MissingNoItem extends Item {
public static final MissingNoItemCodec CODEC = new MissingNoItemCodec();
private static class MissingNoItemCodec extends AbstractItemCodec {
@@ -33,6 +34,11 @@ public MissingNoItem(Cherry cherry) {
this.cherry = cherry;
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.MISSING_NO;
+ }
+
public MissingNoItem putException(Exception e) {
exceptionList.add(e);
return this;
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/SimpleItemsStorage.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/SimpleItemsStorage.java
index e0b8ef54..90df17b1 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/SimpleItemsStorage.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/SimpleItemsStorage.java
@@ -40,6 +40,16 @@ public int size() {
return items.size();
}
+ @Override
+ public int totalSize() {
+ int c = 0;
+ for (Item item : items) {
+ c++;
+ c+= item.getChildrenItemCount();
+ }
+ return c;
+ }
+
@Override
public Item getItemAt(int position) {
return items.get(position);
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/SleepTimeItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/SleepTimeItem.java
index 6624585d..280a0f99 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/SleepTimeItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/SleepTimeItem.java
@@ -2,6 +2,7 @@
import androidx.annotation.NonNull;
+import com.fazziclay.opentoday.app.App;
import com.fazziclay.opentoday.app.Translation;
import com.fazziclay.opentoday.app.data.Cherry;
import com.fazziclay.opentoday.app.items.tick.TickSession;
@@ -39,6 +40,7 @@ public Item importItem(@NonNull Cherry cherry, Item item) {
private int elapsedTime; // cached
private int wakeUpForRequiredAtCurr; // cached
+ private int elapsedToStartSleep; // cached
private long tick; // cached
@NonNull
@@ -47,12 +49,19 @@ public static SleepTimeItem createEmpty() {
}
+ public SleepTimeItem(TextItem append) {
+ super(append);
+ tick = 0;
+ elapsedTime = 0;
+ wakeUpForRequiredAtCurr = 0;
+ }
public SleepTimeItem(SleepTimeItem copy) {
super(copy);
tick = 0;
elapsedTime = 0;
wakeUpForRequiredAtCurr = 0;
+ elapsedToStartSleep = 0;
if (copy != null) {
this.wakeUpTime = copy.wakeUpTime;
@@ -65,11 +74,16 @@ private SleepTimeItem() {
this(null);
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.SLEEP_TIME;
+ }
+
@Override
protected void regenerateId() {
super.regenerateId();
if (sleepTextPattern == null) {
- sleepTextPattern = getRoot().getTranslation().get(Translation.KEY_SLEEP_TIME_ITEM_PATTERN);
+ sleepTextPattern = App.get().getTranslation().get(Translation.KEY_SLEEP_TIME_ITEM_PATTERN); // TODO: 08.10.2023 uses static App.get() is bad...
save();
}
}
@@ -77,6 +91,7 @@ protected void regenerateId() {
@Override
public void tick(TickSession tickSession) {
super.tick(tickSession);
+ profPush(tickSession, "sleep_time_update");
elapsedTime = wakeUpTime - TimeUtil.getDaySeconds();
if (elapsedTime <= 0) {
elapsedTime = TimeUtil.SECONDS_IN_DAY + elapsedTime;
@@ -87,16 +102,31 @@ public void tick(TickSession tickSession) {
wakeUpForRequiredAtCurr-=TimeUtil.SECONDS_IN_DAY;
}
+ elapsedToStartSleep = wakeUpTime - requiredSleepTime - TimeUtil.getDaySeconds();
+ if (elapsedToStartSleep < 0) {
+ elapsedToStartSleep += TimeUtil.SECONDS_IN_DAY;
+ }
+ if (elapsedToStartSleep < 0) {
+ elapsedToStartSleep += TimeUtil.SECONDS_IN_DAY;
+ }
+
if (tick % 5 == 0) {
visibleChanged();
}
tick++;
+ profPop(tickSession);
}
public int getElapsedTime() {
return elapsedTime;
}
+
+ public int getElapsedTimeToStartSleep() {
+ return elapsedToStartSleep;
+ }
+
+
public void setWakeUpTime(int wakeUpTime) {
this.wakeUpTime = wakeUpTime;
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/TextItem.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/TextItem.java
index f3af832b..0ee6ee42 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/TextItem.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/TextItem.java
@@ -83,6 +83,11 @@ public TextItem(TextItem copy) {
}
}
+ @Override
+ public ItemType getItemType() {
+ return ItemType.TEXT;
+ }
+
@Override @Getter @NonNull public String getText() { return text; }
@Setter public void setText(@NonNull String v) { this.text = v; }
@Getter public int getTextColor() { return textColor; }
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/item/Transform.java b/app/src/main/java/com/fazziclay/opentoday/app/items/item/Transform.java
index c93b4876..2ee32bf7 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/item/Transform.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/item/Transform.java
@@ -29,9 +29,18 @@ public class Transform {
public static Result transform(Item item, ItemType to) {
ItemType from = ItemUtil.getItemType(item);
+ if (to == ItemType.SLEEP_TIME) {
+ return Result.allow(() -> new SleepTimeItem((TextItem) item));
+ }
+
+ if (to == ItemType.TEXT) {
+ if (item instanceof TextItem textItem) {
+ return Result.allow(() -> new TextItem(textItem));
+ }
+ }
+
if (to == ItemType.COUNTER) {
- if (from == ItemType.TEXT) {
- TextItem textItem = (TextItem) item;
+ if (item instanceof TextItem textItem) {
return Result.allow(() -> new CounterItem(textItem));
}
}
@@ -40,19 +49,34 @@ public static Result transform(Item item, ItemType to) {
if (from == ItemType.CHECKBOX) {
return Result.allow(() -> new DayRepeatableCheckboxItem((CheckboxItem) item, false, 0));
- } else if (from == ItemType.TEXT) {
+ } else if (item instanceof TextItem) {
return Result.allow(() -> new DayRepeatableCheckboxItem(new CheckboxItem((TextItem) item, false), false, 0));
}
}
if (to == ItemType.CHECKBOX) {
- if (from == ItemType.TEXT) {
+ if (item instanceof CheckboxItem) {
+ return Result.allow(() -> new CheckboxItem((CheckboxItem) item));
+ }
+
+ if (item instanceof TextItem) {
return Result.allow(() -> new CheckboxItem((TextItem) item, false));
}
}
if (to == ItemType.LONG_TEXT) {
- if (from == ItemType.TEXT) {
+ if (item instanceof ContainerItem containerItem) {
+ return Result.allow(() -> {
+ String text = "";
+ for (Item intItem : containerItem.getAllItems()) {
+ String t = ((intItem instanceof CheckboxItem checkboxItem) ? (checkboxItem.isChecked() ? "[*]" : "[ ]") : "") + intItem.getText();
+ text += t + "\n\n";
+ }
+ return new LongTextItem((TextItem) item, text);
+ });
+ }
+
+ if (item instanceof TextItem) {
return Result.allow(() -> new LongTextItem((TextItem) item, item.getText()));
}
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationCodec.java b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/AbstractItemNotificationCodec.java
similarity index 73%
rename from app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationCodec.java
rename to app/src/main/java/com/fazziclay/opentoday/app/items/notification/AbstractItemNotificationCodec.java
index 24a75902..16f43405 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationCodec.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/AbstractItemNotificationCodec.java
@@ -2,7 +2,7 @@
import com.fazziclay.opentoday.app.data.Cherry;
-public abstract class ItemNotificationCodec {
+public abstract class AbstractItemNotificationCodec {
public abstract Cherry exportNotification(ItemNotification itemNotification);
- public abstract ItemNotification importNotification(Cherry cherry);
+ public abstract ItemNotification importNotification(Cherry cherry, ItemNotification notification);
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/DayItemNotification.java b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/DayItemNotification.java
index 3aa6d8d7..31d311d0 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/DayItemNotification.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/DayItemNotification.java
@@ -1,31 +1,22 @@
package com.fazziclay.opentoday.app.items.notification;
-import android.app.NotificationManager;
-import android.app.PendingIntent;
-import android.content.Context;
-
import androidx.annotation.NonNull;
-import androidx.core.app.NotificationCompat;
-import com.fazziclay.opentoday.R;
-import com.fazziclay.opentoday.app.App;
+import com.fazziclay.opentoday.app.ItemNotificationHandler;
import com.fazziclay.opentoday.app.data.Cherry;
-import com.fazziclay.opentoday.app.items.item.Item;
import com.fazziclay.opentoday.app.items.tick.TickSession;
import com.fazziclay.opentoday.app.items.tick.TickTarget;
-import com.fazziclay.opentoday.gui.activity.AlarmActivity;
-import com.fazziclay.opentoday.util.ColorUtil;
-import com.fazziclay.opentoday.util.RandomUtil;
+import com.fazziclay.opentoday.util.time.TimeUtil;
import java.util.Calendar;
-public class DayItemNotification implements ItemNotification {
- public static final ItemNotificationCodec CODEC = new Codec();
- private static class Codec extends ItemNotificationCodec {
+public class DayItemNotification extends ItemNotification {
+ public static final DayItemNotificationCodec CODEC = new DayItemNotificationCodec();
+ private static class DayItemNotificationCodec extends ItemNotification.ItemNotificationCodec {
@Override
public Cherry exportNotification(ItemNotification itemNotification) {
DayItemNotification d = (DayItemNotification) itemNotification;
- return new Cherry()
+ return super.exportNotification(itemNotification)
.put("notificationId", d.notificationId)
.put("notifyTitle", d.notifyTitle)
.put("notifyTitleFromItemText", d.notifyTitleFromItemText)
@@ -44,8 +35,10 @@ public Cherry exportNotification(ItemNotification itemNotification) {
}
@Override
- public ItemNotification importNotification(Cherry cherry) {
- DayItemNotification o = new DayItemNotification();
+ public ItemNotification importNotification(Cherry cherry, ItemNotification notification) {
+ DayItemNotification o = notification == null ? new DayItemNotification() : (DayItemNotification) notification;
+ super.importNotification(cherry, o);
+
o.notificationId = cherry.optInt("notificationId", 543);
o.notifyTitle = cherry.optString("notifyTitle", "");
o.notifyTitleFromItemText = cherry.optBoolean("notifyTitleFromItemText", true);
@@ -61,6 +54,7 @@ public ItemNotification importNotification(Cherry cherry) {
}
}
+
private int notificationId = 0;
private String notifyTitle;
private boolean notifyTitleFromItemText = false;
@@ -75,27 +69,25 @@ public ItemNotification importNotification(Cherry cherry) {
private boolean sound = true;
public DayItemNotification() {
-
- }
-
- public DayItemNotification(int notificationId, String notifyTitle, String notifyText, String notifySubText, int time) {
- this.notificationId = notificationId;
- this.notifyTitle = notifyTitle;
- this.notifyText = notifyText;
- this.notifySubText = notifySubText;
- this.time = time;
+ // do nothing
}
@Override
- public boolean tick(TickSession tickSession, Item item) {
- if (tickSession.isTickTargetAllowed(TickTarget.ITEM_NOTIFICATION_SCHEDULE)) tickSession.setAlarmDayOfTimeInSeconds(time, item);
+ public boolean tick(TickSession tickSession) {
+ boolean isTimeToSend = tickSession.getDayTime() >= time;
+
+ if (tickSession.isTickTargetAllowed(TickTarget.ITEM_NOTIFICATION_SCHEDULE)) {
+ final long shift = isTimeToSend ? TimeUtil.SECONDS_IN_DAY : 0;
+ final long baseDayMs = tickSession.getNoTimeCalendar().getTimeInMillis() + (shift * 1000L);
+ long triggerAtMs = baseDayMs + (time * 1000L) + 599;
+ tickSession.getItemNotificationHandler().setAlarm(this, triggerAtMs);
+ }
+
if (tickSession.isTickTargetAllowed(TickTarget.ITEM_NOTIFICATION_UPDATE)) {
int dayOfYear = tickSession.getGregorianCalendar().get(Calendar.DAY_OF_YEAR);
if (dayOfYear != latestDayOfYear) {
- boolean isTimeToSend = tickSession.getDayTime() >= time;
-
if (isTimeToSend) {
- sendNotify(tickSession.getContext(), item);
+ sendNotify(tickSession.getItemNotificationHandler());
latestDayOfYear = dayOfYear;
tickSession.saveNeeded();
tickSession.importantSaveNeeded();
@@ -109,30 +101,11 @@ public boolean tick(TickSession tickSession, Item item) {
@NonNull
@Override
public DayItemNotification clone() {
- try {
- return (DayItemNotification) super.clone();
- } catch (CloneNotSupportedException e) {
- throw new RuntimeException("Clone exception", e);
- }
+ return (DayItemNotification) super.clone();
}
- public void sendNotify(Context context, Item item) {
- final String nTitle = notifyTitleFromItemText ? (item.isParagraphColorize() ? ColorUtil.colorizeToPlain(item.getText()) : item.getText()) : notifyTitle;
- final String nText = notifyTextFromItemText ? (item.isParagraphColorize() ? ColorUtil.colorizeToPlain(item.getText()) : item.getText()) : notifyText;
-
- NotificationCompat.Builder builder = new NotificationCompat.Builder(context, App.NOTIFICATION_ITEMS_CHANNEL)
- .setSmallIcon(R.mipmap.ic_launcher)
- .setContentTitle(nTitle)
- .setContentText(nText)
- .setSubText(notifySubText)
- .setPriority(NotificationCompat.PRIORITY_MAX);
-
- if (fullScreen) {
- PendingIntent pending = PendingIntent.getActivity(context, RandomUtil.nextInt(), AlarmActivity.createIntent(context, item.getId(), isPreRenderPreviewMode, nTitle, sound), PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_UPDATE_CURRENT);
- builder.setFullScreenIntent(pending, true);
- }
-
- context.getSystemService(NotificationManager.class).notify(this.notificationId, builder.build());
+ public void sendNotify(ItemNotificationHandler itemNotificationHandler) {
+ itemNotificationHandler.handle(getParentItem(), this);
}
public int getLatestDayOfYear() {
@@ -222,4 +195,22 @@ public boolean isFullScreen() {
public void setFullScreen(boolean fullScreen) {
this.fullScreen = fullScreen;
}
+
+ @NonNull
+ @Override
+ public String toString() {
+ return "DayItemNotification{" +
+ "notificationId=" + notificationId +
+ ", notifyTitle='" + notifyTitle + '\'' +
+ ", notifyTitleFromItemText=" + notifyTitleFromItemText +
+ ", notifyText='" + notifyText + '\'' +
+ ", notifyTextFromItemText=" + notifyTextFromItemText +
+ ", notifySubText='" + notifySubText + '\'' +
+ ", latestDayOfYear=" + latestDayOfYear +
+ ", time=" + time +
+ ", fullScreen=" + fullScreen +
+ ", isPreRenderPreviewMode=" + isPreRenderPreviewMode +
+ ", sound=" + sound +
+ "} " + super.toString();
+ }
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotification.java b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotification.java
index a448a6d8..d2de00c2 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotification.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotification.java
@@ -2,11 +2,121 @@
import androidx.annotation.NonNull;
+import com.fazziclay.opentoday.app.data.Cherry;
+import com.fazziclay.opentoday.app.icons.IconsRegistry;
import com.fazziclay.opentoday.app.items.item.Item;
import com.fazziclay.opentoday.app.items.tick.TickSession;
-public interface ItemNotification extends Cloneable {
- boolean tick(TickSession tickSession, Item item);
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+public abstract class ItemNotification implements Cloneable {
+ public static final int DEFAULT_COLOR = 0; // this is magic number
+
+
+ public static class ItemNotificationCodec extends AbstractItemNotificationCodec {
+ @Override
+ public Cherry exportNotification(ItemNotification itemNotification) {
+ return new Cherry()
+ .put("id", itemNotification.id == null ? null : itemNotification.id.toString())
+ .put("icon", itemNotification.icon.getId())
+ .put("color", itemNotification.color);
+ }
+
+ @Override
+ public ItemNotification importNotification(Cherry cherry, ItemNotification notification) {
+ if (cherry.has("id")) {
+ try {
+ notification.id = UUID.fromString(cherry.getString("id"));
+ } catch (Exception ignored) {}
+ }
+ notification.icon = IconsRegistry.REGISTRY.getById(cherry.optString("icon", "opentoday"));
+ notification.color = cherry.optInt("color", DEFAULT_COLOR);
+ return notification;
+ }
+ }
+
+
+ private UUID id;
+ private NotificationController controller;
+ @NotNull private IconsRegistry.Icon icon = IconsRegistry.REGISTRY.OPENTODAY;
+ private int color;
+
+ public abstract boolean tick(TickSession tickSession);
+
+ @NonNull
+ public ItemNotification clone() {
+ ItemNotification clone;
+ try {
+ clone = (ItemNotification) super.clone();
+ } catch (CloneNotSupportedException e) {
+ throw new RuntimeException("Clone exception", e);
+ }
+ clone.controller = null;
+ clone.id = null;
+ return clone;
+ }
+
+ public void attach(@NotNull NotificationController controller) {
+ if (controller == null) {
+ throw new IllegalArgumentException("controller is null :(");
+ }
+ this.controller = controller;
+ this.id = controller.generateId(this);
+ }
+
+ public void detach() {
+ this.controller = null;
+ this.id = null;
+ }
+
+ public boolean isAttached() {
+ return controller != null;
+ }
+
+ public UUID getId() {
+ return id;
+ }
+
+ public NotificationController getController() {
+ return controller;
+ }
+
+ public Item getParentItem() {
+ if (!isAttached()) return null;
+ return controller.getParentItem(this);
+ }
+
+ // DO NOT USE THIS!!!!!! (used only for importing)
+ public void setController(NotificationController controller) {
+ this.controller = controller;
+ }
+
+
+ public void setIcon(@NonNull IconsRegistry.Icon icon) {
+ this.icon = icon;
+ }
+
+ @NonNull
+ public IconsRegistry.Icon getIcon() {
+ return icon;
+ }
+
+ public int getColor() {
+ return color;
+ }
+
+ public void setColor(int c) {
+ this.color = c;
+ }
+
@NonNull
- ItemNotification clone();
+ @Override
+ public String toString() {
+ return "ItemNotification{" +
+ "id=" + id +
+ ", controller=" + controller +
+ '}';
+ }
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationCodecUtil.java b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationCodecUtil.java
index 556b55c7..eb4f8094 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationCodecUtil.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationCodecUtil.java
@@ -6,15 +6,16 @@
import java.util.List;
public class ItemNotificationCodecUtil {
- private static final String KEY_TYPE = "type";
+ private static final String KEY_TYPE = "type"; // TODO: 22.10.2023 maybe rename to "notificationType"? (it need write fixes in DataFaxer....)
+ // must return mutable list (arraylist!)
public static List importNotificationList(CherryOrchard orchard) {
final List result = new ArrayList<>();
orchard.forEachCherry((_ignore, cherry) -> {
final String type = cherry.getString(KEY_TYPE);
- final ItemNotificationCodec codec = ItemNotificationsRegistry.REGISTRY.getByStringType(type).getCodec();
- result.add(codec.importNotification(cherry));
+ final AbstractItemNotificationCodec codec = ItemNotificationsRegistry.REGISTRY.getByStringType(type).getCodec();
+ result.add(codec.importNotification(cherry, null));
});
return result;
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationType.java b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationType.java
new file mode 100644
index 00000000..b3a21e28
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationType.java
@@ -0,0 +1,5 @@
+package com.fazziclay.opentoday.app.items.notification;
+
+public enum ItemNotificationType {
+ DAY
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationUtil.java b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationUtil.java
index 866d0946..eb0c84f0 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationUtil.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationUtil.java
@@ -21,9 +21,9 @@ public static List copy(List notifications)
return result;
}
- public static void tick(TickSession tickSession, List notifications, Item item) {
+ public static void tick(TickSession tickSession, List notifications) {
for (ItemNotification notification : notifications) {
- notification.tick(tickSession, item);
+ notification.tick(tickSession);
}
}
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationsRegistry.java b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationsRegistry.java
index 9242cfa1..85a55bc5 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationsRegistry.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/ItemNotificationsRegistry.java
@@ -4,7 +4,7 @@ public class ItemNotificationsRegistry {
public static final ItemNotificationsRegistry REGISTRY = new ItemNotificationsRegistry();
private static final ItemNotificationInfo[] NOTIFICATIONS = new ItemNotificationInfo[] {
- new ItemNotificationInfo(DayItemNotification.class, "DayItemNotification", DayItemNotification.CODEC)
+ new ItemNotificationInfo(DayItemNotification.class, "DayItemNotification", DayItemNotification.CODEC, ItemNotificationType.DAY)
};
public ItemNotificationInfo[] getAllNotifications() {
@@ -14,12 +14,14 @@ public ItemNotificationInfo[] getAllNotifications() {
public static class ItemNotificationInfo {
private final Class clazz;
private final String stringType;
- private final ItemNotificationCodec codec;
+ private final AbstractItemNotificationCodec codec;
+ private final ItemNotificationType type;
- public ItemNotificationInfo(Class clazz, String v, ItemNotificationCodec codec) {
+ public ItemNotificationInfo(Class clazz, String v, AbstractItemNotificationCodec codec, ItemNotificationType type) {
this.clazz = clazz;
this.stringType = v;
this.codec = codec;
+ this.type = type;
}
public Class getClazz() {
@@ -30,9 +32,13 @@ public String getStringType() {
return stringType;
}
- public ItemNotificationCodec getCodec() {
+ public AbstractItemNotificationCodec getCodec() {
return codec;
}
+
+ public ItemNotificationType getType() {
+ return type;
+ }
}
public ItemNotificationInfo getByStringType(String v) {
@@ -52,4 +58,13 @@ public ItemNotificationInfo getByClass(Class v) {
}
return null;
}
+
+ public ItemNotificationInfo getByType(ItemNotificationType type) {
+ for (ItemNotificationInfo info : NOTIFICATIONS) {
+ if (info.type == type) {
+ return info;
+ }
+ }
+ return null;
+ }
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/notification/NotificationController.java b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/NotificationController.java
new file mode 100644
index 00000000..9adf478f
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/notification/NotificationController.java
@@ -0,0 +1,11 @@
+package com.fazziclay.opentoday.app.items.notification;
+
+import com.fazziclay.opentoday.app.items.item.Item;
+
+import java.util.UUID;
+
+public interface NotificationController {
+ UUID generateId(ItemNotification notification);
+
+ Item getParentItem(ItemNotification itemNotification);
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tab/Debug202305RandomTab.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tab/Debug202305RandomTab.java
index 9bcaaa15..af774297 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/tab/Debug202305RandomTab.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tab/Debug202305RandomTab.java
@@ -1,11 +1,17 @@
package com.fazziclay.opentoday.app.items.tab;
+import android.graphics.Color;
+
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
+import com.fazziclay.javaneoutil.FileUtil;
+import com.fazziclay.opentoday.app.App;
import com.fazziclay.opentoday.app.data.Cherry;
+import com.fazziclay.opentoday.app.items.ItemsRoot;
import com.fazziclay.opentoday.app.items.ItemsStorage;
import com.fazziclay.opentoday.app.items.Readonly;
+import com.fazziclay.opentoday.app.items.callback.ItemCallback;
import com.fazziclay.opentoday.app.items.callback.OnItemsStorageUpdate;
import com.fazziclay.opentoday.app.items.item.CheckboxItem;
import com.fazziclay.opentoday.app.items.item.CounterItem;
@@ -17,10 +23,19 @@
import com.fazziclay.opentoday.app.items.item.TextItem;
import com.fazziclay.opentoday.app.items.tick.TickSession;
import com.fazziclay.opentoday.app.items.tick.Tickable;
+import com.fazziclay.opentoday.util.ColorUtil;
import com.fazziclay.opentoday.util.RandomUtil;
+import com.fazziclay.opentoday.util.StreamUtil;
+import com.fazziclay.opentoday.util.callback.CallbackImportance;
import com.fazziclay.opentoday.util.callback.CallbackStorage;
+import com.fazziclay.opentoday.util.callback.Status;
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Comparator;
import java.util.UUID;
+import java.util.function.ToIntFunction;
public class Debug202305RandomTab extends Tab implements Tickable, Readonly {
public static final TabCodec CODEC = new TabCodec() {
@@ -38,16 +53,53 @@ public Tab importTab(@NonNull Cherry cherry, @Nullable Tab tab) {
return t;
}
};
+ private static final boolean GEN_COLORS = true;
+ private static final boolean DISABLE_TAB = true; // yes, disable this tab in releases. (this tab causes crashes...)
- private final SimpleItemsStorage itemsStorage = new SimpleItemsStorage(getRoot()) {
+ private final SimpleItemsStorage itemsStorage = new SimpleItemsStorage((ItemsRoot) null) {
@Override
public void save() {
// do nothing in Debug tab
}
};
+ double DistanceSquared(int a, int b)
+ {
+ int deltaR = Color.red(a) - Color.red(b);
+ int deltaG = Color.green(a) - Color.green(b);
+ int deltaB = Color.blue(a) - Color.blue(b);
+ int deltaAlpha = Color.alpha(a) - Color.alpha(b);
+ double rgbDistanceSquared = (deltaR * deltaR + deltaG * deltaG + deltaB * deltaB) / 3.0;
+ return deltaAlpha * deltaAlpha / 2.0 + rgbDistanceSquared * Color.alpha(a) * Color.alpha(b) / (255 * 255);
+ }
+
public Debug202305RandomTab() {
super("Debug202305RandomTab");
+
+ String[] s = new String[0];
+ try {
+ s = StreamUtil.read(App.get().getAssets().open("beautify_colors.txt")).split("\n");
+ } catch (IOException e) {
+ throw new RuntimeException(e);
+ }
+// Arrays.parallelSort(s, Comparator.comparingInt(s12 -> {
+// return (int) DistanceSquared(Color.WHITE, Color.parseColor(s12));
+// }));
+ for (String s1 : s) {
+ if (s1.startsWith("//")) continue;
+ s1 = s1.split(";")[0];
+ TextItem item = (TextItem) ItemsRegistry.REGISTRY.get(ItemType.TEXT).create();
+ try {
+ int c = Color.parseColor(s1);
+ item.setViewCustomBackgroundColor(true);
+ item.setViewBackgroundColor(c);
+ item.setText("Всем привет, это тестовый текстик <3");
+ } catch (Exception e) {
+ item.setText("Exception: " + e);
+ }
+ itemsStorage.addItem(item);
+ }
+
}
@Override
@@ -97,7 +149,16 @@ public Item[] getAllItems() {
@Override
public void tick(TickSession tickSession) {
if (!tickSession.isAllowed(this)) return;
+ if (DISABLE_TAB) {
+ return;
+ }
+ if (GEN_COLORS) {
+ for (int i = 0; i < 2; i++) {
+ tick_genColors(tickSession);
+ }
+ return;
+ }
tick111(itemsStorage);
for (Item item : getAllItems()) {
if (item instanceof ItemsStorage) {
@@ -106,6 +167,47 @@ public void tick(TickSession tickSession) {
}
}
+ boolean flag = true;
+ int color;
+ ItemCallback itemCallback = new ItemCallback() {
+ @Override
+ public Status click(Item item) {
+ String color = ColorUtil.colorToHex(item.getViewBackgroundColor());
+ FileUtil.addText(new File(App.get().getExternalCacheDir(), "beautify_colors.txt"), color + "\n");
+ item.setMinimize(true);
+ if (item instanceof TextItem t) {
+ t.setText("[YES] " + t.getText());
+ }
+ item.visibleChanged();
+ return super.click(item);
+ }
+ };
+ private void tick_genColors(TickSession tickSession) {
+ if (flag) {
+ color = RandomUtil.nextInt() | 0xFF000000;
+ Item item = ItemsRegistry.REGISTRY.get(ItemType.values()[RandomUtil.nextInt(ItemType.values().length)]).create();
+ if (item instanceof TextItem textItem) {
+ textItem.setViewCustomBackgroundColor(true);
+ textItem.setViewBackgroundColor(color);
+ textItem.setText("Hello everybody!");
+ }
+ item.getItemCallbacks().addCallback(CallbackImportance.DEFAULT, itemCallback);
+ itemsStorage.addItem(item);
+ }
+ if (!flag) {
+ Item item = ItemsRegistry.REGISTRY.get(ItemType.values()[RandomUtil.nextInt(ItemType.values().length)]).create();
+ if (item instanceof TextItem textItem) {
+ textItem.setViewCustomBackgroundColor(true);
+ textItem.setViewBackgroundColor(color);
+ textItem.setParagraphColorize(true);
+ textItem.setText("$[-#ffffff]White text! $[-#000000] Black text $[-#ff00ff]" + ColorUtil.colorToHex(color));
+ }
+ item.getItemCallbacks().addCallback(CallbackImportance.DEFAULT, itemCallback);
+ itemsStorage.addItem(item);
+ }
+ flag = !flag;
+ }
+
public void tick111(ItemsStorage itemsStorage) {
byte mode = (byte) (RandomUtil.nextBoolean() ? 0 : 1); // 0 remove; 1 add
if (itemsStorage.isEmpty()) mode = 1;
@@ -138,6 +240,11 @@ public int size() {
return itemsStorage.size();
}
+ @Override
+ public int totalSize() {
+ return itemsStorage.totalSize();
+ }
+
@NonNull
@Override
public CallbackStorage getOnItemsStorageCallbacks() {
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tab/LocalItemsTab.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tab/LocalItemsTab.java
index e2c1f649..5ba02b2b 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/tab/LocalItemsTab.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tab/LocalItemsTab.java
@@ -116,6 +116,11 @@ public int size() {
return itemsStorage.size();
}
+ @Override
+ public int totalSize() {
+ return itemsStorage.totalSize();
+ }
+
@NonNull
@Override
public CallbackStorage getOnItemsStorageCallbacks() {
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tab/Tab.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tab/Tab.java
index 1fd28e8d..ac7042f5 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/tab/Tab.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tab/Tab.java
@@ -4,6 +4,7 @@
import androidx.annotation.Nullable;
import com.fazziclay.opentoday.app.data.Cherry;
+import com.fazziclay.opentoday.app.icons.IconsRegistry;
import com.fazziclay.opentoday.app.items.ItemsRoot;
import com.fazziclay.opentoday.app.items.ItemsStorage;
import com.fazziclay.opentoday.app.items.Unique;
@@ -22,6 +23,7 @@ protected static class TabCodec extends AbstractTabCodec {
private static final String KEY_ID = "id";
private static final String KEY_NAME = "name";
private static final String KEY_DISABLE_TICK = "disableTick";
+ private static final String KEY_ICON = "icon";
@NonNull
@Override
@@ -29,7 +31,9 @@ public Cherry exportTab(@NonNull Tab tab) {
return new Cherry()
.put(KEY_NAME, tab.name)
.put(KEY_ID, tab.id == null ? null : tab.id.toString())
- .put(KEY_DISABLE_TICK, tab.disableTick);
+ .put(KEY_DISABLE_TICK, tab.disableTick)
+ .put(KEY_ICON, tab.icon.getId());
+
}
@NonNull
@@ -38,7 +42,7 @@ public Tab importTab(@NonNull Cherry cherry, @Nullable Tab tab) {
if (cherry.has(KEY_ID)) tab.id = UUID.fromString(cherry.getString(KEY_ID));
tab.name = cherry.optString(KEY_NAME, "");
tab.disableTick = cherry.optBoolean(KEY_DISABLE_TICK, false);
-
+ tab.icon = IconsRegistry.REGISTRY.getById(cherry.optString(KEY_ICON, IconsRegistry.REGISTRY.NONE.getId()));
if (tab.id == null) Logger.w("Tab", "id is null while importing...");
return tab;
}
@@ -47,6 +51,7 @@ public Tab importTab(@NonNull Cherry cherry, @Nullable Tab tab) {
@RequireSave @SaveKey(key = "id") private UUID id = null;
@RequireSave @SaveKey(key = "name") private String name = "";
@RequireSave @SaveKey(key = "disableTick") private boolean disableTick = false;
+ @RequireSave @SaveKey(key = "icon") private IconsRegistry.Icon icon = IconsRegistry.REGISTRY.NONE;
private TabController controller;
public Tab(String name) {
@@ -113,6 +118,15 @@ public void setName(String text) {
if (controller != null) controller.nameChanged(this);
}
+ public IconsRegistry.Icon getIcon() {
+ return icon;
+ }
+
+ public void setIcon(IconsRegistry.Icon icon) {
+ this.icon = icon;
+ if (controller != null) controller.iconChanged(this);
+ }
+
@Override
public void save() {
if (controller != null) {
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tab/TabController.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tab/TabController.java
index eca200bc..ac080bb3 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/tab/TabController.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tab/TabController.java
@@ -14,4 +14,5 @@ public interface TabController {
void nameChanged(@NonNull final Tab tab);
UUID generateId();
ItemsRoot getRoot();
+ void iconChanged(Tab tab);
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tab/TabsManager.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tab/TabsManager.java
index 08356ebc..39d252a2 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/tab/TabsManager.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tab/TabsManager.java
@@ -7,11 +7,14 @@
import com.fazziclay.javaneoutil.FileUtil;
import com.fazziclay.opentoday.Debug;
+import com.fazziclay.opentoday.api.EventHandler;
import com.fazziclay.opentoday.app.App;
import com.fazziclay.opentoday.app.CrashReportContext;
import com.fazziclay.opentoday.app.ImportantDebugCallback;
import com.fazziclay.opentoday.app.Translation;
import com.fazziclay.opentoday.app.data.CherryOrchard;
+import com.fazziclay.opentoday.app.events.items.ItemsRootDestroyedEvent;
+import com.fazziclay.opentoday.app.events.items.ItemsRootInitializedEvent;
import com.fazziclay.opentoday.app.items.ItemPath;
import com.fazziclay.opentoday.app.items.ItemsRoot;
import com.fazziclay.opentoday.app.items.ItemsStorage;
@@ -49,7 +52,7 @@
public class TabsManager implements ItemsRoot, Tickable {
public static final int TAB_NAME_MAX_LENGTH = 35;
- private static final boolean DEBUG_ITEMS_SET = false;
+ private static final boolean DEBUG_ITEMS_SET = false; // Default value is FALSE!!!!!!!!!
private static final String TAG = "TabsManager";
private boolean destroyed;
@@ -71,6 +74,7 @@ public TabsManager(@NotNull final File dataOriginalFile, @NotNull final File dat
this.dataCompressFile = dataCompressFile;
this.translation = translation;
load();
+ EventHandler.call(new ItemsRootInitializedEvent(this));
}
@Nullable
@@ -285,6 +289,7 @@ public void destroy() {
}
destroyed = true;
+ EventHandler.call(new ItemsRootDestroyedEvent(this));
}
private void checkDestroy() {
@@ -322,6 +327,13 @@ public UUID generateId() {
public ItemsRoot getRoot() {
return TabsManager.this;
}
+
+ @Override
+ public void iconChanged(Tab tab) {
+ onTabsChangedCallbacks.run((callbackStorage, callback) -> callback.onTabIconChanged(tab, getTabPosition(tab)));
+ TabsManager.this.internalOnTabChanged();
+ TabsManager.this.queueSave(SaveInitiator.USER);
+ }
}
// ==== Tick ====
@@ -504,6 +516,7 @@ public boolean saveAllDirect() {
writer.write(originalData);
writer.flush();
writer.close();
+ gz.close();
}
if (debugPrintSaveStatusAlways) {
@@ -539,7 +552,7 @@ public SaveThread() {
public void run() {
while (!isInterrupted() && enabled) {
if (request && (requestImportance > 0 || ((System.currentTimeMillis() - firstRequestTime) > 1000 * 10))) {
- if (App.LOG) Logger.i(TAG, String.format("SaveThread: requestCount=%s\nfirstTime=%s\nlatestTime=%s", requestsCount, TimeUtil.getDebugDate(firstRequestTime), TimeUtil.getDebugDate(latestRequestTime)));
+ Logger.i(TAG, String.format("SaveThread: requestCount=%s\nfirstTime=%s\nlatestTime=%s", requestsCount, TimeUtil.getDebugDate(firstRequestTime), TimeUtil.getDebugDate(latestRequestTime)));
request = false;
requestsCount = Debug.latestSaveRequestsCount = 0;
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tag/ItemTag.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tag/ItemTag.java
new file mode 100644
index 00000000..27dc91fe
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tag/ItemTag.java
@@ -0,0 +1,73 @@
+package com.fazziclay.opentoday.app.items.tag;
+
+import androidx.annotation.NonNull;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class ItemTag {
+ private @NotNull String name;
+ private @Nullable String value;
+ private @NotNull ValueType valueType = ValueType.NULL;
+ private boolean bind = false;
+
+ public ItemTag(@NonNull String name, @Nullable String value) {
+ this.name = name;
+ this.value = value;
+ recalcValueType();
+ }
+
+ private void recalcValueType() {
+ if (value == null) {
+ valueType = ValueType.NULL;
+ } else {
+ try {
+ Double.valueOf(value);
+ valueType = ValueType.NUMBER;
+ } catch (Exception e) {
+ valueType = ValueType.STRING;
+ }
+ }
+ }
+
+ public void setName(@NotNull String name) {
+ this.name = name;
+ }
+
+ public void setValue(@Nullable String value) {
+ this.value = value;
+ recalcValueType();
+ }
+
+ @NotNull
+ public ValueType getValueType() {
+ return valueType;
+ }
+
+ @NotNull
+ public String getName() {
+ return name;
+ }
+
+ @Nullable
+ public String getValue() {
+ return value;
+ }
+
+ protected ItemTag copy() {
+ return new ItemTag(name, value);
+ }
+
+ public void bind() {
+ if (bind) {
+ throw new RuntimeException("This ItemTag already bind.");
+ }
+ bind = true;
+ }
+
+ public enum ValueType {
+ NULL,
+ NUMBER,
+ STRING
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tag/ItemTagsRegistry.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tag/ItemTagsRegistry.java
new file mode 100644
index 00000000..d98b8891
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tag/ItemTagsRegistry.java
@@ -0,0 +1,16 @@
+package com.fazziclay.opentoday.app.items.tag;
+
+// currently unused ()
+public class ItemTagsRegistry {
+ public static final ItemTagsRegistry REGISTRY = new ItemTagsRegistry();
+
+ private static final TagInfo[] INFOS = new TagInfo[]{
+
+ };
+
+ private ItemTagsRegistry() {}
+
+ public static class TagInfo {
+
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tag/TagsCodecUtil.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tag/TagsCodecUtil.java
new file mode 100644
index 00000000..bde1bbfb
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tag/TagsCodecUtil.java
@@ -0,0 +1,32 @@
+package com.fazziclay.opentoday.app.items.tag;
+
+import com.fazziclay.opentoday.app.data.Cherry;
+import com.fazziclay.opentoday.app.data.CherryOrchard;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TagsCodecUtil {
+ public static List importTagsList(final CherryOrchard orchard) {
+ final List ret = new ArrayList<>();
+
+ orchard.forEachCherry((index, cherry) -> {
+ var tag = new ItemTag(cherry.getString("name"), cherry.getString("value"));
+ ret.add(tag);
+ });
+
+ return ret;
+ }
+
+ public static CherryOrchard exportTagsList(final List tags) {
+ final CherryOrchard orchard = new CherryOrchard();
+ for (final ItemTag tag : tags) {
+ final Cherry cherry = orchard.createAndAdd();
+ cherry.put("tagType", "pre_registry_generic_tag");
+ cherry.put("name", tag.getName());
+ cherry.put("value", tag.getValue());
+ }
+
+ return orchard;
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tag/TagsUtil.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tag/TagsUtil.java
new file mode 100644
index 00000000..ed5ad649
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tag/TagsUtil.java
@@ -0,0 +1,20 @@
+package com.fazziclay.opentoday.app.items.tag;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TagsUtil {
+ public static List copy(final List tags) {
+ final List ret = new ArrayList<>();
+
+ for (final ItemTag tag : tags) {
+ ret.add(copy(tag));
+ }
+
+ return ret;
+ }
+
+ public static ItemTag copy(final ItemTag itemTag) {
+ return itemTag.copy();
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tick/ItemsTickReceiver.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tick/ItemsTickReceiver.java
index f01f0861..426de087 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/tick/ItemsTickReceiver.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tick/ItemsTickReceiver.java
@@ -4,11 +4,15 @@
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
+import android.widget.Toast;
import androidx.core.app.NotificationCompat;
+import com.fazziclay.opentoday.Debug;
import com.fazziclay.opentoday.R;
import com.fazziclay.opentoday.app.App;
+import com.fazziclay.opentoday.app.items.item.Item;
+import com.fazziclay.opentoday.app.items.notification.ItemNotification;
import com.fazziclay.opentoday.util.Logger;
import java.util.ArrayList;
@@ -35,6 +39,12 @@ public static Intent createIntent(Context context, String[] array, boolean usePa
.putExtra(EXTRA_PERSONAL_TICK_MODE, (usePaths ? PersonalTickMode.PERSONAL_AND_PATH : PersonalTickMode.PERSONAL_ONLY).name());
}
+ public static Intent createNotificationTriggerIntent(Context context, ItemNotification itemNotification) {
+ final Item item = itemNotification.getParentItem();
+ return createIntent(context, item.getId(), true);
+ // TODO: 22.10.2023 currently while item tick ticked all item notifications! maybe need specify by notify id?
+ }
+
@Override
public void onReceive(Context context, Intent intent) {
Logger.d(TAG, "onReceive(...)");
@@ -45,7 +55,9 @@ public void onReceive(Context context, Intent intent) {
if (intent != null && intent.getExtras() != null && intent.getExtras().containsKey("debugMessage")) {
String s = intent.getExtras().getString("debugMessage", "none");
- //Toast.makeText(context, "ItemsTickReceive: " + s, Toast.LENGTH_SHORT).show();
+ if (Debug.SHOW_DEBUG_MESSAGE_TOAST_IN_ITEMSTICKRECEIVER) {
+ Toast.makeText(context, "ItemsTickReceive: " + s, Toast.LENGTH_SHORT).show();
+ }
Logger.d("ItemsTickReceiver", "DebugMessage! " + s);
}
@@ -72,7 +84,7 @@ public void onReceive(Context context, Intent intent) {
}
private void debugNotification(Context context) {
- if (App.DEBUG_TICK_NOTIFICATION) {
+ if (Debug.DEBUG_TICK_NOTIFICATION) {
context.getSystemService(NotificationManager.class).notify(321, new NotificationCompat.Builder(context, App.NOTIFICATION_ITEMS_CHANNEL)
.setSmallIcon(R.mipmap.ic_launcher)
.setSilent(true)
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tick/TickSession.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tick/TickSession.java
index 6d83e388..888b2597 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/tick/TickSession.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tick/TickSession.java
@@ -1,14 +1,11 @@
package com.fazziclay.opentoday.app.items.tick;
-import android.app.AlarmManager;
-import android.app.PendingIntent;
-import android.content.Context;
-import android.os.Build;
-
import com.fazziclay.opentoday.app.App;
+import com.fazziclay.opentoday.app.ItemNotificationHandler;
import com.fazziclay.opentoday.app.items.Unique;
import com.fazziclay.opentoday.app.items.item.Item;
import com.fazziclay.opentoday.util.Logger;
+import com.fazziclay.opentoday.util.profiler.Profiler;
import org.jetbrains.annotations.NotNull;
@@ -17,9 +14,9 @@
import java.util.List;
import java.util.Stack;
import java.util.UUID;
+import java.util.function.Function;
public class TickSession {
- private static boolean exceptionOnce = true;
private static final String TAG = "TickSession";
private static final boolean LOG_ISALLOWED = App.debug(false);
@@ -33,23 +30,30 @@ public static GregorianCalendar getLatestGregorianCalendar() {
return gregorianCalendar1;
}
- private final Context context;
+ private final ItemNotificationHandler itemNotificationHandler;
private GregorianCalendar gregorianCalendar;
private GregorianCalendar noTimeCalendar;
private int dayTime;
private boolean isPersonalTick;
+ private Profiler profiler;
private boolean saveNeeded = false;
private boolean importantSaveNeeded = false;
private final Stack> specifiedTickTarget = new Stack<>();
+ private final Stack> plannedTick = new Stack<>();
private final List whitelist = new ArrayList<>();
private boolean isWhitelist = false;
- public TickSession(Context context, GregorianCalendar gregorianCalendar, GregorianCalendar noTimeCalendar, int dayTime, boolean isPersonalTick) {
- this.context = context;
+ public TickSession(ItemNotificationHandler itemNotificationHandler, GregorianCalendar gregorianCalendar, GregorianCalendar noTimeCalendar, int dayTime, boolean isPersonalTick, Profiler profiler) {
+ this.itemNotificationHandler = itemNotificationHandler;
this.gregorianCalendar = gregorianCalendar;
this.noTimeCalendar = noTimeCalendar;
this.dayTime = dayTime;
this.isPersonalTick = isPersonalTick;
+ this.profiler = profiler;
+ }
+
+ public Profiler getProfiler() {
+ return profiler;
}
public boolean isAllowed(Unique unique) {
@@ -70,12 +74,21 @@ public boolean isTickTargetAllowed(TickTarget tickTarget) {
return specifiedTickTarget.lastElement().contains(tickTarget);
}
+ public boolean isPlannedTick(Item item) {
+ if (plannedTick.isEmpty()) return false;
+ return plannedTick.lastElement().contains(item);
+ }
+
public void runWithSpecifiedTickTargets(List targets, Runnable r) {
specifiedTickTarget.push(targets);
r.run();
specifiedTickTarget.pop();
}
+ public boolean isTickedWithSpecifiedTickTarget() {
+ return !specifiedTickTarget.isEmpty();
+ }
+
public GregorianCalendar getGregorianCalendar() {
return gregorianCalendar;
}
@@ -88,10 +101,6 @@ public int getDayTime() {
return dayTime;
}
- public Context getContext() {
- return context;
- }
-
public boolean isPersonalTick() {
return isPersonalTick;
}
@@ -108,26 +117,6 @@ public boolean isImportantSaveNeeded() {
return importantSaveNeeded;
}
- public void setAlarmDayOfTimeInSeconds(int time, Item item) {
- final long shift = getDayTime() >= time ? (24*60*60*1000L) : 0; // IN MILLIS!!
- final AlarmManager alarmManager = getContext().getSystemService(AlarmManager.class);
- final int flags;
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
- flags = PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE;
- } else {
- flags = PendingIntent.FLAG_UPDATE_CURRENT;
- }
- long triggerAtMs = getNoTimeCalendar().getTimeInMillis() + shift + (time * 1000L) + 599;
- try {
- alarmManager.setExactAndAllowWhileIdle(AlarmManager.RTC_WAKEUP, triggerAtMs, PendingIntent.getBroadcast(getContext(), item.getId().hashCode() + time, ItemsTickReceiver.createIntent(context, item.getId(), true).putExtra("debugMessage", "DayItemNotification is work :)\nItem:\n * id-hashCode: " + item.getId().hashCode() + "\n * Item: " + item + " time: " + time), flags));
- } catch (Exception e) {
- if (exceptionOnce) {
- App.exception(null, e);
- exceptionOnce = false;
- }
- }
- }
-
public void recyclePersonal(boolean b) {
this.isPersonalTick = b;
}
@@ -180,6 +169,10 @@ public void importantSaveNeeded() {
this.importantSaveNeeded = true;
}
+ public ItemNotificationHandler getItemNotificationHandler() {
+ return itemNotificationHandler;
+ }
+
@NotNull
@Override
public String toString() {
@@ -189,4 +182,19 @@ public String toString() {
", whitelist=" + whitelist +
'}';
}
+
+ public void runWithPlannedNormalTick(List list, Function f, Runnable o) {
+ final List
- i;
+ if (f == null) {
+ i = (List
- ) new ArrayList<>(list);
+ } else {
+ i = new ArrayList<>();
+ for (final T t : list) {
+ i.add(f.apply(t));
+ }
+ }
+ plannedTick.push(i);
+ o.run();
+ plannedTick.pop();
+ }
}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/items/tick/TickThread.java b/app/src/main/java/com/fazziclay/opentoday/app/items/tick/TickThread.java
index 8c461e37..a84b9999 100644
--- a/app/src/main/java/com/fazziclay/opentoday/app/items/tick/TickThread.java
+++ b/app/src/main/java/com/fazziclay/opentoday/app/items/tick/TickThread.java
@@ -12,6 +12,7 @@
import com.fazziclay.opentoday.app.items.item.ItemUtil;
import com.fazziclay.opentoday.app.items.tab.TabsManager;
import com.fazziclay.opentoday.util.Logger;
+import com.fazziclay.opentoday.util.profiler.Profiler;
import com.fazziclay.opentoday.util.time.TimeUtil;
import java.util.ArrayList;
@@ -21,6 +22,7 @@
public class TickThread extends Thread {
private static final String TAG = "TickThread";
+ private static final Profiler PROFILER = App.createProfiler("TickThread");
private static boolean exceptionOnceDebugFlag = true; // for once call App.exception(...)
private static final boolean LOG = App.debug(true);
private static final boolean LOG_ONLY_PERSONAL = true;
@@ -55,7 +57,7 @@ public TickThread(Context context, TabsManager tabsManager) {
}
private void log(String s) {
- if (App.LOG && LOG) {
+ if (LOG) {
if (LOG_ONLY_PERSONAL) {
if (currentlyExecutingTickPersonal) {
Logger.d(TAG, s);
@@ -68,23 +70,28 @@ private void log(String s) {
@Override
public void run() {
+ PROFILER.push("run");
enabled = true;
while (!isInterrupted() && enabled) {
+ PROFILER.push("tick");
long tickStart = System.currentTimeMillis();
if (requested) {
try {
log("Processing requests: " + requests + "; all: "+requestedAll+"; personal: " + requestedPersonal);
+ PROFILER.push("all");
if (requestedAll) {
recycle(false);
tickAll();
}
+ PROFILER.swap("personal");
if (requestedPersonal) {
recycle(true);
tickPersonal();
}
+ PROFILER.swap("save");
if (defaultTickSession.isSaveNeeded()) {
if (defaultTickSession.isImportantSaveNeeded()) {
tabsManager.queueSave(SaveInitiator.USER);
@@ -92,15 +99,19 @@ public void run() {
tabsManager.queueSave(requestedPersonal ? SaveInitiator.TICK_PERSONAL : SaveInitiator.TICK);
}
}
+ PROFILER.pop();
} catch (Exception e) {
+ PROFILER.push("exceptions");
Logger.e(TAG, "EXCEPTION IN TICK!!!!!!!", e);
if (exceptionOnceDebugFlag) {
App.exception(null, e);
exceptionOnceDebugFlag = false;
}
+ PROFILER.pop2();
}
// reset requests
+ PROFILER.push("resets");
personalsNoPaths.clear();
personalsPaths.clear();
requested = false;
@@ -109,9 +120,11 @@ public void run() {
firstRequestTime = 0;
lastRequestTime = 0;
requests = 0;
+ PROFILER.pop();
}
long tickEnd = System.currentTimeMillis();
+ PROFILER.swap("sleep");
try {
int sleep = (int) (1000 - (tickEnd - tickStart));
if (sleep <= 0) sleep = 1;
@@ -120,18 +133,23 @@ public void run() {
} catch (Exception e) {
throw new RuntimeException(e);
}
+ PROFILER.pop();
}
log("Thread done.");
interrupt();
enabled = false;
+ PROFILER.pop();
}
private void tickAll() {
+ PROFILER.push("tickAll");
tabsManager.tick(defaultTickSession);
log("Tick all");
+ PROFILER.pop();
}
private void tickPersonal() {
+ PROFILER.push("tickPersonal");
currentlyExecutingTickPersonal = true;
if (!this.personalsNoPaths.isEmpty()) {
List personalsNoPaths = new ArrayList<>(this.personalsNoPaths);
@@ -163,9 +181,11 @@ private void tickPersonal() {
currentlyExecutingTickPersonal = false;
+ PROFILER.pop();
}
private void recycle(boolean personal) {
+ PROFILER.push("recycle");
log("recycle. personal="+personal);
GregorianCalendar gregorianCalendar = new GregorianCalendar();
GregorianCalendar noTimeCalendar = TimeUtil.noTimeCalendar(gregorianCalendar);
@@ -179,6 +199,7 @@ private void recycle(boolean personal) {
defaultTickSession.recycleSaveNeeded();
defaultTickSession.recycleWhitelist(false);
defaultTickSession.recycleSpecifiedTickTarget();
+ PROFILER.pop();
}
@@ -238,7 +259,7 @@ private TickSession createTickSession(Context context) {
int daySeconds = (int) ((gregorianCalendar.getTimeInMillis() - noTimeCalendar.getTimeInMillis()) / 1000);
- return new TickSession(context, gregorianCalendar, noTimeCalendar, daySeconds, false);
+ return new TickSession(App.get(context).getItemNotificationHandler(), gregorianCalendar, noTimeCalendar, daySeconds, false, PROFILER);
}
public void requestTerminate() {
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/settings/ActionBarPosition.java b/app/src/main/java/com/fazziclay/opentoday/app/settings/ActionBarPosition.java
new file mode 100644
index 00000000..02b5b255
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/settings/ActionBarPosition.java
@@ -0,0 +1,6 @@
+package com.fazziclay.opentoday.app.settings;
+
+public enum ActionBarPosition {
+ TOP,
+ BOTTOM
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/settings/BooleanOption.java b/app/src/main/java/com/fazziclay/opentoday/app/settings/BooleanOption.java
new file mode 100644
index 00000000..24d4fa0e
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/settings/BooleanOption.java
@@ -0,0 +1,29 @@
+package com.fazziclay.opentoday.app.settings;
+
+public class BooleanOption extends Option {
+ public BooleanOption(String saveKey, boolean maybeUndefined, boolean defVal) {
+ super(saveKey, maybeUndefined, defVal);
+ }
+
+ public void set(SettingsManager sm, boolean val) {
+ _set(sm, val);
+ }
+
+ public boolean get(SettingsManager sm) {
+ Object o = _get(sm);
+ if (o instanceof Boolean bool) {
+ return bool;
+ }
+ throw new RuntimeException("SettingsManager.BooleanOption can't be get because internal error :(");
+ }
+
+ @Override
+ public Object parseValue(Object o) {
+ return (Boolean) o;
+ }
+
+ @Override
+ public Object writeValue(Object o) {
+ return (Boolean) o;
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/settings/ColorOption.java b/app/src/main/java/com/fazziclay/opentoday/app/settings/ColorOption.java
new file mode 100644
index 00000000..1ab717d9
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/settings/ColorOption.java
@@ -0,0 +1,7 @@
+package com.fazziclay.opentoday.app.settings;
+
+public class ColorOption extends IntegerOption {
+ public ColorOption(String saveKey, boolean maybeUndefined, int defVal) {
+ super(saveKey, maybeUndefined, defVal);
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/settings/EnumOption.java b/app/src/main/java/com/fazziclay/opentoday/app/settings/EnumOption.java
new file mode 100644
index 00000000..013cdd5a
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/settings/EnumOption.java
@@ -0,0 +1,34 @@
+package com.fazziclay.opentoday.app.settings;
+
+public class EnumOption> extends Option {
+ private final Class clazz;
+
+ public EnumOption(String saveKey, boolean maybeUndefined, T defVal) {
+ super(saveKey, maybeUndefined, defVal);
+ this.clazz = (Class) defVal.getClass();
+ }
+
+ public T get(SettingsManager sm) {
+ Object o = _get(sm);
+ if (o instanceof Enum anEnum) {
+ return (T) anEnum;
+ }
+ throw new RuntimeException("SettingsManager unknown value in EnumOption");
+ }
+
+ public void set(SettingsManager sm, T t) {
+ _set(sm, t);
+ }
+
+ @Override
+ public Object parseValue(Object o) {
+ String s = (String) o;
+ return Enum.valueOf(clazz, s);
+ }
+
+ @Override
+ public Object writeValue(Object o) {
+ T anEnum = (T) o;
+ return anEnum.name();
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/settings/IntegerOption.java b/app/src/main/java/com/fazziclay/opentoday/app/settings/IntegerOption.java
new file mode 100644
index 00000000..408bdc0b
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/settings/IntegerOption.java
@@ -0,0 +1,25 @@
+package com.fazziclay.opentoday.app.settings;
+
+public class IntegerOption extends Option {
+ public IntegerOption(String saveKey, boolean maybeUndefined, int defVal) {
+ super(saveKey, maybeUndefined, defVal);
+ }
+
+ public void set(SettingsManager sm, int s) {
+ _set(sm, s);
+ }
+
+ public int get(SettingsManager sm) {
+ return (int) _get(sm);
+ }
+
+ @Override
+ public Object parseValue(Object o) {
+ return (int) o;
+ }
+
+ @Override
+ public Object writeValue(Object o) {
+ return (int) o;
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/settings/Option.java b/app/src/main/java/com/fazziclay/opentoday/app/settings/Option.java
new file mode 100644
index 00000000..00b4aa49
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/settings/Option.java
@@ -0,0 +1,52 @@
+package com.fazziclay.opentoday.app.settings;
+
+public class Option {
+ protected String saveKey;
+ protected boolean maybeUndefined;
+ protected Object defVal;
+
+ public Option(String saveKey, boolean maybeUndefined, Object defVal) {
+ this.saveKey = saveKey;
+ this.maybeUndefined = maybeUndefined;
+ this.defVal = defVal;
+ }
+
+ public String getSaveKey() {
+ return saveKey;
+ }
+
+ protected Object _get(SettingsManager sm) {
+ Object o = sm.getOption(this);
+ if (o == null) {
+ if (!maybeUndefined) {
+ _set(sm, defVal);
+ }
+ return defVal;
+ }
+ return o;
+ }
+
+ public Object getObject(SettingsManager sm) {
+ return _get(sm);
+ }
+
+ protected void _set(SettingsManager sm, Object o) {
+ sm.setOption(this, o);
+ }
+
+ public void def(SettingsManager sm) {
+ if (maybeUndefined) {
+ sm.clearOption(this);
+ } else {
+ throw new UnsupportedOperationException("This option can't be undefined");
+ }
+ }
+
+ public Object parseValue(Object o) {
+ return o;
+ }
+
+ public Object writeValue(Object o) {
+ return o;
+ }
+}
diff --git a/app/src/main/java/com/fazziclay/opentoday/app/settings/SettingsManager.java b/app/src/main/java/com/fazziclay/opentoday/app/settings/SettingsManager.java
new file mode 100644
index 00000000..6301d3b3
--- /dev/null
+++ b/app/src/main/java/com/fazziclay/opentoday/app/settings/SettingsManager.java
@@ -0,0 +1,407 @@
+package com.fazziclay.opentoday.app.settings;
+
+import static com.fazziclay.opentoday.util.InlineUtil.IPROF;
+
+import android.graphics.Color;
+import android.util.ArraySet;
+
+import com.fazziclay.javaneoutil.FileUtil;
+import com.fazziclay.opentoday.app.App;
+import com.fazziclay.opentoday.app.items.item.ItemType;
+import com.fazziclay.opentoday.app.items.item.ItemsRegistry;
+import com.fazziclay.opentoday.app.settings.enums.DateAndTimePreset;
+import com.fazziclay.opentoday.app.settings.enums.FirstDayOfWeek;
+import com.fazziclay.opentoday.app.settings.enums.FirstTab;
+import com.fazziclay.opentoday.app.settings.enums.ItemAction;
+import com.fazziclay.opentoday.app.settings.enums.ItemAddPosition;
+import com.fazziclay.opentoday.app.settings.enums.ThemeEnum;
+import com.fazziclay.opentoday.util.Logger;
+import com.fazziclay.opentoday.util.annotation.Getter;
+import com.fazziclay.opentoday.util.annotation.Setter;
+import com.fazziclay.opentoday.util.callback.Callback;
+import com.fazziclay.opentoday.util.callback.CallbackStorage;
+import com.fazziclay.opentoday.util.callback.Status;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.io.File;
+import java.util.HashMap;
+import java.util.Set;
+import java.util.UUID;
+
+public class SettingsManager {
+ // static
+ private static final String TAG = "SettingsManager";
+ private static final Set