Showing
3 changed files
with
37 additions
and
37 deletions
@@ -13,11 +13,11 @@ class AutoTrackLogger { | @@ -13,11 +13,11 @@ class AutoTrackLogger { | ||
13 | bool get hasHandler => _handler != null; | 13 | bool get hasHandler => _handler != null; |
14 | 14 | ||
15 | void info(String message) { | 15 | void info(String message) { |
16 | - _print(AutoTrackLoggerLevel.Info, message); | 16 | + _print(AutoTrackLoggerLevel.info, message); |
17 | } | 17 | } |
18 | 18 | ||
19 | void debug(String message) { | 19 | void debug(String message) { |
20 | - _print(AutoTrackLoggerLevel.Debug, message); | 20 | + _print(AutoTrackLoggerLevel.debug, message); |
21 | } | 21 | } |
22 | 22 | ||
23 | void error(Object e) { | 23 | void error(Object e) { |
@@ -29,7 +29,7 @@ class AutoTrackLogger { | @@ -29,7 +29,7 @@ class AutoTrackLogger { | ||
29 | } else if (e is DioException) { | 29 | } else if (e is DioException) { |
30 | message = (e).message ?? 'dio exception with unknown message'; | 30 | message = (e).message ?? 'dio exception with unknown message'; |
31 | } | 31 | } |
32 | - _print(AutoTrackLoggerLevel.Error, message); | 32 | + _print(AutoTrackLoggerLevel.error, message); |
33 | } | 33 | } |
34 | 34 | ||
35 | void setHandler(AutoTrackLoggerHandler handler) { | 35 | void setHandler(AutoTrackLoggerHandler handler) { |
@@ -61,9 +61,9 @@ class AutoTrackLogger { | @@ -61,9 +61,9 @@ class AutoTrackLogger { | ||
61 | } | 61 | } |
62 | 62 | ||
63 | enum AutoTrackLoggerLevel { | 63 | enum AutoTrackLoggerLevel { |
64 | - Info, | ||
65 | - Debug, | ||
66 | - Error, | 64 | + info, |
65 | + debug, | ||
66 | + error, | ||
67 | } | 67 | } |
68 | 68 | ||
69 | class _LoggerData { | 69 | class _LoggerData { |
@@ -95,17 +95,17 @@ class PageInfo { | @@ -95,17 +95,17 @@ class PageInfo { | ||
95 | } | 95 | } |
96 | 96 | ||
97 | enum PageTimerState { | 97 | enum PageTimerState { |
98 | - Init, | ||
99 | - Start, | ||
100 | - Pause, | ||
101 | - Resume, | ||
102 | - End, | 98 | + init, |
99 | + start, | ||
100 | + pause, | ||
101 | + resume, | ||
102 | + end, | ||
103 | } | 103 | } |
104 | 104 | ||
105 | class PageTimer { | 105 | class PageTimer { |
106 | PageTimer(); | 106 | PageTimer(); |
107 | 107 | ||
108 | - PageTimerState _state = PageTimerState.Init; | 108 | + PageTimerState _state = PageTimerState.init; |
109 | PageTimerState get state => _state; | 109 | PageTimerState get state => _state; |
110 | 110 | ||
111 | int _lastTimeStamp = 0; | 111 | int _lastTimeStamp = 0; |
@@ -118,41 +118,41 @@ class PageTimer { | @@ -118,41 +118,41 @@ class PageTimer { | ||
118 | } | 118 | } |
119 | 119 | ||
120 | start() { | 120 | start() { |
121 | - if (_state != PageTimerState.Init && _state != PageTimerState.End) { | 121 | + if (_state != PageTimerState.init && _state != PageTimerState.end) { |
122 | return; | 122 | return; |
123 | } | 123 | } |
124 | 124 | ||
125 | - _state = PageTimerState.Start; | 125 | + _state = PageTimerState.start; |
126 | _lastTimeStamp = DateTime.now().millisecondsSinceEpoch; | 126 | _lastTimeStamp = DateTime.now().millisecondsSinceEpoch; |
127 | _duration = const Duration(); | 127 | _duration = const Duration(); |
128 | } | 128 | } |
129 | 129 | ||
130 | pause() { | 130 | pause() { |
131 | - if (_state != PageTimerState.Start && _state != PageTimerState.Resume) { | 131 | + if (_state != PageTimerState.start && _state != PageTimerState.resume) { |
132 | return; | 132 | return; |
133 | } | 133 | } |
134 | 134 | ||
135 | - _state = PageTimerState.Pause; | 135 | + _state = PageTimerState.pause; |
136 | _duration = Duration(milliseconds: _duration.inMilliseconds + _computeMilliseconds()); | 136 | _duration = Duration(milliseconds: _duration.inMilliseconds + _computeMilliseconds()); |
137 | } | 137 | } |
138 | 138 | ||
139 | resume() { | 139 | resume() { |
140 | - if (_state != PageTimerState.Pause) { | 140 | + if (_state != PageTimerState.pause) { |
141 | return; | 141 | return; |
142 | } | 142 | } |
143 | 143 | ||
144 | - _state = PageTimerState.Resume; | 144 | + _state = PageTimerState.resume; |
145 | _lastTimeStamp = DateTime.now().millisecondsSinceEpoch; | 145 | _lastTimeStamp = DateTime.now().millisecondsSinceEpoch; |
146 | } | 146 | } |
147 | 147 | ||
148 | end() { | 148 | end() { |
149 | - if (_state == PageTimerState.Pause) { | ||
150 | - _state = PageTimerState.End; | 149 | + if (_state == PageTimerState.pause) { |
150 | + _state = PageTimerState.end; | ||
151 | return; | 151 | return; |
152 | } | 152 | } |
153 | 153 | ||
154 | - if (_state == PageTimerState.Start || _state == PageTimerState.Resume) { | ||
155 | - _state = PageTimerState.End; | 154 | + if (_state == PageTimerState.start || _state == PageTimerState.resume) { |
155 | + _state = PageTimerState.end; | ||
156 | _duration = Duration(milliseconds: _duration.inMilliseconds + _computeMilliseconds()); | 156 | _duration = Duration(milliseconds: _duration.inMilliseconds + _computeMilliseconds()); |
157 | } | 157 | } |
158 | } | 158 | } |
@@ -31,7 +31,7 @@ class PageStack with WidgetsBindingObserver { | @@ -31,7 +31,7 @@ class PageStack with WidgetsBindingObserver { | ||
31 | push(Route route, Element element, Route? previousRoute) { | 31 | push(Route route, Element element, Route? previousRoute) { |
32 | Page page = Page(route, element); | 32 | Page page = Page(route, element); |
33 | _stack.add(page); | 33 | _stack.add(page); |
34 | - _task.addPush(page, page.previous); | 34 | + _task.addpush(page, page.previous); |
35 | } | 35 | } |
36 | 36 | ||
37 | pop(Route route, Route? previousRoute) { | 37 | pop(Route route, Route? previousRoute) { |
@@ -41,7 +41,7 @@ class PageStack with WidgetsBindingObserver { | @@ -41,7 +41,7 @@ class PageStack with WidgetsBindingObserver { | ||
41 | 41 | ||
42 | Page? page = _findPage(route); | 42 | Page? page = _findPage(route); |
43 | if (page != null) { | 43 | if (page != null) { |
44 | - _task.addPop(page, page.previous); | 44 | + _task.addpop(page, page.previous); |
45 | } | 45 | } |
46 | _removeAllAfter(page); | 46 | _removeAllAfter(page); |
47 | } | 47 | } |
@@ -65,7 +65,7 @@ class PageStack with WidgetsBindingObserver { | @@ -65,7 +65,7 @@ class PageStack with WidgetsBindingObserver { | ||
65 | _removeAllAfter(oldPage); | 65 | _removeAllAfter(oldPage); |
66 | } | 66 | } |
67 | _stack.add(newPage); | 67 | _stack.add(newPage); |
68 | - _task.addReplace(newPage, oldPage); | 68 | + _task.addreplace(newPage, oldPage); |
69 | } | 69 | } |
70 | 70 | ||
71 | Page? _findPage(Route route) { | 71 | Page? _findPage(Route route) { |
@@ -124,22 +124,22 @@ class _PageTask { | @@ -124,22 +124,22 @@ class _PageTask { | ||
124 | final List<_PageTaskData> _list = []; | 124 | final List<_PageTaskData> _list = []; |
125 | bool _taskRunning = false; | 125 | bool _taskRunning = false; |
126 | 126 | ||
127 | - addPush(Page page, Page? prevPage) { | ||
128 | - _PageTaskData taskData = _PageTaskData(_PageTaskType.Push, page); | 127 | + addpush(Page page, Page? prevPage) { |
128 | + _PageTaskData taskData = _PageTaskData(_PageTaskType.push, page); | ||
129 | taskData.prevPage = prevPage; | 129 | taskData.prevPage = prevPage; |
130 | _list.add(taskData); | 130 | _list.add(taskData); |
131 | _triggerTask(); | 131 | _triggerTask(); |
132 | } | 132 | } |
133 | 133 | ||
134 | - addPop(Page page, Page? prevPage) { | ||
135 | - _PageTaskData taskData = _PageTaskData(_PageTaskType.Pop, page); | 134 | + addpop(Page page, Page? prevPage) { |
135 | + _PageTaskData taskData = _PageTaskData(_PageTaskType.pop, page); | ||
136 | taskData.prevPage = prevPage; | 136 | taskData.prevPage = prevPage; |
137 | _list.add(taskData); | 137 | _list.add(taskData); |
138 | _triggerTask(); | 138 | _triggerTask(); |
139 | } | 139 | } |
140 | 140 | ||
141 | - addReplace(Page page, Page? prevPage) { | ||
142 | - _PageTaskData taskData = _PageTaskData(_PageTaskType.Replace, page); | 141 | + addreplace(Page page, Page? prevPage) { |
142 | + _PageTaskData taskData = _PageTaskData(_PageTaskType.replace, page); | ||
143 | taskData.prevPage = prevPage; | 143 | taskData.prevPage = prevPage; |
144 | _list.add(taskData); | 144 | _list.add(taskData); |
145 | _triggerTask(); | 145 | _triggerTask(); |
@@ -165,16 +165,16 @@ class _PageTask { | @@ -165,16 +165,16 @@ class _PageTask { | ||
165 | Page? enterPage, leavePage; | 165 | Page? enterPage, leavePage; |
166 | _list.clear(); | 166 | _list.clear(); |
167 | for (_PageTaskData taskData in list as List<_PageTaskData>) { | 167 | for (_PageTaskData taskData in list as List<_PageTaskData>) { |
168 | - if (taskData.type == _PageTaskType.Push) { | 168 | + if (taskData.type == _PageTaskType.push) { |
169 | leavePage ??= taskData.prevPage; | 169 | leavePage ??= taskData.prevPage; |
170 | enterPage = taskData.page; | 170 | enterPage = taskData.page; |
171 | - } else if (taskData.type == _PageTaskType.Pop) { | 171 | + } else if (taskData.type == _PageTaskType.pop) { |
172 | leavePage ??= taskData.page; | 172 | leavePage ??= taskData.page; |
173 | if (enterPage == null || enterPage == taskData.page) { | 173 | if (enterPage == null || enterPage == taskData.page) { |
174 | enterPage = taskData.prevPage; | 174 | enterPage = taskData.prevPage; |
175 | enterPage?.pageInfo.isBack = true; | 175 | enterPage?.pageInfo.isBack = true; |
176 | } | 176 | } |
177 | - } else if (taskData.type == _PageTaskType.Replace) { | 177 | + } else if (taskData.type == _PageTaskType.replace) { |
178 | leavePage ??= taskData.prevPage; | 178 | leavePage ??= taskData.prevPage; |
179 | if (enterPage == null || enterPage == taskData.prevPage) { | 179 | if (enterPage == null || enterPage == taskData.prevPage) { |
180 | enterPage = taskData.page; | 180 | enterPage = taskData.page; |
@@ -203,7 +203,7 @@ class _PageTaskData { | @@ -203,7 +203,7 @@ class _PageTaskData { | ||
203 | } | 203 | } |
204 | 204 | ||
205 | enum _PageTaskType { | 205 | enum _PageTaskType { |
206 | - Push, | ||
207 | - Pop, | ||
208 | - Replace, | 206 | + push, |
207 | + pop, | ||
208 | + replace, | ||
209 | } | 209 | } |
-
Please register or login to post a comment