From 3709f2cd8e5e5b4f4e600344ecc907b46df58886 Mon Sep 17 00:00:00 2001
From: "Rui Zhao (renyuneyun)" <renyuneyun@gmail.com>
Date: Sun, 13 May 2018 22:51:59 +0100
Subject: [PATCH] Ship v0.6 && Update documents

---
 CHANGELOG.md                                     | 16 ++++++++++++++++
 app/build.gradle                                 |  4 ++--
 .../easer/core/data/storage/StorageHelper.java   |  1 +
 docs/en/FEATURES.md                              |  1 +
 docs/zh/FEATURES.md                              |  1 +
 5 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e1538738..f4926e33 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,22 @@
 CHANGELOG
 ======
 
+* v0.6: Add ConditionEvent (enter/leave) && Go back when pressing "back" && Do not clear log when reloading service && Various fixes && Dev changes
+	* Add ConditionEvent - Events for Condition state
+		* Enter Condition and Leave condition
+	* Go to previous page / fragment when pressing "back" button
+	* Do not clear log when reloading EHService
+		* The log is kept to at most 1000 entries
+		* The log will be lost if EHService is freed
+	* Fixes
+		* Fix title and navigation drawer behavior of Activity Log
+		* Fix unexpected reloading of scripts when switching pages
+		* Fit spinners when editing Script into screen
+		* Make "reverse" work for Condition
+		* Fix `BatteryTracker.state()`
+	* Dev changes
+		* Move `ConditionHolder` to a separate `Service`
+
 * v0.5.9.1: Allow to restart after update && Fix Events not triggered sometimes && Do not trigger `TimeEventPlugin` for the past time of the current day
 	* Allow to restart service after updating app (changeable in settings)
 	* Fix "reversed" Events not triggered at the first time
diff --git a/app/build.gradle b/app/build.gradle
index bf8ea1fc..513f815e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId 'ryey.easer'
         minSdkVersion 15
         targetSdkVersion 23
-        versionCode 68
-        versionName "0.5.9.1"
+        versionCode 69
+        versionName "0.6"
 
         vectorDrawables.useSupportLibrary = true
 
diff --git a/app/src/main/java/ryey/easer/core/data/storage/StorageHelper.java b/app/src/main/java/ryey/easer/core/data/storage/StorageHelper.java
index 1cdf2ab7..0a7d6088 100644
--- a/app/src/main/java/ryey/easer/core/data/storage/StorageHelper.java
+++ b/app/src/main/java/ryey/easer/core/data/storage/StorageHelper.java
@@ -83,6 +83,7 @@ public static boolean convertToNewData(Context context) {
                 "Profile",
                 "Script",
                 "Scenario",
+                "Condition",
         };
         for (int i = 0; i < dataStorages.length; i++) {
             AbstractDataStorage<?, ?> dataStorage = dataStorages[i];
diff --git a/docs/en/FEATURES.md b/docs/en/FEATURES.md
index 923195d0..eac411db 100644
--- a/docs/en/FEATURES.md
+++ b/docs/en/FEATURES.md
@@ -1,6 +1,7 @@
 Supported Features
 ------
 ### Event
+* *Condition* Event
 * Date
 * Time
 * WiFi connection name (SSID)
diff --git a/docs/zh/FEATURES.md b/docs/zh/FEATURES.md
index 38f15d71..d00cca69 100644
--- a/docs/zh/FEATURES.md
+++ b/docs/zh/FEATURES.md
@@ -1,6 +1,7 @@
 已支持功能
 ------
 ### 事件(Event)
+* 狀況(Condition)事件
 * 日期
 * 時間
 * WiFi連接名稱