From e1cf626a07b82790ce52d81e0a3bc7558a2d71f4 Mon Sep 17 00:00:00 2001
From: LumenTeun <teun@lutic.org>
Date: Sat, 19 Jul 2014 15:08:57 +0100
Subject: [PATCH 1/3] Added the option of an offset between charge animations.

---
 res/values/strings.xml                               |  2 ++
 res/xml/pref_setting.xml                             | 12 ++++++++++++
 src/com/zst/xposed/xuimod/Common.java                |  2 ++
 .../xuimod/mods/batterybar/BatteryBarView.java       |  6 ++++++
 4 files changed, 22 insertions(+)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 533f077..13fa607 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -230,6 +230,8 @@
     <string name="batterybar_height_dialog">Height of BatteryBar in dp.\n(Non-numeric characters are ignored.)</string>
     <string name="batterybar_animate_title">Animate Charging</string>
     <string name="batterybar_animate_summary">Show Animation while Charging</string>
+    <string name="batterybar_animate_offset">Animation Offset</string>
+    <string name="batterybar_animate_offset_summary">Time between animations</string>
     <string name="batterybar_color_title">BatteryBar Color</string>
     
     <string name="batterybar_color_screen_title">Customize Color</string>
diff --git a/res/xml/pref_setting.xml b/res/xml/pref_setting.xml
index 43998f4..6dcb971 100644
--- a/res/xml/pref_setting.xml
+++ b/res/xml/pref_setting.xml
@@ -84,6 +84,18 @@
             android:summary="@string/batterybar_animate_summary"
             android:title="@string/batterybar_animate_title" />
         
+        <com.zst.xposed.xuimod.preference.SeekBarDialog
+            defaultValue="0"
+            maximum="12000"
+            minimum="0"
+            suffix="ms"
+            android:dialogLayout="@layout/pref_seekbar"
+            android:dialogTitle="@string/batterybar_animate_offset"
+            android:key="batterybar_animate_offset"
+            android:dependency="batterybar_animate"
+            android:summary="@string/batterybar_animate_offset_summary"
+            android:title="@string/batterybar_animate_offset" />
+        
         <CheckBoxPreference
             android:dependency="batterybar_enable"
             android:key="batterybar_style"
diff --git a/src/com/zst/xposed/xuimod/Common.java b/src/com/zst/xposed/xuimod/Common.java
index 07dfdca..9d1742f 100644
--- a/src/com/zst/xposed/xuimod/Common.java
+++ b/src/com/zst/xposed/xuimod/Common.java
@@ -59,6 +59,7 @@ public class Common {
 	
 	public static final String KEY_BATTERYBAR_ENABLE = "batterybar_enable";
 	public static final String KEY_BATTERYBAR_ANIMATE = "batterybar_animate";
+	public static final String KEY_BATTERYBAR_ANIMATE_OFFSET = "batterybar_animate_offset";
 	public static final String KEY_BATTERYBAR_STYLE = "batterybar_style";
 	public static final String[] KEYS_BATTERYBAR_POSITION = new String[] {
 		"batterybar_position_sb",
@@ -167,6 +168,7 @@ public class Common {
 	
 	public static final boolean DEFAULT_BATTERYBAR_ENABLE = false;
 	public static final boolean DEFAULT_BATTERYBAR_ANIMATE = false;
+	public static final int DEFAULT_BATTERYBAR_ANIMATE_OFFSET = 0;
 	public static final boolean DEFAULT_BATTERYBAR_STYLE = false;
 	public static final String DEFAULT_BATTERYBAR_COLOR_MODE = "0";
 	public static final String DEFAULT_BATTERYBAR_COLOR = COLOR_HOLO_BLUE;
diff --git a/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java b/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java
index a8f872e..e11bd33 100644
--- a/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java
+++ b/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java
@@ -44,6 +44,7 @@
 public class BatteryBarView extends RelativeLayout implements Animatable {
     // Total animation duration
     private static final int ANIM_DURATION = 1000; // 1 second
+    private static int ANIM_OFFSET = 0; // Time between animations in milliseconds.
     
     public static final int MODE_COLOR_SINGLE = 0;
     public static final int MODE_COLOR_MULTIPLE = 1;
@@ -302,6 +303,9 @@ public void start() {
         Display display = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE))
     			.getDefaultDisplay();
         
+        ANIM_OFFSET = mPref.getInt(Common.KEY_BATTERYBAR_ANIMATE_OFFSET,
+        		Common.DEFAULT_BATTERYBAR_ANIMATE_OFFSET);
+        
         if (vertical) {
         	int height = display.getHeight();
         	if (mSymmetric) {
@@ -312,6 +316,7 @@ public void start() {
             a.setInterpolator(new AccelerateInterpolator());
             a.setDuration(ANIM_DURATION);
             a.setRepeatCount(Animation.INFINITE);
+            a.setStartOffset(ANIM_OFFSET);
             mChargerLayout.startAnimation(a);
             mChargerLayout.setVisibility(View.VISIBLE);
         } else {
@@ -324,6 +329,7 @@ public void start() {
             a.setInterpolator(new AccelerateInterpolator());
             a.setDuration(ANIM_DURATION);
             a.setRepeatCount(Animation.INFINITE);
+            a.setStartOffset(ANIM_OFFSET);
             mChargerLayout.startAnimation(a);
             mChargerLayout.setVisibility(View.VISIBLE);
         }

From c60cafd3f2ab599440e61411edf66f552b815e4c Mon Sep 17 00:00:00 2001
From: LumenTeun <teun@lutic.org>
Date: Sun, 20 Jul 2014 16:14:20 +0100
Subject: [PATCH 2/3] Moved some stuff about.

---
 res/xml/pref_setting.xml                                  | 2 +-
 .../zst/xposed/xuimod/mods/batterybar/BatteryBarView.java | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/res/xml/pref_setting.xml b/res/xml/pref_setting.xml
index 6dcb971..4e0e80d 100644
--- a/res/xml/pref_setting.xml
+++ b/res/xml/pref_setting.xml
@@ -95,7 +95,7 @@
             android:dependency="batterybar_animate"
             android:summary="@string/batterybar_animate_offset_summary"
             android:title="@string/batterybar_animate_offset" />
-        
+
         <CheckBoxPreference
             android:dependency="batterybar_enable"
             android:key="batterybar_style"
diff --git a/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java b/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java
index e11bd33..0b9e771 100644
--- a/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java
+++ b/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java
@@ -194,7 +194,10 @@ private void updateSettings() {
     	
     	mSymmetric = pref.getBoolean(Common.KEY_BATTERYBAR_STYLE,
     			Common.DEFAULT_BATTERYBAR_STYLE);
-    	
+
+        ANIM_OFFSET = pref.getInt(Common.KEY_BATTERYBAR_ANIMATE_OFFSET,
+        		Common.DEFAULT_BATTERYBAR_ANIMATE_OFFSET);
+
         setProgress(mBatteryLevel);
         updateBatteryColor();
         updateBatteryBackground();
@@ -303,9 +306,6 @@ public void start() {
         Display display = ((WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE))
     			.getDefaultDisplay();
         
-        ANIM_OFFSET = mPref.getInt(Common.KEY_BATTERYBAR_ANIMATE_OFFSET,
-        		Common.DEFAULT_BATTERYBAR_ANIMATE_OFFSET);
-        
         if (vertical) {
         	int height = display.getHeight();
         	if (mSymmetric) {

From 1efa44dcecd8d8ce2f9c342ab6200a25cc09e554 Mon Sep 17 00:00:00 2001
From: LumenTeun <teun@lutic.org>
Date: Mon, 21 Jul 2014 21:38:07 +0100
Subject: [PATCH 3/3] Made animation offset changes active directly. Thanks
 zst!

---
 .../zst/xposed/xuimod/mods/batterybar/BatteryBarView.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java b/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java
index 0b9e771..d1e7e8b 100644
--- a/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java
+++ b/src/com/zst/xposed/xuimod/mods/batterybar/BatteryBarView.java
@@ -195,8 +195,14 @@ private void updateSettings() {
     	mSymmetric = pref.getBoolean(Common.KEY_BATTERYBAR_STYLE,
     			Common.DEFAULT_BATTERYBAR_STYLE);
 
-        ANIM_OFFSET = pref.getInt(Common.KEY_BATTERYBAR_ANIMATE_OFFSET,
+        int tempAnimOffset = pref.getInt(Common.KEY_BATTERYBAR_ANIMATE_OFFSET,
         		Common.DEFAULT_BATTERYBAR_ANIMATE_OFFSET);
+        
+        if(tempAnimOffset != ANIM_OFFSET) {
+        	ANIM_OFFSET = tempAnimOffset;
+        	stop();
+        	start();
+        }
 
         setProgress(mBatteryLevel);
         updateBatteryColor();