Nextrek
Subversion Repository Public Repository

Nextrek

URLs

Copy to Clipboard
Explore
Commits

Diff Revisions 690 vs 765 for /Android/SmartCharging/SmartCharging/.idea/workspace.xml

Diff revisions: vs.
  @@ -16,6 +16,8 @@
16 16 <shared>
17 17 <config>
18 18 <devices>
19 + <device id="Nexus 6" />
20 + <device id="Nexus 9" />
19 21 <device id="Nexus 5" />
20 22 <device id="Nexus 7" />
21 23 </devices>
  @@ -55,43 +57,26 @@
55 57 <option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Unnamed-0" />
56 58 </component>
57 59 <component name="ChangeListManager">
58 - <list default="true" readonly="true" id="dc564432-0882-4a2b-94b7-3913b736c3c7" name="Default" comment="me">
59 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/httpclient_android_4_3_5_1.xml" afterPath="" />
60 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/httpmime_4_3_6.xml" afterPath="" />
61 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/photo_crop_library_1_0_2.xml" afterPath="" />
62 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_7_3_0.xml" afterPath="" />
63 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_ads_7_3_0.xml" afterPath="" />
64 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_analytics_7_3_0.xml" afterPath="" />
65 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_appindexing_7_3_0.xml" afterPath="" />
66 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_appinvite_7_3_0.xml" afterPath="" />
67 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_appstate_7_3_0.xml" afterPath="" />
68 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_base_7_3_0.xml" afterPath="" />
69 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_cast_7_3_0.xml" afterPath="" />
70 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_drive_7_3_0.xml" afterPath="" />
71 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_fitness_7_3_0.xml" afterPath="" />
72 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_games_7_3_0.xml" afterPath="" />
73 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_gcm_7_3_0.xml" afterPath="" />
74 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_identity_7_3_0.xml" afterPath="" />
75 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_location_7_3_0.xml" afterPath="" />
76 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_maps_7_3_0.xml" afterPath="" />
77 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_nearby_7_3_0.xml" afterPath="" />
78 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_panorama_7_3_0.xml" afterPath="" />
79 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_plus_7_3_0.xml" afterPath="" />
80 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_safetynet_7_3_0.xml" afterPath="" />
81 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_wallet_7_3_0.xml" afterPath="" />
82 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_wearable_7_3_0.xml" afterPath="" />
83 - <change type="DELETED" beforePath="C:\Client\SmartCharging\.idea\libraries\appcompat_v7_22_2_0.xml" afterPath="" />
84 - <change type="DELETED" beforePath="C:\Client\SmartCharging\.idea\libraries\support_annotations_22_2_0.xml" afterPath="" />
85 - <change type="DELETED" beforePath="$PROJECT_DIR$/.idea/libraries" afterPath="" />
60 + <list default="true" readonly="true" id="dc564432-0882-4a2b-94b7-3913b736c3c7" name="Default" comment="">
61 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/logoregione.png" />
62 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/placeholder.jpg" />
63 + <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/screen_region.png" />
86 64 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" />
87 65 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" />
88 66 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" />
89 67 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" />
90 68 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" />
69 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java" />
70 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java" />
91 71 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java" />
92 72 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java" afterPath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java" />
93 - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml" />
73 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_register_locale.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_register_locale.xml" />
74 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml" />
75 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml" />
76 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" />
77 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable/button_color_state.xml" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/button_color_state.xml" />
94 78 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/local.properties" afterPath="$PROJECT_DIR$/local.properties" />
79 + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" />
95 80 <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
96 81 </list>
97 82 <ignored path="SmartCharging.iws" />
  @@ -112,18 +97,7 @@
112 97 <system id="GRADLE">
113 98 <state>
114 99 <projects_view>
115 - <tree_state>
116 - <PATH>
117 - <PATH_ELEMENT>
118 - <option name="myItemId" value="" />
119 - <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ExternalProjectsStructure$RootNode" />
120 - </PATH_ELEMENT>
121 - <PATH_ELEMENT>
122 - <option name="myItemId" value="SmartCharging" />
123 - <option name="myItemType" value="com.intellij.openapi.externalSystem.view.ProjectNode" />
124 - </PATH_ELEMENT>
125 - </PATH>
126 - </tree_state>
100 + <tree_state />
127 101 </projects_view>
128 102 </state>
129 103 </system>
  @@ -133,23 +107,21 @@
133 107 </component>
134 108 <component name="FileEditorManager">
135 109 <leaf>
136 - <file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false">
137 - <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
110 + <file leaf-file-name="build.gradle" pinned="false" current-in-tab="false">
111 + <entry file="file://$PROJECT_DIR$/app/build.gradle">
138 112 <provider selected="true" editor-type-id="text-editor">
139 113 <state vertical-scroll-proportion="0.0">
140 - <caret line="116" column="45" selection-start-line="116" selection-start-column="45" selection-end-line="116" selection-end-column="45" />
141 - <folding>
142 - <element signature="e#6417#6455#0" expanded="true" />
143 - </folding>
114 + <caret line="15" column="24" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
115 + <folding />
144 116 </state>
145 117 </provider>
146 118 </entry>
147 119 </file>
148 - <file leaf-file-name="RecensioneActivity.java" pinned="false" current-in-tab="false">
149 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RecensioneActivity.java">
120 + <file leaf-file-name="RegisterActivity.java" pinned="false" current-in-tab="false">
121 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java">
150 122 <provider selected="true" editor-type-id="text-editor">
151 123 <state vertical-scroll-proportion="0.0">
152 - <caret line="56" column="42" selection-start-line="56" selection-start-column="42" selection-end-line="56" selection-end-column="42" />
124 + <caret line="514" column="24" selection-start-line="514" selection-start-column="24" selection-end-line="516" selection-end-column="47" />
153 125 <folding />
154 126 </state>
155 127 </provider>
  @@ -159,120 +131,87 @@
159 131 <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java">
160 132 <provider selected="true" editor-type-id="text-editor">
161 133 <state vertical-scroll-proportion="0.0">
162 - <caret line="121" column="0" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" />
134 + <caret line="293" column="33" selection-start-line="293" selection-start-column="33" selection-end-line="293" selection-end-column="33" />
163 135 <folding>
164 136 <element signature="e#2461#2483#0" expanded="true" />
165 137 <element signature="e#7565#7589#0" expanded="true" />
166 138 <element signature="e#8972#9004#0" expanded="true" />
167 - <element signature="e#11888#11926#0" expanded="true" />
168 - <element signature="e#12720#12750#0" expanded="true" />
169 - </folding>
170 - </state>
171 - </provider>
172 - </entry>
173 - </file>
174 - <file leaf-file-name="RegisterActivity.java" pinned="false" current-in-tab="true">
175 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java">
176 - <provider selected="true" editor-type-id="text-editor">
177 - <state vertical-scroll-proportion="0.5744681">
178 - <caret line="560" column="64" selection-start-line="560" selection-start-column="64" selection-end-line="560" selection-end-column="64" />
179 - <folding>
180 - <element signature="imports" expanded="true" />
139 + <element signature="e#10451#12566#0" expanded="true" />
140 + <element signature="e#11597#11849#0" expanded="true" />
141 + <element signature="e#11759#11783#0" expanded="true" />
142 + <element signature="e#12063#12101#0" expanded="true" />
143 + <element signature="e#12565#12566#0" expanded="true" />
144 + <element signature="e#12897#12927#0" expanded="true" />
181 145 </folding>
182 146 </state>
183 147 </provider>
184 148 </entry>
185 149 </file>
186 - <file leaf-file-name="Utils.java" pinned="false" current-in-tab="false">
187 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java">
150 + <file leaf-file-name="SplashScreen.java" pinned="false" current-in-tab="false">
151 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SplashScreen.java">
188 152 <provider selected="true" editor-type-id="text-editor">
189 153 <state vertical-scroll-proportion="0.0">
190 - <caret line="36" column="26" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="34" />
154 + <caret line="29" column="71" selection-start-line="29" selection-start-column="71" selection-end-line="29" selection-end-column="71" />
191 155 <folding />
192 156 </state>
193 157 </provider>
194 158 </entry>
195 159 </file>
196 - <file leaf-file-name="BitmapFactory.java" pinned="false" current-in-tab="false">
197 - <entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/graphics/BitmapFactory.java">
198 - <provider selected="true" editor-type-id="text-editor">
199 - <state vertical-scroll-proportion="0.0">
200 - <caret line="595" column="25" selection-start-line="595" selection-start-column="25" selection-end-line="595" selection-end-column="25" />
201 - <folding />
202 - </state>
160 + <file leaf-file-name="activity_splash.xml" pinned="false" current-in-tab="false">
161 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml">
162 + <provider editor-type-id="android-designer">
163 + <state />
203 164 </provider>
204 - </entry>
205 - </file>
206 - <file leaf-file-name="SelectionActivity.java" pinned="false" current-in-tab="false">
207 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SelectionActivity.java">
208 165 <provider selected="true" editor-type-id="text-editor">
209 - <state vertical-scroll-proportion="0.0">
210 - <caret line="118" column="103" selection-start-line="118" selection-start-column="103" selection-end-line="118" selection-end-column="103" />
211 - <folding />
166 + <state vertical-scroll-proportion="1.0689656">
167 + <caret line="13" column="48" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
168 + <folding>
169 + <element signature="e#1224#1243#0" expanded="true" />
170 + </folding>
212 171 </state>
213 172 </provider>
214 173 </entry>
215 174 </file>
216 - <file leaf-file-name="activity_manager.xml" pinned="false" current-in-tab="false">
217 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_manager.xml">
175 + <file leaf-file-name="activity_selection.xml" pinned="false" current-in-tab="true">
176 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml">
218 177 <provider editor-type-id="android-designer">
219 178 <state />
220 179 </provider>
221 180 <provider selected="true" editor-type-id="text-editor">
222 - <state vertical-scroll-proportion="-0.0">
223 - <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
181 + <state vertical-scroll-proportion="0.798005">
182 + <caret line="95" column="45" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="45" />
224 183 <folding>
225 - <element signature="e#912#931#0" expanded="true" />
226 - <element signature="e#1436#1457#0" expanded="true" />
227 - <element signature="e#2138#2160#0" expanded="true" />
228 - <element signature="e#2818#2833#0" expanded="true" />
229 - <element signature="e#3508#3526#0" expanded="true" />
230 - <element signature="e#4156#4184#0" expanded="true" />
231 - <element signature="e#4831#4855#0" expanded="true" />
232 - <element signature="e#5194#5223#0" expanded="true" />
233 - <element signature="e#5415#5430#0" expanded="true" />
234 - <element signature="e#5979#6007#0" expanded="true" />
235 - <element signature="e#6384#6411#0" expanded="true" />
236 - <element signature="e#6789#6820#0" expanded="true" />
184 + <element signature="e#4221#4240#0" expanded="true" />
185 + <element signature="e#4288#4307#0" expanded="true" />
237 186 </folding>
238 187 </state>
239 188 </provider>
240 189 </entry>
241 190 </file>
242 - <file leaf-file-name="SettingSelectionActivity.java" pinned="false" current-in-tab="false">
243 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingSelectionActivity.java">
191 + <file leaf-file-name="activity_setting_selection.xml" pinned="false" current-in-tab="false">
192 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml">
193 + <provider editor-type-id="android-designer">
194 + <state />
195 + </provider>
244 196 <provider selected="true" editor-type-id="text-editor">
245 - <state vertical-scroll-proportion="0.0">
246 - <caret line="60" column="45" selection-start-line="60" selection-start-column="45" selection-end-line="60" selection-end-column="45" />
197 + <state vertical-scroll-proportion="-3.862069">
198 + <caret line="20" column="29" selection-start-line="20" selection-start-column="29" selection-end-line="20" selection-end-column="29" />
247 199 <folding />
248 200 </state>
249 201 </provider>
250 202 </entry>
251 203 </file>
252 - <file leaf-file-name="activity_setting_selection.xml" pinned="false" current-in-tab="false">
253 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml">
254 - <provider editor-type-id="android-designer">
204 + <file leaf-file-name="screen1.png" pinned="false" current-in-tab="false">
205 + <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/screen1.png">
206 + <provider selected="true" editor-type-id="images">
255 207 <state />
256 208 </provider>
257 - <provider selected="true" editor-type-id="text-editor">
258 - <state vertical-scroll-proportion="-12.75862">
259 - <caret line="180" column="27" selection-start-line="0" selection-start-column="0" selection-end-line="184" selection-end-column="0" />
260 - <folding>
261 - <element signature="e#926#945#0" expanded="true" />
262 - <element signature="e#1844#1865#0" expanded="true" />
263 - <element signature="e#2658#2680#0" expanded="true" />
264 - <element signature="e#3451#3466#0" expanded="true" />
265 - <element signature="e#4253#4271#0" expanded="true" />
266 - <element signature="e#5005#5033#0" expanded="true" />
267 - <element signature="e#5783#5807#0" expanded="true" />
268 - <element signature="e#6201#6230#0" expanded="true" />
269 - <element signature="e#6462#6487#0" expanded="true" />
270 - <element signature="e#6598#6616#0" expanded="true" />
271 - <element signature="e#7013#7031#0" expanded="true" />
272 - <element signature="e#7663#7681#0" expanded="true" />
273 - <element signature="e#8173#8201#0" expanded="true" />
274 - </folding>
275 - </state>
209 + </entry>
210 + </file>
211 + <file leaf-file-name="logo.png" pinned="false" current-in-tab="false">
212 + <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/logo.png">
213 + <provider selected="true" editor-type-id="images">
214 + <state />
276 215 </provider>
277 216 </entry>
278 217 </file>
  @@ -726,6 +665,11 @@
726 665 <option name="name" value="prepareComGithubPaolorotoloAppintro320Library" />
727 666 </ExternalTaskPojo>
728 667 <ExternalTaskPojo>
668 + <option name="description" value="Prepare com.github.rey5137:material:1.2.1" />
669 + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
670 + <option name="name" value="prepareComGithubRey5137Material121Library" />
671 + </ExternalTaskPojo>
672 + <ExternalTaskPojo>
729 673 <option name="description" value="Prepare com.google.android.gms:play-services:7.3.0" />
730 674 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
731 675 <option name="name" value="prepareComGoogleAndroidGmsPlayServices730Library" />
  @@ -831,6 +775,11 @@
831 775 <option name="name" value="prepareComGoogleAndroidGmsPlayServicesWearable730Library" />
832 776 </ExternalTaskPojo>
833 777 <ExternalTaskPojo>
778 + <option name="description" value="Prepare com.makeramen:roundedimageview:2.2.0" />
779 + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
780 + <option name="name" value="prepareComMakeramenRoundedimageview220Library" />
781 + </ExternalTaskPojo>
782 + <ExternalTaskPojo>
834 783 <option name="description" value="Prepare com.wada811:android-material-design-colors:2.0.0" />
835 784 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$" />
836 785 <option name="name" value="prepareComWada811AndroidMaterialDesignColors200Library" />
  @@ -1361,6 +1310,11 @@
1361 1310 <option name="name" value="prepareComGithubPaolorotoloAppintro320Library" />
1362 1311 </ExternalTaskPojo>
1363 1312 <ExternalTaskPojo>
1313 + <option name="description" value="Prepare com.github.rey5137:material:1.2.1" />
1314 + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1315 + <option name="name" value="prepareComGithubRey5137Material121Library" />
1316 + </ExternalTaskPojo>
1317 + <ExternalTaskPojo>
1364 1318 <option name="description" value="Prepare com.google.android.gms:play-services:7.3.0" />
1365 1319 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1366 1320 <option name="name" value="prepareComGoogleAndroidGmsPlayServices730Library" />
  @@ -1466,6 +1420,11 @@
1466 1420 <option name="name" value="prepareComGoogleAndroidGmsPlayServicesWearable730Library" />
1467 1421 </ExternalTaskPojo>
1468 1422 <ExternalTaskPojo>
1423 + <option name="description" value="Prepare com.makeramen:roundedimageview:2.2.0" />
1424 + <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1425 + <option name="name" value="prepareComMakeramenRoundedimageview220Library" />
1426 + </ExternalTaskPojo>
1427 + <ExternalTaskPojo>
1469 1428 <option name="description" value="Prepare com.wada811:android-material-design-colors:2.0.0" />
1470 1429 <option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" />
1471 1430 <option name="name" value="prepareComWada811AndroidMaterialDesignColors200Library" />
  @@ -1595,7 +1554,7 @@
1595 1554 <option name="modificationStamps">
1596 1555 <map>
1597 1556 <entry key="$PROJECT_DIR$" value="4304472899838" />
1598 - <entry key="C:\Client\SmartCharging" value="4323720230005" />
1557 + <entry key="C:\Client\SmartCharging" value="4325279797338" />
1599 1558 <entry key="C:\Nextrek\SmartCharging" value="4321472708485" />
1600 1559 <entry key="C:\SmartCharging\SmartCharging" value="4308458371987" />
1601 1560 </map>
  @@ -1778,38 +1737,40 @@
1778 1737 <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.albinmathew/photo-crop-library/1.0.2/1820d6e93c00bbe31a345f79014d09c82469bfc5/photo-crop-library-1.0.2.aar" />
1779 1738 <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.ganfra/material-spinner/1.1.0/5454320bce0cefac1fbb03220dcb060d545cb113/material-spinner-1.1.0.aar" />
1780 1739 <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.wada811/android-material-design-colors/2.0.0/886ee6d88b3505435839bc9c46e26ed5e2577017/android-material-design-colors-2.0.0.aar" />
1740 + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.rey5137/material/1.2.1/ffa35721f2d076162390aabd2761c5ff5ce2f10/material-1.2.1.aar" />
1781 1741 <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.facebook.android/facebook-android-sdk/4.0.0/f8cc454e2454e4a8b990222647bf976cf0290d9b/facebook-android-sdk-4.0.0.aar" />
1782 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/design/22.2.1/design-22.2.1.aar" />
1783 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/22.2.1/appcompat-v7-22.2.1.aar" />
1784 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/cardview-v7/22.2.1/cardview-v7-22.2.1.aar" />
1785 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services/7.3.0/play-services-7.3.0.aar" />
1742 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/android/m2repository/com/android/support/design/22.2.1/design-22.2.1.aar" />
1743 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/22.2.1/appcompat-v7-22.2.1.aar" />
1744 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/android/m2repository/com/android/support/cardview-v7/22.2.1/cardview-v7-22.2.1.aar" />
1745 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services/7.3.0/play-services-7.3.0.aar" />
1786 1746 <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.paolorotolo/appintro/3.2.0/eb5567286fbe895c416b0347aa9ed777f2fc6043/appintro-3.2.0.aar" />
1747 + <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.makeramen/roundedimageview/2.2.0/e7325f15444123cbc93427166f33550db934599e/roundedimageview-2.2.0.aar" />
1787 1748 <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpclient-android/4.3.5.1/eecbb0b998e77629862a13d957d552b3be58fc4e/httpclient-android-4.3.5.1.jar" />
1788 1749 <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.apache.httpcomponents/httpmime/4.3.6/cf8bacbf0d476c7f2221f861269365b66447f7ec/httpmime-4.3.6.jar" />
1789 1750 <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.nineoldandroids/library/2.4.0/e9b63380f3a242dbdbf103a2355ad7e43bad17cb/library-2.4.0.jar" />
1790 1751 <option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.parse.bolts/bolts-android/1.1.4/129874135e6081269ace2312092031558865de12/bolts-android-1.1.4.jar" />
1791 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-ads/7.3.0/play-services-ads-7.3.0.aar" />
1792 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-analytics/7.3.0/play-services-analytics-7.3.0.aar" />
1793 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-appindexing/7.3.0/play-services-appindexing-7.3.0.aar" />
1794 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-appinvite/7.3.0/play-services-appinvite-7.3.0.aar" />
1795 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-appstate/7.3.0/play-services-appstate-7.3.0.aar" />
1796 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-base/7.3.0/play-services-base-7.3.0.aar" />
1797 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-cast/7.3.0/play-services-cast-7.3.0.aar" />
1798 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-drive/7.3.0/play-services-drive-7.3.0.aar" />
1799 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-fitness/7.3.0/play-services-fitness-7.3.0.aar" />
1800 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-games/7.3.0/play-services-games-7.3.0.aar" />
1801 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-gcm/7.3.0/play-services-gcm-7.3.0.aar" />
1802 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-identity/7.3.0/play-services-identity-7.3.0.aar" />
1803 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-location/7.3.0/play-services-location-7.3.0.aar" />
1804 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-maps/7.3.0/play-services-maps-7.3.0.aar" />
1805 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-nearby/7.3.0/play-services-nearby-7.3.0.aar" />
1806 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-panorama/7.3.0/play-services-panorama-7.3.0.aar" />
1807 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-plus/7.3.0/play-services-plus-7.3.0.aar" />
1808 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-safetynet/7.3.0/play-services-safetynet-7.3.0.aar" />
1809 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-wallet/7.3.0/play-services-wallet-7.3.0.aar" />
1810 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-wearable/7.3.0/play-services-wearable-7.3.0.aar" />
1811 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.1/support-annotations-22.2.1.jar" />
1812 - <option value="$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-v4/22.2.1/support-v4-22.2.1.aar" />
1752 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-ads/7.3.0/play-services-ads-7.3.0.aar" />
1753 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-analytics/7.3.0/play-services-analytics-7.3.0.aar" />
1754 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-appindexing/7.3.0/play-services-appindexing-7.3.0.aar" />
1755 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-appinvite/7.3.0/play-services-appinvite-7.3.0.aar" />
1756 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-appstate/7.3.0/play-services-appstate-7.3.0.aar" />
1757 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-base/7.3.0/play-services-base-7.3.0.aar" />
1758 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-cast/7.3.0/play-services-cast-7.3.0.aar" />
1759 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-drive/7.3.0/play-services-drive-7.3.0.aar" />
1760 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-fitness/7.3.0/play-services-fitness-7.3.0.aar" />
1761 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-games/7.3.0/play-services-games-7.3.0.aar" />
1762 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-gcm/7.3.0/play-services-gcm-7.3.0.aar" />
1763 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-identity/7.3.0/play-services-identity-7.3.0.aar" />
1764 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-location/7.3.0/play-services-location-7.3.0.aar" />
1765 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-maps/7.3.0/play-services-maps-7.3.0.aar" />
1766 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-nearby/7.3.0/play-services-nearby-7.3.0.aar" />
1767 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-panorama/7.3.0/play-services-panorama-7.3.0.aar" />
1768 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-plus/7.3.0/play-services-plus-7.3.0.aar" />
1769 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-safetynet/7.3.0/play-services-safetynet-7.3.0.aar" />
1770 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-wallet/7.3.0/play-services-wallet-7.3.0.aar" />
1771 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/google/m2repository/com/google/android/gms/play-services-wearable/7.3.0/play-services-wearable-7.3.0.aar" />
1772 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/22.2.1/support-annotations-22.2.1.jar" />
1773 + <option value="C:/Users/MicheleStefanelli/Android/sdk/extras/android/m2repository/com/android/support/support-v4/22.2.1/support-v4-22.2.1.aar" />
1813 1774 </list>
1814 1775 </option>
1815 1776 <option name="path" value="$PROJECT_DIR$/app" />
  @@ -1837,9 +1798,6 @@
1837 1798 <component name="IdeDocumentHistory">
1838 1799 <option name="CHANGED_PATHS">
1839 1800 <list>
1840 - <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/HttpClient.java" />
1841 - <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/MapActivity.java" />
1842 - <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/SetPositionLocaleActivity.java" />
1843 1801 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/ManagerActivity.java" />
1844 1802 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/CallService.java" />
1845 1803 <option value="$PROJECT_DIR$/app/src/main/res/layout/local_item.xml" />
  @@ -1849,7 +1807,6 @@
1849 1807 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RecensioneActivity.java" />
1850 1808 <option value="$PROJECT_DIR$/app/src/main/res/layout/toast_layout.xml" />
1851 1809 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/MyLocation.java" />
1852 - <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_recensione.xml" />
1853 1810 <option value="$PROJECT_DIR$/build.gradle" />
1854 1811 <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" />
1855 1812 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MainActivity.java" />
  @@ -1865,8 +1822,6 @@
1865 1822 <option value="$PROJECT_DIR$/app/src/main/res/values-v21/styles.xml" />
1866 1823 <option value="$PROJECT_DIR$/app/src/main/res/values/styles.xml" />
1867 1824 <option value="$PROJECT_DIR$/app/src/main/res/drawable/circle_violet.xml" />
1868 - <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml" />
1869 - <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_register_locale.xml" />
1870 1825 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/AppIntroFragment.java" />
1871 1826 <option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_intro.xml" />
1872 1827 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/IntroActivity.java" />
  @@ -1874,20 +1829,26 @@
1874 1829 <option value="$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml" />
1875 1830 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingsActivity.java" />
1876 1831 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/PrefsManager.java" />
1877 - <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml" />
1878 1832 <option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" />
1879 - <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml" />
1880 - <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java" />
1881 1833 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SetPositionLocaleActivity.java" />
1882 1834 <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_set_position_locale.xml" />
1883 1835 <option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" />
1884 1836 <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_manager.xml" />
1885 1837 <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml" />
1886 - <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java" />
1887 1838 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/HttpClient.java" />
1888 1839 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SelectionActivity.java" />
1840 + <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_recensione.xml" />
1841 + <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml" />
1842 + <option value="$PROJECT_DIR$/app/src/main/res/drawable/button_color_state.xml" />
1843 + <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java" />
1844 + <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_register_locale.xml" />
1889 1845 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java" />
1890 1846 <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java" />
1847 + <option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java" />
1848 + <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml" />
1849 + <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml" />
1850 + <option value="$PROJECT_DIR$/app/build.gradle" />
1851 + <option value="$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml" />
1891 1852 </list>
1892 1853 </option>
1893 1854 </component>
  @@ -1921,215 +1882,265 @@
1921 1882 <ConfirmationsSetting value="0" id="Remove" />
1922 1883 </component>
1923 1884 <component name="ProjectView">
1924 - <navigator currentView="AndroidView" proportions="" version="1">
1885 + <navigator currentView="ProjectPane" proportions="" version="1">
1925 1886 <flattenPackages />
1926 1887 <showMembers />
1927 1888 <showModules />
1928 1889 <showLibraryContents />
1929 1890 <hideEmptyPackages />
1930 1891 <abbreviatePackageNames />
1931 - <autoscrollToSource />
1932 - <autoscrollFromSource ProjectPane="true" />
1892 + <autoscrollToSource AndroidView="true" />
1893 + <autoscrollFromSource AndroidView="true" ProjectPane="true" />
1933 1894 <sortByType />
1934 1895 </navigator>
1935 1896 <panes>
1936 - <pane id="PackagesPane" />
1937 - <pane id="Scratches" />
1938 - <pane id="ProjectPane">
1897 + <pane id="AndroidView">
1939 1898 <subPane>
1940 1899 <PATH>
1941 1900 <PATH_ELEMENT>
1942 1901 <option name="myItemId" value="SmartCharging" />
1943 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
1902 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
1903 + </PATH_ELEMENT>
1904 + <PATH_ELEMENT>
1905 + <option name="myItemId" value="Gradle Scripts" />
1906 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidBuildScriptsGroupNode" />
1944 1907 </PATH_ELEMENT>
1945 1908 </PATH>
1946 1909 <PATH>
1947 1910 <PATH_ELEMENT>
1948 1911 <option name="myItemId" value="SmartCharging" />
1949 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
1912 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
1950 1913 </PATH_ELEMENT>
1951 1914 <PATH_ELEMENT>
1952 - <option name="myItemId" value="SmartCharging" />
1953 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
1915 + <option name="myItemId" value="app" />
1916 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
1917 + </PATH_ELEMENT>
1918 + <PATH_ELEMENT>
1919 + <option name="myItemId" value="res" />
1920 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
1954 1921 </PATH_ELEMENT>
1955 1922 </PATH>
1956 1923 <PATH>
1957 1924 <PATH_ELEMENT>
1958 1925 <option name="myItemId" value="SmartCharging" />
1959 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
1926 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
1960 1927 </PATH_ELEMENT>
1961 1928 <PATH_ELEMENT>
1962 - <option name="myItemId" value="SmartCharging" />
1963 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
1929 + <option name="myItemId" value="app" />
1930 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
1964 1931 </PATH_ELEMENT>
1965 1932 <PATH_ELEMENT>
1966 - <option name="myItemId" value="grafica" />
1967 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
1933 + <option name="myItemId" value="res" />
1934 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
1935 + </PATH_ELEMENT>
1936 + <PATH_ELEMENT>
1937 + <option name="myItemId" value="layout" />
1938 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
1968 1939 </PATH_ELEMENT>
1969 1940 </PATH>
1970 1941 <PATH>
1971 1942 <PATH_ELEMENT>
1972 1943 <option name="myItemId" value="SmartCharging" />
1973 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
1944 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
1945 + </PATH_ELEMENT>
1946 + <PATH_ELEMENT>
1947 + <option name="myItemId" value="app" />
1948 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
1949 + </PATH_ELEMENT>
1950 + <PATH_ELEMENT>
1951 + <option name="myItemId" value="res" />
1952 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
1953 + </PATH_ELEMENT>
1954 + <PATH_ELEMENT>
1955 + <option name="myItemId" value="drawable" />
1956 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
1974 1957 </PATH_ELEMENT>
1958 + </PATH>
1959 + <PATH>
1975 1960 <PATH_ELEMENT>
1976 1961 <option name="myItemId" value="SmartCharging" />
1977 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
1962 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
1978 1963 </PATH_ELEMENT>
1979 1964 <PATH_ELEMENT>
1980 1965 <option name="myItemId" value="app" />
1981 - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
1966 + <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
1982 1967 </PATH_ELEMENT>
1983 1968 </PATH>
1984 1969 </subPane>
1985 1970 </pane>
1971 + <pane id="PackagesPane" />
1986 1972 <pane id="Scope" />
1987 - <pane id="AndroidView">
1973 + <pane id="Scratches" />
1974 + <pane id="ProjectPane">
1988 1975 <subPane>
1989 1976 <PATH>
1990 1977 <PATH_ELEMENT>
1991 1978 <option name="myItemId" value="SmartCharging" />
1992 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
1979 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
1993 1980 </PATH_ELEMENT>
1994 1981 </PATH>
1995 1982 <PATH>
1996 1983 <PATH_ELEMENT>
1997 1984 <option name="myItemId" value="SmartCharging" />
1998 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
1999 - </PATH_ELEMENT>
2000 - <PATH_ELEMENT>
2001 - <option name="myItemId" value="app" />
2002 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
2003 - </PATH_ELEMENT>
2004 - <PATH_ELEMENT>
2005 - <option name="myItemId" value="res" />
2006 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
1985 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2007 1986 </PATH_ELEMENT>
2008 1987 <PATH_ELEMENT>
2009 - <option name="myItemId" value="values" />
2010 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" />
1988 + <option name="myItemId" value="SmartCharging" />
1989 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2011 1990 </PATH_ELEMENT>
2012 1991 </PATH>
2013 1992 <PATH>
2014 1993 <PATH_ELEMENT>
2015 1994 <option name="myItemId" value="SmartCharging" />
2016 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
1995 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2017 1996 </PATH_ELEMENT>
2018 1997 <PATH_ELEMENT>
2019 - <option name="myItemId" value="app" />
2020 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
1998 + <option name="myItemId" value="SmartCharging" />
1999 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2021 2000 </PATH_ELEMENT>
2022 2001 <PATH_ELEMENT>
2023 - <option name="myItemId" value="res" />
2024 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" />
2002 + <option name="myItemId" value="grafica" />
2003 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2025 2004 </PATH_ELEMENT>
2026 2005 </PATH>
2027 2006 <PATH>
2028 2007 <PATH_ELEMENT>
2029 2008 <option name="myItemId" value="SmartCharging" />
2030 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
2009 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2031 2010 </PATH_ELEMENT>
2032 2011 <PATH_ELEMENT>
2033 - <option name="myItemId" value="app" />
2034 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
2012 + <option name="myItemId" value="SmartCharging" />
2013 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2035 2014 </PATH_ELEMENT>
2036 2015 <PATH_ELEMENT>
2037 - <option name="myItemId" value="java" />
2038 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
2016 + <option name="myItemId" value="app" />
2017 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2039 2018 </PATH_ELEMENT>
2040 2019 </PATH>
2041 2020 <PATH>
2042 2021 <PATH_ELEMENT>
2043 2022 <option name="myItemId" value="SmartCharging" />
2044 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
2023 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2024 + </PATH_ELEMENT>
2025 + <PATH_ELEMENT>
2026 + <option name="myItemId" value="SmartCharging" />
2027 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2045 2028 </PATH_ELEMENT>
2046 2029 <PATH_ELEMENT>
2047 2030 <option name="myItemId" value="app" />
2048 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
2031 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2049 2032 </PATH_ELEMENT>
2050 2033 <PATH_ELEMENT>
2051 - <option name="myItemId" value="java" />
2052 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
2034 + <option name="myItemId" value="src" />
2035 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2053 2036 </PATH_ELEMENT>
2054 2037 <PATH_ELEMENT>
2055 - <option name="myItemId" value="smartcharging" />
2056 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
2038 + <option name="myItemId" value="main" />
2039 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2057 2040 </PATH_ELEMENT>
2058 2041 </PATH>
2059 2042 <PATH>
2060 2043 <PATH_ELEMENT>
2061 2044 <option name="myItemId" value="SmartCharging" />
2062 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
2045 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2046 + </PATH_ELEMENT>
2047 + <PATH_ELEMENT>
2048 + <option name="myItemId" value="SmartCharging" />
2049 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2063 2050 </PATH_ELEMENT>
2064 2051 <PATH_ELEMENT>
2065 2052 <option name="myItemId" value="app" />
2066 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
2053 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2067 2054 </PATH_ELEMENT>
2068 2055 <PATH_ELEMENT>
2069 - <option name="myItemId" value="java" />
2070 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
2056 + <option name="myItemId" value="src" />
2057 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2071 2058 </PATH_ELEMENT>
2072 2059 <PATH_ELEMENT>
2073 - <option name="myItemId" value="smartcharging" />
2074 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
2060 + <option name="myItemId" value="main" />
2061 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2075 2062 </PATH_ELEMENT>
2076 2063 <PATH_ELEMENT>
2077 - <option name="myItemId" value="Service" />
2064 + <option name="myItemId" value="res" />
2078 2065 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2079 2066 </PATH_ELEMENT>
2080 2067 </PATH>
2081 2068 <PATH>
2082 2069 <PATH_ELEMENT>
2083 2070 <option name="myItemId" value="SmartCharging" />
2084 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
2071 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2072 + </PATH_ELEMENT>
2073 + <PATH_ELEMENT>
2074 + <option name="myItemId" value="SmartCharging" />
2075 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2085 2076 </PATH_ELEMENT>
2086 2077 <PATH_ELEMENT>
2087 2078 <option name="myItemId" value="app" />
2088 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
2079 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2080 + </PATH_ELEMENT>
2081 + <PATH_ELEMENT>
2082 + <option name="myItemId" value="src" />
2083 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2089 2084 </PATH_ELEMENT>
2090 2085 <PATH_ELEMENT>
2091 - <option name="myItemId" value="java" />
2092 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
2086 + <option name="myItemId" value="main" />
2087 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2093 2088 </PATH_ELEMENT>
2094 2089 <PATH_ELEMENT>
2095 - <option name="myItemId" value="smartcharging" />
2096 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
2090 + <option name="myItemId" value="res" />
2091 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2097 2092 </PATH_ELEMENT>
2098 2093 <PATH_ELEMENT>
2099 - <option name="myItemId" value="Manager" />
2094 + <option name="myItemId" value="layout" />
2100 2095 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2101 2096 </PATH_ELEMENT>
2102 2097 </PATH>
2103 2098 <PATH>
2104 2099 <PATH_ELEMENT>
2105 2100 <option name="myItemId" value="SmartCharging" />
2106 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
2101 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2102 + </PATH_ELEMENT>
2103 + <PATH_ELEMENT>
2104 + <option name="myItemId" value="SmartCharging" />
2105 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2107 2106 </PATH_ELEMENT>
2108 2107 <PATH_ELEMENT>
2109 2108 <option name="myItemId" value="app" />
2110 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
2109 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2111 2110 </PATH_ELEMENT>
2112 2111 <PATH_ELEMENT>
2113 - <option name="myItemId" value="java" />
2114 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" />
2112 + <option name="myItemId" value="src" />
2113 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2114 + </PATH_ELEMENT>
2115 + <PATH_ELEMENT>
2116 + <option name="myItemId" value="main" />
2117 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2115 2118 </PATH_ELEMENT>
2116 2119 <PATH_ELEMENT>
2117 - <option name="myItemId" value="smartcharging" />
2118 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" />
2120 + <option name="myItemId" value="res" />
2121 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2119 2122 </PATH_ELEMENT>
2120 2123 <PATH_ELEMENT>
2121 - <option name="myItemId" value="Controller" />
2124 + <option name="myItemId" value="drawable" />
2122 2125 <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2123 2126 </PATH_ELEMENT>
2124 2127 </PATH>
2125 2128 <PATH>
2126 2129 <PATH_ELEMENT>
2127 2130 <option name="myItemId" value="SmartCharging" />
2128 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" />
2131 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
2132 + </PATH_ELEMENT>
2133 + <PATH_ELEMENT>
2134 + <option name="myItemId" value="SmartCharging" />
2135 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2129 2136 </PATH_ELEMENT>
2130 2137 <PATH_ELEMENT>
2131 2138 <option name="myItemId" value="app" />
2132 - <option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" />
2139 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2140 + </PATH_ELEMENT>
2141 + <PATH_ELEMENT>
2142 + <option name="myItemId" value="src" />
2143 + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
2133 2144 </PATH_ELEMENT>
2134 2145 </PATH>
2135 2146 </subPane>
  @@ -2139,7 +2150,7 @@
2139 2150 <component name="PropertiesComponent">
2140 2151 <property name="recentsLimit" value="5" />
2141 2152 <property name="FullScreen" value="false" />
2142 - <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="42f7c2140418bf19" />
2153 + <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="8a23499d" />
2143 2154 <property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Nexus_5_API_22_x86" />
2144 2155 <property name="android.project.structure.last.selected" value="SDK Location" />
2145 2156 <property name="android.project.structure.proportion" value="0.15" />
  @@ -2195,7 +2206,14 @@
2195 2206 <option name="mySupportsDeletion" value="false" />
2196 2207 <option name="myCanBeAbsent" value="false" />
2197 2208 <option name="myId" value="UPDATED" />
2198 - <PATH vcs="svn" revision="687">C:\Client\SmartCharging\app\src\main\res\values\strings.xml</PATH>
2209 + <PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\res\layout\activity_full_info.xml</PATH>
2210 + <PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\res\values\strings.xml</PATH>
2211 + <PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Manager\MyLocation.java</PATH>
2212 + <PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\ImageManagerActivity.java</PATH>
2213 + <PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\MapActivity.java</PATH>
2214 + <PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\RegisterActivity.java</PATH>
2215 + <PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\FullInfoFragment.java</PATH>
2216 + <PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\RecensioneActivity.java</PATH>
2199 2217 </FILE-GROUP>
2200 2218 <FILE-GROUP>
2201 2219 <option name="myUpdateName" value="Created" />
  @@ -2310,7 +2328,8 @@
2310 2328 <option name="NETWORK_LATENCY" value="none" />
2311 2329 <option name="CLEAR_LOGCAT" value="false" />
2312 2330 <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
2313 - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
2331 + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
2332 + <option name="FORCE_STOP_RUNNING_APP" value="true" />
2314 2333 <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
2315 2334 <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
2316 2335 <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
  @@ -2340,7 +2359,8 @@
2340 2359 <option name="NETWORK_LATENCY" value="none" />
2341 2360 <option name="CLEAR_LOGCAT" value="false" />
2342 2361 <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
2343 - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
2362 + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
2363 + <option name="FORCE_STOP_RUNNING_APP" value="true" />
2344 2364 <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
2345 2365 <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
2346 2366 <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
  @@ -2463,7 +2483,8 @@
2463 2483 <option name="NETWORK_LATENCY" value="none" />
2464 2484 <option name="CLEAR_LOGCAT" value="false" />
2465 2485 <option name="SHOW_LOGCAT_AUTOMATICALLY" value="true" />
2466 - <option name="FILTER_LOGCAT_AUTOMATICALLY" value="true" />
2486 + <option name="SKIP_NOOP_APK_INSTALLATIONS" value="true" />
2487 + <option name="FORCE_STOP_RUNNING_APP" value="true" />
2467 2488 <option name="SELECTED_CLOUD_MATRIX_CONFIGURATION_ID" value="0" />
2468 2489 <option name="SELECTED_CLOUD_MATRIX_PROJECT_ID" value="" />
2469 2490 <option name="SELECTED_CLOUD_DEVICE_CONFIGURATION_ID" value="0" />
  @@ -2613,7 +2634,31 @@
2613 2634 <option name="project" value="LOCAL" />
2614 2635 <updated>1441379438452</updated>
2615 2636 </task>
2616 - <option name="localTasksCounter" value="15" />
2637 + <task id="LOCAL-00015" summary="me">
2638 + <created>1441381616768</created>
2639 + <option name="number" value="00015" />
2640 + <option name="project" value="LOCAL" />
2641 + <updated>1441381616768</updated>
2642 + </task>
2643 + <task id="LOCAL-00016" summary="me">
2644 + <created>1441640176220</created>
2645 + <option name="number" value="00016" />
2646 + <option name="project" value="LOCAL" />
2647 + <updated>1441640176220</updated>
2648 + </task>
2649 + <task id="LOCAL-00017" summary="me">
2650 + <created>1441699169739</created>
2651 + <option name="number" value="00017" />
2652 + <option name="project" value="LOCAL" />
2653 + <updated>1441699169739</updated>
2654 + </task>
2655 + <task id="LOCAL-00018" summary="me">
2656 + <created>1441703592332</created>
2657 + <option name="number" value="00018" />
2658 + <option name="project" value="LOCAL" />
2659 + <updated>1441703592332</updated>
2660 + </task>
2661 + <option name="localTasksCounter" value="19" />
2617 2662 <servers />
2618 2663 </component>
2619 2664 <component name="TodoView">
  @@ -2627,28 +2672,28 @@
2627 2672 </component>
2628 2673 <component name="ToolWindowManager">
2629 2674 <frame x="-8" y="-8" width="1382" height="744" extended-state="6" />
2630 - <editor active="true" />
2675 + <editor active="false" />
2631 2676 <layout>
2632 2677 <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32367972" sideWeight="0.4871407" order="8" side_tool="false" content_ui="tabs" />
2633 2678 <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.45655876" sideWeight="0.37670198" order="13" side_tool="false" content_ui="tabs" />
2634 2679 <window_info id="Build Variants" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.23676248" sideWeight="0.38330495" order="2" side_tool="true" content_ui="tabs" />
2635 2680 <window_info id="Palette&#9;" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
2636 - <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.47359455" sideWeight="0.5030257" order="6" side_tool="true" content_ui="tabs" />
2681 + <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.867121" sideWeight="0.5060514" order="6" side_tool="true" content_ui="tabs" />
2637 2682 <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
2638 2683 <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.07942511" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
2639 - <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39182281" sideWeight="0.4969743" order="-1" side_tool="false" content_ui="tabs" />
2640 - <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
2684 + <window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2197615" sideWeight="0.49394855" order="14" side_tool="false" content_ui="tabs" />
2685 + <window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28517398" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
2641 2686 <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32367972" sideWeight="0.47806355" order="9" side_tool="false" content_ui="tabs" />
2642 - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2197615" sideWeight="0.64220876" order="2" side_tool="false" content_ui="tabs" />
2687 + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.47189096" sideWeight="0.64220876" order="2" side_tool="false" content_ui="tabs" />
2643 2688 <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32197616" sideWeight="0.45385778" order="10" side_tool="false" content_ui="tabs" />
2644 2689 <window_info id="Captures" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
2645 2690 <window_info id="Gradle Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22487223" sideWeight="0.45083207" order="12" side_tool="true" content_ui="tabs" />
2646 2691 <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
2647 - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23676248" sideWeight="0.61669505" order="0" side_tool="false" content_ui="combo" />
2692 + <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26096824" sideWeight="0.61669505" order="0" side_tool="false" content_ui="combo" />
2648 2693 <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3270869" sideWeight="0.49394855" order="1" side_tool="false" content_ui="tabs" />
2649 - <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.018154312" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
2694 + <window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.204236" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
2650 2695 <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26626325" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
2651 - <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="-1" side_tool="true" content_ui="tabs" />
2696 + <window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
2652 2697 <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25642964" sideWeight="0.15332198" order="4" side_tool="true" content_ui="tabs" />
2653 2698 <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39693356" sideWeight="0.49682036" order="3" side_tool="false" content_ui="tabs" />
2654 2699 <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
  @@ -2712,7 +2757,7 @@
2712 2757 <breakpoints>
2713 2758 <line-breakpoint type="java-line">
2714 2759 <url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/LoginActivity.java</url>
2715 - <line>264</line>
2760 + <line>263</line>
2716 2761 <properties />
2717 2762 <option name="timeStamp" value="33" />
2718 2763 </line-breakpoint>
  @@ -2742,62 +2787,40 @@
2742 2787 </line-breakpoint>
2743 2788 <line-breakpoint enabled="true" type="java-line">
2744 2789 <url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java</url>
2745 - <line>562</line>
2790 + <line>616</line>
2746 2791 <properties />
2747 2792 <option name="timeStamp" value="60" />
2748 2793 </line-breakpoint>
2749 2794 <line-breakpoint enabled="true" type="java-line">
2750 2795 <url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java</url>
2751 - <line>560</line>
2796 + <line>615</line>
2752 2797 <properties />
2753 2798 <option name="timeStamp" value="61" />
2754 2799 </line-breakpoint>
2755 2800 <line-breakpoint enabled="true" type="java-line">
2756 2801 <url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java</url>
2757 - <line>34</line>
2802 + <line>42</line>
2758 2803 <properties />
2759 2804 <option name="timeStamp" value="63" />
2760 2805 </line-breakpoint>
2761 2806 <line-breakpoint enabled="true" type="java-line">
2762 2807 <url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java</url>
2763 - <line>35</line>
2808 + <line>43</line>
2764 2809 <properties />
2765 2810 <option name="timeStamp" value="64" />
2766 2811 </line-breakpoint>
2767 2812 <line-breakpoint enabled="true" type="java-line">
2768 2813 <url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java</url>
2769 - <line>36</line>
2770 - <properties />
2771 - <option name="timeStamp" value="66" />
2772 - </line-breakpoint>
2773 - <line-breakpoint enabled="true" type="java-line">
2774 - <url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java</url>
2775 - <line>38</line>
2814 + <line>44</line>
2776 2815 <properties />
2777 2816 <option name="timeStamp" value="68" />
2778 2817 </line-breakpoint>
2779 2818 <line-breakpoint enabled="true" type="java-line">
2780 2819 <url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java</url>
2781 - <line>40</line>
2782 - <properties />
2783 - <option name="timeStamp" value="69" />
2784 - </line-breakpoint>
2785 - <line-breakpoint enabled="true" type="java-line">
2786 - <url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java</url>
2787 - <line>41</line>
2820 + <line>77</line>
2788 2821 <properties />
2789 2822 <option name="timeStamp" value="70" />
2790 2823 </line-breakpoint>
2791 - <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
2792 - <url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java</url>
2793 - <line>37</line>
2794 - <option name="timeStamp" value="65" />
2795 - </line-breakpoint>
2796 - <line-breakpoint enabled="true" type="com.jetbrains.cidr.execution.debugger.OCBreakpointType">
2797 - <url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java</url>
2798 - <line>39</line>
2799 - <option name="timeStamp" value="67" />
2800 - </line-breakpoint>
2801 2824 </breakpoints>
2802 2825 <breakpoints-dialog>
2803 2826 <breakpoints-dialog />
  @@ -2812,7 +2835,7 @@
2812 2835 <watches-manager />
2813 2836 </component>
2814 2837 <component name="editorHistoryManager">
2815 - <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ration.xml">
2838 + <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/button_text_state.xml">
2816 2839 <provider selected="true" editor-type-id="text-editor">
2817 2840 <state vertical-scroll-proportion="0.0">
2818 2841 <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
  @@ -2820,302 +2843,281 @@
2820 2843 </state>
2821 2844 </provider>
2822 2845 </entry>
2823 - <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/base.png">
2824 - <provider selected="true" editor-type-id="images">
2825 - <state />
2846 + <entry file="file://$PROJECT_DIR$/app/build.gradle">
2847 + <provider selected="true" editor-type-id="text-editor">
2848 + <state vertical-scroll-proportion="0.0">
2849 + <caret line="36" column="54" selection-start-line="36" selection-start-column="54" selection-end-line="37" selection-end-column="54" />
2850 + <folding />
2851 + </state>
2826 2852 </provider>
2827 2853 </entry>
2828 - <entry file="file://$PROJECT_DIR$/local.properties">
2854 + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/dimens.xml">
2829 2855 <provider selected="true" editor-type-id="text-editor">
2830 2856 <state vertical-scroll-proportion="0.0">
2831 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
2832 - <folding />
2857 + <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
2833 2858 </state>
2834 2859 </provider>
2835 2860 </entry>
2836 - <entry file="file://$PROJECT_DIR$/build.gradle">
2861 + <entry file="file://$PROJECT_DIR$/app/app.iml">
2837 2862 <provider selected="true" editor-type-id="text-editor">
2838 - <state vertical-scroll-proportion="-4.148148">
2839 - <caret line="7" column="55" selection-start-line="7" selection-start-column="55" selection-end-line="7" selection-end-column="55" />
2840 - <folding />
2863 + <state vertical-scroll-proportion="-1.0304115">
2864 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
2841 2865 </state>
2842 2866 </provider>
2843 2867 </entry>
2844 - <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png">
2845 - <provider selected="true" editor-type-id="images">
2846 - <state />
2868 + <entry file="android-dummy://C:\Client\SmartCharging//Theme Editor">
2869 + <provider selected="true" editor-type-id="themeEditor">
2870 + <state theme-name="@style/AppTheme" module-name="app" proportion="0.5520317" />
2847 2871 </provider>
2848 2872 </entry>
2849 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml">
2873 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_full_info.xml">
2850 2874 <provider editor-type-id="android-designer">
2851 2875 <state />
2852 2876 </provider>
2853 2877 <provider selected="true" editor-type-id="text-editor">
2854 - <state vertical-scroll-proportion="-7.0">
2855 - <caret line="24" column="56" selection-start-line="24" selection-start-column="56" selection-end-line="24" selection-end-column="56" />
2856 - <folding>
2857 - <element signature="e#851#869#0" expanded="true" />
2858 - <element signature="e#909#927#0" expanded="true" />
2859 - <element signature="e#966#984#0" expanded="true" />
2860 - </folding>
2878 + <state vertical-scroll-proportion="-19.862068">
2879 + <caret line="36" column="47" selection-start-line="36" selection-start-column="47" selection-end-line="36" selection-end-column="47" />
2861 2880 </state>
2862 2881 </provider>
2863 2882 </entry>
2864 - <entry file="file://$PROJECT_DIR$/gradle.properties">
2883 + <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/circle_violet.xml">
2865 2884 <provider selected="true" editor-type-id="text-editor">
2866 2885 <state vertical-scroll-proportion="0.0">
2867 - <caret line="16" column="95" selection-start-line="16" selection-start-column="95" selection-end-line="16" selection-end-column="95" />
2886 + <caret line="5" column="35" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" />
2868 2887 </state>
2869 2888 </provider>
2870 2889 </entry>
2871 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/View/RoundedImageView.java">
2890 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/commento_layout.xml">
2891 + <provider editor-type-id="android-designer">
2892 + <state />
2893 + </provider>
2872 2894 <provider selected="true" editor-type-id="text-editor">
2873 - <state vertical-scroll-proportion="0.0">
2874 - <caret line="64" column="43" selection-start-line="64" selection-start-column="43" selection-end-line="64" selection-end-column="43" />
2875 - <folding />
2895 + <state vertical-scroll-proportion="0.8754717">
2896 + <caret line="29" column="48" selection-start-line="29" selection-start-column="48" selection-end-line="29" selection-end-column="48" />
2876 2897 </state>
2877 2898 </provider>
2878 2899 </entry>
2879 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_demo.xml">
2900 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_intro.xml">
2880 2901 <provider editor-type-id="android-designer">
2881 2902 <state />
2882 2903 </provider>
2883 2904 <provider selected="true" editor-type-id="text-editor">
2884 - <state vertical-scroll-proportion="0.03018868">
2885 - <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
2886 - <folding />
2905 + <state vertical-scroll-proportion="-8.103448">
2906 + <caret line="25" column="32" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
2887 2907 </state>
2888 2908 </provider>
2889 2909 </entry>
2890 - <entry file="file://$PROJECT_DIR$/app/src/main/res/values/dimens.xml">
2910 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/AppIntroFragment.java">
2891 2911 <provider selected="true" editor-type-id="text-editor">
2892 - <state vertical-scroll-proportion="0.0">
2893 - <caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" />
2894 - <folding />
2912 + <state vertical-scroll-proportion="0.33142856">
2913 + <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
2895 2914 </state>
2896 2915 </provider>
2897 2916 </entry>
2898 - <entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/widget/LinearLayout.java">
2917 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingsActivity.java">
2899 2918 <provider selected="true" editor-type-id="text-editor">
2900 - <state vertical-scroll-proportion="0.33273703">
2901 - <caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" />
2902 - <folding />
2919 + <state vertical-scroll-proportion="0.7146402">
2920 + <caret line="43" column="11" selection-start-line="43" selection-start-column="11" selection-end-line="43" selection-end-column="11" />
2903 2921 </state>
2904 2922 </provider>
2905 2923 </entry>
2906 - <entry file="file://$PROJECT_DIR$/app/app.iml">
2924 + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml">
2907 2925 <provider selected="true" editor-type-id="text-editor">
2908 - <state vertical-scroll-proportion="-1.0304115">
2909 - <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
2910 - <folding />
2926 + <state vertical-scroll-proportion="0.0">
2927 + <caret line="18" column="47" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
2911 2928 </state>
2912 2929 </provider>
2913 2930 </entry>
2914 - <entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/widget/RelativeLayout.java">
2931 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/PrefsManager.java">
2915 2932 <provider selected="true" editor-type-id="text-editor">
2916 - <state vertical-scroll-proportion="0.33333334">
2917 - <caret line="1734" column="0" selection-start-line="1734" selection-start-column="0" selection-end-line="1734" selection-end-column="0" />
2933 + <state vertical-scroll-proportion="0.0">
2934 + <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
2918 2935 <folding />
2919 2936 </state>
2920 2937 </provider>
2921 2938 </entry>
2922 - <entry file="android-dummy://C:\Client\SmartCharging//Theme Editor">
2923 - <provider selected="true" editor-type-id="themeEditor">
2924 - <state theme-name="@style/AppTheme" module-name="app" proportion="0.5520317" />
2939 + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
2940 + <provider selected="true" editor-type-id="text-editor">
2941 + <state vertical-scroll-proportion="1.8214285">
2942 + <caret line="107" column="67" selection-start-line="107" selection-start-column="67" selection-end-line="107" selection-end-column="67" />
2943 + </state>
2925 2944 </provider>
2926 2945 </entry>
2927 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_full_info.xml">
2946 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SetPositionLocaleActivity.java">
2947 + <provider selected="true" editor-type-id="text-editor">
2948 + <state vertical-scroll-proportion="0.0">
2949 + <caret line="59" column="42" selection-start-line="59" selection-start-column="42" selection-end-line="59" selection-end-column="42" />
2950 + </state>
2951 + </provider>
2952 + </entry>
2953 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_set_position_locale.xml">
2928 2954 <provider editor-type-id="android-designer">
2929 2955 <state />
2930 2956 </provider>
2931 2957 <provider selected="true" editor-type-id="text-editor">
2932 - <state vertical-scroll-proportion="-19.862068">
2933 - <caret line="36" column="47" selection-start-line="36" selection-start-column="47" selection-end-line="36" selection-end-column="47" />
2934 - <folding />
2958 + <state vertical-scroll-proportion="3.4482758">
2959 + <caret line="49" column="19" selection-start-line="49" selection-start-column="19" selection-end-line="49" selection-end-column="19" />
2935 2960 </state>
2936 2961 </provider>
2937 2962 </entry>
2938 - <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/circle_violet.xml">
2963 + <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
2939 2964 <provider selected="true" editor-type-id="text-editor">
2940 2965 <state vertical-scroll-proportion="0.0">
2941 - <caret line="5" column="35" selection-start-line="5" selection-start-column="35" selection-end-line="5" selection-end-column="35" />
2966 + <caret line="116" column="45" selection-start-line="116" selection-start-column="45" selection-end-line="116" selection-end-column="45" />
2942 2967 <folding />
2943 2968 </state>
2944 2969 </provider>
2945 2970 </entry>
2946 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/commento_layout.xml">
2947 - <provider editor-type-id="android-designer">
2948 - <state />
2949 - </provider>
2971 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingSelectionActivity.java">
2950 2972 <provider selected="true" editor-type-id="text-editor">
2951 - <state vertical-scroll-proportion="0.8754717">
2952 - <caret line="29" column="48" selection-start-line="29" selection-start-column="48" selection-end-line="29" selection-end-column="48" />
2953 - <folding />
2973 + <state vertical-scroll-proportion="0.0">
2974 + <caret line="60" column="45" selection-start-line="60" selection-start-column="45" selection-end-line="60" selection-end-column="45" />
2954 2975 </state>
2955 2976 </provider>
2956 2977 </entry>
2957 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml">
2978 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_manager.xml">
2958 2979 <provider editor-type-id="android-designer">
2959 2980 <state />
2960 2981 </provider>
2961 2982 <provider selected="true" editor-type-id="text-editor">
2962 - <state vertical-scroll-proportion="-0.33207548">
2963 - <caret line="13" column="36" selection-start-line="13" selection-start-column="36" selection-end-line="13" selection-end-column="36" />
2964 - <folding>
2965 - <element signature="e#1034#1053#0" expanded="false" />
2966 - </folding>
2983 + <state vertical-scroll-proportion="-0.0">
2984 + <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
2967 2985 </state>
2968 2986 </provider>
2969 2987 </entry>
2970 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_intro.xml">
2971 - <provider editor-type-id="android-designer">
2972 - <state />
2973 - </provider>
2988 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/CallService.java">
2974 2989 <provider selected="true" editor-type-id="text-editor">
2975 - <state vertical-scroll-proportion="-8.103448">
2976 - <caret line="25" column="32" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" />
2977 - <folding />
2990 + <state vertical-scroll-proportion="-0.1449016">
2991 + <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
2978 2992 </state>
2979 2993 </provider>
2980 2994 </entry>
2981 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/AppIntroFragment.java">
2995 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/HttpClient.java">
2982 2996 <provider selected="true" editor-type-id="text-editor">
2983 - <state vertical-scroll-proportion="0.33142856">
2984 - <caret line="25" column="13" selection-start-line="25" selection-start-column="13" selection-end-line="25" selection-end-column="13" />
2985 - <folding>
2986 - <element signature="imports" expanded="false" />
2987 - </folding>
2997 + <state vertical-scroll-proportion="1.0446736">
2998 + <caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
2988 2999 </state>
2989 3000 </provider>
2990 3001 </entry>
2991 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/IntroActivity.java">
3002 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SelectionActivity.java">
2992 3003 <provider selected="true" editor-type-id="text-editor">
2993 3004 <state vertical-scroll-proportion="0.0">
2994 - <caret line="16" column="46" selection-start-line="16" selection-start-column="46" selection-end-line="16" selection-end-column="46" />
3005 + <caret line="118" column="103" selection-start-line="118" selection-start-column="103" selection-end-line="118" selection-end-column="103" />
2995 3006 <folding>
2996 3007 <element signature="imports" expanded="false" />
2997 - <element signature="e#428#466#0" expanded="false" />
2998 - <element signature="e#728#766#0" expanded="false" />
2999 3008 </folding>
3000 3009 </state>
3001 3010 </provider>
3002 3011 </entry>
3003 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_register_locale.xml">
3004 - <provider editor-type-id="android-designer">
3005 - <state />
3012 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ImageManagerActivity.java">
3013 + <provider selected="true" editor-type-id="text-editor">
3014 + <state vertical-scroll-proportion="0.0">
3015 + <caret line="47" column="13" selection-start-line="47" selection-start-column="13" selection-end-line="47" selection-end-column="13" />
3016 + </state>
3006 3017 </provider>
3018 + </entry>
3019 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RecensioneActivity.java">
3007 3020 <provider selected="true" editor-type-id="text-editor">
3008 - <state vertical-scroll-proportion="-9.931034">
3009 - <caret line="138" column="50" selection-start-line="138" selection-start-column="50" selection-end-line="138" selection-end-column="50" />
3010 - <folding />
3021 + <state vertical-scroll-proportion="0.0">
3022 + <caret line="173" column="23" selection-start-line="173" selection-start-column="23" selection-end-line="173" selection-end-column="23" />
3011 3023 </state>
3012 3024 </provider>
3013 3025 </entry>
3014 - <entry file="file://$PROJECT_DIR$/app/src/main/res/values-v21/styles.xml">
3026 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/LoginActivity.java">
3015 3027 <provider selected="true" editor-type-id="text-editor">
3016 - <state vertical-scroll-proportion="-8.222222">
3017 - <caret line="14" column="57" selection-start-line="14" selection-start-column="46" selection-end-line="14" selection-end-column="57" />
3028 + <state vertical-scroll-proportion="0.0">
3029 + <caret line="257" column="28" selection-start-line="257" selection-start-column="28" selection-end-line="257" selection-end-column="28" />
3018 3030 <folding />
3019 3031 </state>
3020 3032 </provider>
3021 3033 </entry>
3022 - <entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
3034 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/View/RoundedImageView.java">
3023 3035 <provider selected="true" editor-type-id="text-editor">
3024 - <state vertical-scroll-proportion="-16.592592">
3025 - <caret line="28" column="0" selection-start-line="28" selection-start-column="0" selection-end-line="28" selection-end-column="0" />
3026 - <folding />
3036 + <state vertical-scroll-proportion="0.0">
3037 + <caret line="20" column="23" selection-start-line="20" selection-start-column="13" selection-end-line="20" selection-end-column="29" />
3027 3038 </state>
3028 3039 </provider>
3029 3040 </entry>
3030 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/LoginActivity.java">
3041 + <entry file="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.makeramen/roundedimageview/2.2.0/jars/classes.jar!/com/makeramen/roundedimageview/RoundedImageView.class">
3031 3042 <provider selected="true" editor-type-id="text-editor">
3032 - <state vertical-scroll-proportion="-4.296296">
3033 - <caret line="257" column="28" selection-start-line="257" selection-start-column="28" selection-end-line="257" selection-end-column="28" />
3034 - <folding />
3043 + <state vertical-scroll-proportion="-3.5555556">
3044 + <caret line="27" column="21" selection-start-line="27" selection-start-column="21" selection-end-line="27" selection-end-column="21" />
3035 3045 </state>
3036 3046 </provider>
3037 3047 </entry>
3038 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SplashScreen.java">
3048 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/IntroActivity.java">
3039 3049 <provider selected="true" editor-type-id="text-editor">
3040 3050 <state vertical-scroll-proportion="0.0">
3041 - <caret line="69" column="33" selection-start-line="69" selection-start-column="0" selection-end-line="70" selection-end-column="0" />
3042 - <folding />
3051 + <caret line="10" column="0" selection-start-line="10" selection-start-column="0" selection-end-line="10" selection-end-column="0" />
3043 3052 </state>
3044 3053 </provider>
3045 3054 </entry>
3046 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingsActivity.java">
3055 + <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/spinner_back.xml">
3047 3056 <provider selected="true" editor-type-id="text-editor">
3048 - <state vertical-scroll-proportion="0.7146402">
3049 - <caret line="43" column="11" selection-start-line="43" selection-start-column="11" selection-end-line="43" selection-end-column="11" />
3050 - <folding>
3051 - <element signature="e#1008#1031#0" expanded="false" />
3052 - <element signature="e#1457#1603#0" expanded="false" />
3053 - <element signature="e#1602#1603#0" expanded="false" />
3054 - </folding>
3057 + <state vertical-scroll-proportion="0.09726444">
3058 + <caret line="2" column="8" selection-start-line="2" selection-start-column="8" selection-end-line="2" selection-end-column="8" />
3059 + <folding />
3055 3060 </state>
3056 3061 </provider>
3057 3062 </entry>
3058 - <entry file="file://$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml">
3063 + <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/button_text_state.xml">
3059 3064 <provider selected="true" editor-type-id="text-editor">
3060 3065 <state vertical-scroll-proportion="0.0">
3061 - <caret line="18" column="47" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" />
3066 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
3062 3067 <folding />
3063 3068 </state>
3064 3069 </provider>
3065 3070 </entry>
3066 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/PrefsManager.java">
3071 + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml">
3067 3072 <provider selected="true" editor-type-id="text-editor">
3068 3073 <state vertical-scroll-proportion="0.0">
3069 - <caret line="15" column="13" selection-start-line="15" selection-start-column="13" selection-end-line="15" selection-end-column="13" />
3074 + <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
3070 3075 <folding />
3071 3076 </state>
3072 3077 </provider>
3073 3078 </entry>
3074 - <entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/net/Uri.java">
3079 + <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/button_color_state.xml">
3075 3080 <provider selected="true" editor-type-id="text-editor">
3076 3081 <state vertical-scroll-proportion="0.0">
3077 - <caret line="427" column="35" selection-start-line="427" selection-start-column="15" selection-end-line="427" selection-end-column="35" />
3078 - <folding>
3079 - <element signature="e#15029#15030#0" expanded="false" />
3080 - <element signature="e#15076#15077#0" expanded="false" />
3081 - </folding>
3082 + <caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" />
3083 + <folding />
3082 3084 </state>
3083 3085 </provider>
3084 3086 </entry>
3085 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml">
3086 - <provider editor-type-id="android-designer">
3087 - <state />
3088 - </provider>
3087 + <entry file="file://$PROJECT_DIR$/app/src/main/res/values-v21/styles.xml">
3089 3088 <provider selected="true" editor-type-id="text-editor">
3090 - <state vertical-scroll-proportion="-9.931034">
3091 - <caret line="140" column="55" selection-start-line="140" selection-start-column="55" selection-end-line="140" selection-end-column="55" />
3089 + <state vertical-scroll-proportion="0.21192053">
3090 + <caret line="4" column="61" selection-start-line="4" selection-start-column="61" selection-end-line="4" selection-end-column="61" />
3092 3091 <folding />
3093 3092 </state>
3094 3093 </provider>
3095 3094 </entry>
3096 - <entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml">
3095 + <entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml">
3097 3096 <provider selected="true" editor-type-id="text-editor">
3098 - <state vertical-scroll-proportion="1.8214285">
3099 - <caret line="107" column="67" selection-start-line="107" selection-start-column="67" selection-end-line="107" selection-end-column="67" />
3097 + <state vertical-scroll-proportion="0.0">
3098 + <caret line="24" column="54" selection-start-line="24" selection-start-column="49" selection-end-line="24" selection-end-column="67" />
3100 3099 <folding />
3101 3100 </state>
3102 3101 </provider>
3103 3102 </entry>
3104 - <entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/view/View.java">
3103 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_recensione.xml">
3104 + <provider editor-type-id="android-designer">
3105 + <state />
3106 + </provider>
3105 3107 <provider selected="true" editor-type-id="text-editor">
3106 - <state vertical-scroll-proportion="0.33273703">
3107 - <caret line="6691" column="16" selection-start-line="6691" selection-start-column="16" selection-end-line="6691" selection-end-column="16" />
3108 + <state vertical-scroll-proportion="29.793104">
3109 + <caret line="27" column="49" selection-start-line="27" selection-start-column="49" selection-end-line="27" selection-end-column="49" />
3108 3110 <folding />
3109 3111 </state>
3110 3112 </provider>
3111 3113 </entry>
3112 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml">
3114 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml">
3113 3115 <provider editor-type-id="android-designer">
3114 3116 <state />
3115 3117 </provider>
3116 3118 <provider selected="true" editor-type-id="text-editor">
3117 - <state vertical-scroll-proportion="-2.7586207">
3118 - <caret line="5" column="0" selection-start-line="5" selection-start-column="0" selection-end-line="5" selection-end-column="0" />
3119 + <state vertical-scroll-proportion="-7.724138">
3120 + <caret line="94" column="57" selection-start-line="94" selection-start-column="57" selection-end-line="94" selection-end-column="57" />
3119 3121 <folding />
3120 3122 </state>
3121 3123 </provider>
  @@ -3123,212 +3125,166 @@
3123 3125 <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java">
3124 3126 <provider selected="true" editor-type-id="text-editor">
3125 3127 <state vertical-scroll-proportion="0.0">
3126 - <caret line="637" column="13" selection-start-line="637" selection-start-column="13" selection-end-line="637" selection-end-column="13" />
3128 + <caret line="946" column="30" selection-start-line="946" selection-start-column="30" selection-end-line="946" selection-end-column="30" />
3127 3129 <folding>
3128 - <element signature="e#10255#10800#0" expanded="true" />
3129 - <element signature="e#10799#10800#0" expanded="true" />
3130 - <element signature="e#10918#11205#0" expanded="true" />
3131 - <element signature="e#11204#11205#0" expanded="true" />
3132 - <element signature="e#11329#11698#0" expanded="true" />
3133 - <element signature="e#11697#11698#0" expanded="true" />
3134 - <element signature="e#14095#14536#0" expanded="true" />
3135 - <element signature="e#14535#14536#0" expanded="true" />
3136 - <element signature="e#16710#20026#0" expanded="true" />
3137 - <element signature="e#17313#17502#0" expanded="true" />
3138 - <element signature="e#17501#17502#0" expanded="true" />
3139 - <element signature="e#18625#19744#0" expanded="true" />
3140 - <element signature="e#18993#19011#0" expanded="true" />
3141 - <element signature="e#19064#19099#0" expanded="true" />
3142 - <element signature="e#19342#19628#0" expanded="true" />
3143 - <element signature="e#19627#19628#0" expanded="true" />
3144 - <element signature="e#19743#19744#0" expanded="true" />
3145 - <element signature="e#20025#20026#0" expanded="true" />
3146 - <element signature="e#20500#23110#0" expanded="true" />
3147 - <element signature="e#23109#23110#0" expanded="true" />
3148 - <element signature="e#23172#24981#0" expanded="true" />
3149 - <element signature="e#24980#24981#0" expanded="true" />
3150 - <element signature="e#25114#25329#0" expanded="true" />
3151 - <element signature="e#27212#27229#0" expanded="true" />
3152 - <element signature="method#run#0;class#AddMarker#0;class#MapActivity#0" expanded="false" />
3130 + <element signature="e#3011#3032#0" expanded="false" />
3131 + <element signature="e#3097#3118#0" expanded="false" />
3132 + <element signature="e#3201#3222#0" expanded="false" />
3133 + <element signature="e#5533#5558#0" expanded="false" />
3134 + <element signature="e#20300#20318#0" expanded="false" />
3135 + <element signature="e#20371#20406#0" expanded="false" />
3136 + <element signature="e#25323#25360#0" expanded="false" />
3137 + <element signature="e#33044#33081#0" expanded="false" />
3138 + <element signature="e#36352#36380#0" expanded="false" />
3139 + <element signature="e#36485#36514#0" expanded="false" />
3140 + <element signature="e#36692#36721#0" expanded="false" />
3141 + <element signature="e#37797#37825#0" expanded="false" />
3142 + <element signature="e#37954#37983#0" expanded="false" />
3143 + <element signature="e#38196#38225#0" expanded="false" />
3144 + <element signature="e#38826#43656#0" expanded="false" />
3145 + <element signature="e#41119#41573#0" expanded="false" />
3146 + <element signature="e#41572#41573#0" expanded="false" />
3147 + <element signature="e#41651#42123#0" expanded="false" />
3148 + <element signature="e#42122#42123#0" expanded="false" />
3149 + <element signature="e#43655#43656#0" expanded="false" />
3150 + <element signature="e#45692#45709#0" expanded="false" />
3151 + <element signature="e#47009#47037#0" expanded="false" />
3153 3152 </folding>
3154 3153 </state>
3155 3154 </provider>
3156 3155 </entry>
3157 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SetPositionLocaleActivity.java">
3156 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/FullInfoFragment.java">
3158 3157 <provider selected="true" editor-type-id="text-editor">
3159 3158 <state vertical-scroll-proportion="0.0">
3160 - <caret line="59" column="42" selection-start-line="59" selection-start-column="42" selection-end-line="59" selection-end-column="42" />
3159 + <caret line="132" column="44" selection-start-line="132" selection-start-column="44" selection-end-line="132" selection-end-column="73" />
3161 3160 <folding>
3162 - <element signature="imports" expanded="true" />
3161 + <element signature="e#3121#4841#0" expanded="false" />
3162 + <element signature="e#4840#4841#0" expanded="false" />
3163 3163 </folding>
3164 3164 </state>
3165 3165 </provider>
3166 3166 </entry>
3167 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_set_position_locale.xml">
3167 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_register_locale.xml">
3168 3168 <provider editor-type-id="android-designer">
3169 3169 <state />
3170 3170 </provider>
3171 3171 <provider selected="true" editor-type-id="text-editor">
3172 - <state vertical-scroll-proportion="3.4482758">
3173 - <caret line="49" column="19" selection-start-line="49" selection-start-column="19" selection-end-line="49" selection-end-column="19" />
3172 + <state vertical-scroll-proportion="-4.965517">
3173 + <caret line="141" column="42" selection-start-line="141" selection-start-column="42" selection-end-line="141" selection-end-column="42" />
3174 3174 <folding />
3175 3175 </state>
3176 3176 </provider>
3177 3177 </entry>
3178 - <entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml">
3178 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java">
3179 3179 <provider selected="true" editor-type-id="text-editor">
3180 3180 <state vertical-scroll-proportion="0.0">
3181 - <caret line="116" column="45" selection-start-line="116" selection-start-column="45" selection-end-line="116" selection-end-column="45" />
3182 - <folding>
3183 - <element signature="e#6417#6455#0" expanded="true" />
3184 - </folding>
3181 + <caret line="310" column="0" selection-start-line="310" selection-start-column="0" selection-end-line="310" selection-end-column="0" />
3182 + <folding />
3185 3183 </state>
3186 3184 </provider>
3187 3185 </entry>
3188 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_recensione.xml">
3189 - <provider editor-type-id="android-designer">
3190 - <state />
3191 - </provider>
3186 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java">
3192 3187 <provider selected="true" editor-type-id="text-editor">
3193 - <state vertical-scroll-proportion="0.5176471">
3194 - <caret line="11" column="41" selection-start-line="6" selection-start-column="4" selection-end-line="11" selection-end-column="41" />
3188 + <state vertical-scroll-proportion="0.0">
3189 + <caret line="514" column="24" selection-start-line="514" selection-start-column="24" selection-end-line="516" selection-end-column="47" />
3195 3190 <folding />
3196 3191 </state>
3197 3192 </provider>
3198 3193 </entry>
3199 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RecensioneActivity.java">
3194 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java">
3200 3195 <provider selected="true" editor-type-id="text-editor">
3201 3196 <state vertical-scroll-proportion="0.0">
3202 - <caret line="56" column="42" selection-start-line="56" selection-start-column="42" selection-end-line="56" selection-end-column="42" />
3203 - <folding />
3197 + <caret line="293" column="33" selection-start-line="293" selection-start-column="33" selection-end-line="293" selection-end-column="33" />
3198 + <folding>
3199 + <element signature="e#2461#2483#0" expanded="true" />
3200 + <element signature="e#7565#7589#0" expanded="true" />
3201 + <element signature="e#8972#9004#0" expanded="true" />
3202 + <element signature="e#10451#12566#0" expanded="true" />
3203 + <element signature="e#11597#11849#0" expanded="true" />
3204 + <element signature="e#11759#11783#0" expanded="true" />
3205 + <element signature="e#12063#12101#0" expanded="true" />
3206 + <element signature="e#12565#12566#0" expanded="true" />
3207 + <element signature="e#12897#12927#0" expanded="true" />
3208 + </folding>
3204 3209 </state>
3205 3210 </provider>
3206 3211 </entry>
3207 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingSelectionActivity.java">
3212 + <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SplashScreen.java">
3208 3213 <provider selected="true" editor-type-id="text-editor">
3209 3214 <state vertical-scroll-proportion="0.0">
3210 - <caret line="60" column="45" selection-start-line="60" selection-start-column="45" selection-end-line="60" selection-end-column="45" />
3215 + <caret line="29" column="71" selection-start-line="29" selection-start-column="71" selection-end-line="29" selection-end-column="71" />
3211 3216 <folding />
3212 3217 </state>
3213 3218 </provider>
3214 3219 </entry>
3215 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml">
3216 - <provider editor-type-id="android-designer">
3220 + <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/logo.png">
3221 + <provider selected="true" editor-type-id="images">
3217 3222 <state />
3218 3223 </provider>
3219 - <provider selected="true" editor-type-id="text-editor">
3220 - <state vertical-scroll-proportion="-12.75862">
3221 - <caret line="180" column="27" selection-start-line="0" selection-start-column="0" selection-end-line="184" selection-end-column="0" />
3222 - <folding>
3223 - <element signature="e#926#945#0" expanded="true" />
3224 - <element signature="e#1844#1865#0" expanded="true" />
3225 - <element signature="e#2658#2680#0" expanded="true" />
3226 - <element signature="e#3451#3466#0" expanded="true" />
3227 - <element signature="e#4253#4271#0" expanded="true" />
3228 - <element signature="e#5005#5033#0" expanded="true" />
3229 - <element signature="e#5783#5807#0" expanded="true" />
3230 - <element signature="e#6201#6230#0" expanded="true" />
3231 - <element signature="e#6462#6487#0" expanded="true" />
3232 - <element signature="e#6598#6616#0" expanded="true" />
3233 - <element signature="e#7013#7031#0" expanded="true" />
3234 - <element signature="e#7663#7681#0" expanded="true" />
3235 - <element signature="e#8173#8201#0" expanded="true" />
3236 - </folding>
3237 - </state>
3224 + </entry>
3225 + <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/screen1.png">
3226 + <provider selected="true" editor-type-id="images">
3227 + <state />
3238 3228 </provider>
3239 3229 </entry>
3240 - <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_manager.xml">
3230 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml">
3241 3231 <provider editor-type-id="android-designer">
3242 3232 <state />
3243 3233 </provider>
3244 3234 <provider selected="true" editor-type-id="text-editor">
3245 - <state vertical-scroll-proportion="-0.0">
3246 - <caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" />
3247 - <folding>
3248 - <element signature="e#912#931#0" expanded="true" />
3249 - <element signature="e#1436#1457#0" expanded="true" />
3250 - <element signature="e#2138#2160#0" expanded="true" />
3251 - <element signature="e#2818#2833#0" expanded="true" />
3252 - <element signature="e#3508#3526#0" expanded="true" />
3253 - <element signature="e#4156#4184#0" expanded="true" />
3254 - <element signature="e#4831#4855#0" expanded="true" />
3255 - <element signature="e#5194#5223#0" expanded="true" />
3256 - <element signature="e#5415#5430#0" expanded="true" />
3257 - <element signature="e#5979#6007#0" expanded="true" />
3258 - <element signature="e#6384#6411#0" expanded="true" />
3259 - <element signature="e#6789#6820#0" expanded="true" />
3260 - </folding>
3261 - </state>
3262 - </provider>
3263 - </entry>
3264 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/FullInfoFragment.java">
3265 - <provider selected="true" editor-type-id="text-editor">
3266 - <state vertical-scroll-proportion="-2.5053382">
3267 - <caret line="117" column="61" selection-start-line="117" selection-start-column="61" selection-end-line="117" selection-end-column="61" />
3235 + <state vertical-scroll-proportion="-3.862069">
3236 + <caret line="20" column="29" selection-start-line="20" selection-start-column="29" selection-end-line="20" selection-end-column="29" />
3268 3237 <folding />
3269 3238 </state>
3270 3239 </provider>
3271 3240 </entry>
3272 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/CallService.java">
3241 + <entry file="file://$PROJECT_DIR$/app/build.gradle">
3273 3242 <provider selected="true" editor-type-id="text-editor">
3274 - <state vertical-scroll-proportion="-0.1449016">
3275 - <caret line="10" column="13" selection-start-line="10" selection-start-column="13" selection-end-line="10" selection-end-column="13" />
3243 + <state vertical-scroll-proportion="0.0">
3244 + <caret line="15" column="24" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" />
3276 3245 <folding />
3277 3246 </state>
3278 3247 </provider>
3279 3248 </entry>
3280 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/HttpClient.java">
3249 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml">
3250 + <provider editor-type-id="android-designer">
3251 + <state />
3252 + </provider>
3281 3253 <provider selected="true" editor-type-id="text-editor">
3282 - <state vertical-scroll-proportion="1.0446736">
3283 - <caret line="41" column="0" selection-start-line="41" selection-start-column="0" selection-end-line="41" selection-end-column="0" />
3254 + <state vertical-scroll-proportion="0.27930173">
3255 + <caret line="16" column="38" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" />
3284 3256 <folding />
3285 3257 </state>
3286 3258 </provider>
3287 3259 </entry>
3288 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java">
3260 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml">
3261 + <provider editor-type-id="android-designer">
3262 + <state />
3263 + </provider>
3289 3264 <provider selected="true" editor-type-id="text-editor">
3290 - <state vertical-scroll-proportion="0.0">
3291 - <caret line="121" column="0" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" />
3265 + <state vertical-scroll-proportion="1.0689656">
3266 + <caret line="13" column="48" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" />
3292 3267 <folding>
3293 - <element signature="e#2461#2483#0" expanded="true" />
3294 - <element signature="e#7565#7589#0" expanded="true" />
3295 - <element signature="e#8972#9004#0" expanded="true" />
3296 - <element signature="e#11888#11926#0" expanded="true" />
3297 - <element signature="e#12720#12750#0" expanded="true" />
3268 + <element signature="e#1224#1243#0" expanded="true" />
3298 3269 </folding>
3299 3270 </state>
3300 3271 </provider>
3301 3272 </entry>
3302 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SelectionActivity.java">
3303 - <provider selected="true" editor-type-id="text-editor">
3304 - <state vertical-scroll-proportion="0.0">
3305 - <caret line="118" column="103" selection-start-line="118" selection-start-column="103" selection-end-line="118" selection-end-column="103" />
3306 - <folding />
3307 - </state>
3308 - </provider>
3309 - </entry>
3310 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java">
3311 - <provider selected="true" editor-type-id="text-editor">
3312 - <state vertical-scroll-proportion="0.0">
3313 - <caret line="36" column="26" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="34" />
3314 - <folding />
3315 - </state>
3273 + <entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/logoregione.png">
3274 + <provider selected="true" editor-type-id="images">
3275 + <state />
3316 3276 </provider>
3317 3277 </entry>
3318 - <entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/graphics/BitmapFactory.java">
3319 - <provider selected="true" editor-type-id="text-editor">
3320 - <state vertical-scroll-proportion="0.0">
3321 - <caret line="595" column="25" selection-start-line="595" selection-start-column="25" selection-end-line="595" selection-end-column="25" />
3322 - <folding />
3323 - </state>
3278 + <entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml">
3279 + <provider editor-type-id="android-designer">
3280 + <state />
3324 3281 </provider>
3325 - </entry>
3326 - <entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java">
3327 3282 <provider selected="true" editor-type-id="text-editor">
3328 - <state vertical-scroll-proportion="0.5744681">
3329 - <caret line="560" column="64" selection-start-line="560" selection-start-column="64" selection-end-line="560" selection-end-column="64" />
3283 + <state vertical-scroll-proportion="0.798005">
3284 + <caret line="95" column="45" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="45" />
3330 3285 <folding>
3331 - <element signature="imports" expanded="true" />
3286 + <element signature="e#4221#4240#0" expanded="true" />
3287 + <element signature="e#4288#4307#0" expanded="true" />
3332 3288 </folding>
3333 3289 </state>
3334 3290 </provider>

View View this file contents

History View the full history

Feeds

Commits for /Android/SmartCharging/SmartCharging/.idea/workspace.xml

Need assistance?   Get in touch, or head to our documentation site.