| |
@@ -14,9 +14,21 @@ |
| 14 |
14 |
|
</component> |
| 15 |
15 |
|
<component name="AndroidLayouts"> |
| 16 |
16 |
|
<shared> |
| 17 |
|
- |
<config /> |
| |
17 |
+ |
<config> |
| |
18 |
+ |
<devices> |
| |
19 |
+ |
<device id="Nexus 5" /> |
| |
20 |
+ |
<device id="Nexus 7" /> |
| |
21 |
+ |
</devices> |
| |
22 |
+ |
<target>android-22</target> |
| |
23 |
+ |
</config> |
| 18 |
24 |
|
</shared> |
| 19 |
25 |
|
<layouts> |
| |
26 |
+ |
<layout url="file://$PROJECT_DIR$/.idea/misc.xml"> |
| |
27 |
+ |
<config> |
| |
28 |
+ |
<state>Landscape</state> |
| |
29 |
+ |
<theme>@style/AppTheme</theme> |
| |
30 |
+ |
</config> |
| |
31 |
+ |
</layout> |
| 20 |
32 |
|
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml"> |
| 21 |
33 |
|
<config> |
| 22 |
34 |
|
<theme>@style/AppTheme</theme> |
| |
@@ -29,7 +41,7 @@ |
| 29 |
41 |
|
</layout> |
| 30 |
42 |
|
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_register_locale.xml"> |
| 31 |
43 |
|
<config> |
| 32 |
|
- |
<theme>@style/AppTheme</theme> |
| |
44 |
+ |
<theme>@style/AppThemeNoActionBar</theme> |
| 33 |
45 |
|
</config> |
| 34 |
46 |
|
</layout> |
| 35 |
47 |
|
<layout url="file://$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml"> |
| |
@@ -40,58 +52,46 @@ |
| 40 |
52 |
|
</layouts> |
| 41 |
53 |
|
</component> |
| 42 |
54 |
|
<component name="AndroidLogFilters"> |
| 43 |
|
- |
<option name="TOOL_WINDOW_LOG_LEVEL" value="ERROR" /> |
| 44 |
55 |
|
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Unnamed-0" /> |
| 45 |
56 |
|
</component> |
| 46 |
57 |
|
<component name="ChangeListManager"> |
| 47 |
58 |
|
<list default="true" readonly="true" id="dc564432-0882-4a2b-94b7-3913b736c3c7" name="Default" comment="me"> |
| 48 |
|
- |
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml" /> |
| 49 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\.idea\libraries\support_v4_22_2_0.xml" afterPath="" /> |
| 50 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\values\google_maps_api.xml" afterPath="" /> |
| 51 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\release\res\values\google_maps_api.xml" afterPath="" /> |
| 52 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug" afterPath="" /> |
| 53 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-hdpi" afterPath="" /> |
| 54 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-mdpi" afterPath="" /> |
| 55 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-xhdpi" afterPath="" /> |
| 56 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-xxhdpi" afterPath="" /> |
| 57 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-xxxhdpi" afterPath="" /> |
| 58 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable" afterPath="" /> |
| 59 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-mdpi\face.png" afterPath="" /> |
| 60 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-hdpi\ic_settings_applications_white_24dp.png" afterPath="" /> |
| 61 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-mdpi\ic_settings_applications_white_24dp.png" afterPath="" /> |
| 62 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-xhdpi\ic_settings_applications_white_24dp.png" afterPath="" /> |
| 63 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-xxhdpi\ic_settings_applications_white_24dp.png" afterPath="" /> |
| 64 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-xxxhdpi\ic_settings_applications_white_24dp.png" afterPath="" /> |
| 65 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\layout" afterPath="" /> |
| 66 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\drawable-mdpi\logo.png" afterPath="" /> |
| 67 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\release" afterPath="" /> |
| 68 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res" afterPath="" /> |
| 69 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\release\res" afterPath="" /> |
| 70 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\values-v11" afterPath="" /> |
| 71 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\values-v9" afterPath="" /> |
| 72 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\debug\res\values" afterPath="" /> |
| 73 |
|
- |
<change type="DELETED" beforePath="C:\Nextrek\SmartCharging\app\src\release\res\values" afterPath="" /> |
| |
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="" /> |
| 74 |
86 |
|
<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" /> |
| 75 |
87 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" /> |
| 76 |
88 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" /> |
| 77 |
89 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" /> |
| 78 |
90 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" /> |
| 79 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml" /> |
| 80 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/app.iml" afterPath="$PROJECT_DIR$/app/app.iml" /> |
| 81 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> |
| 82 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/photo_crop_library_1_0_2.xml" afterPath="$PROJECT_DIR$/.idea/libraries/photo_crop_library_1_0_2.xml" /> |
| 83 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_7_3_0.xml" /> |
| 84 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_ads_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_ads_7_3_0.xml" /> |
| 85 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_analytics_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_analytics_7_3_0.xml" /> |
| 86 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_appindexing_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_appindexing_7_3_0.xml" /> |
| 87 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_appstate_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_appstate_7_3_0.xml" /> |
| 88 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_cast_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_cast_7_3_0.xml" /> |
| 89 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_drive_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_drive_7_3_0.xml" /> |
| 90 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_gcm_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_gcm_7_3_0.xml" /> |
| 91 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_maps_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_maps_7_3_0.xml" /> |
| 92 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_nearby_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_nearby_7_3_0.xml" /> |
| 93 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_panorama_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_panorama_7_3_0.xml" /> |
| 94 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/libraries/play_services_wallet_7_3_0.xml" afterPath="$PROJECT_DIR$/.idea/libraries/play_services_wallet_7_3_0.xml" /> |
| |
91 |
+ |
<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 |
+ |
<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" /> |
| |
94 |
+ |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/local.properties" afterPath="$PROJECT_DIR$/local.properties" /> |
| 95 |
95 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> |
| 96 |
96 |
|
</list> |
| 97 |
97 |
|
<ignored path="SmartCharging.iws" /> |
| |
@@ -133,147 +133,145 @@ |
| 133 |
133 |
|
</component> |
| 134 |
134 |
|
<component name="FileEditorManager"> |
| 135 |
135 |
|
<leaf> |
| 136 |
|
- |
<file leaf-file-name="LoginActivity.java" pinned="false" current-in-tab="false"> |
| 137 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/LoginActivity.java"> |
| |
136 |
+ |
<file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false"> |
| |
137 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> |
| 138 |
138 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 139 |
139 |
|
<state vertical-scroll-proportion="0.0"> |
| 140 |
|
- |
<caret line="221" column="21" selection-start-line="221" selection-start-column="21" selection-end-line="221" selection-end-column="21" /> |
| |
140 |
+ |
<caret line="116" column="45" selection-start-line="116" selection-start-column="45" selection-end-line="116" selection-end-column="45" /> |
| 141 |
141 |
|
<folding> |
| 142 |
|
- |
<element signature="e#4144#5205#0" expanded="true" /> |
| 143 |
|
- |
<element signature="e#5204#5205#0" expanded="true" /> |
| 144 |
|
- |
<element signature="e#8771#8805#0" expanded="true" /> |
| |
142 |
+ |
<element signature="e#6417#6455#0" expanded="true" /> |
| 145 |
143 |
|
</folding> |
| 146 |
144 |
|
</state> |
| 147 |
145 |
|
</provider> |
| 148 |
146 |
|
</entry> |
| 149 |
147 |
|
</file> |
| 150 |
|
- |
<file leaf-file-name="google_maps_api.xml" pinned="false" current-in-tab="false"> |
| 151 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml"> |
| |
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"> |
| 152 |
150 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 153 |
151 |
|
<state vertical-scroll-proportion="0.0"> |
| 154 |
|
- |
<caret line="9" column="90" selection-start-line="9" selection-start-column="90" selection-end-line="9" selection-end-column="90" /> |
| |
152 |
+ |
<caret line="56" column="42" selection-start-line="56" selection-start-column="42" selection-end-line="56" selection-end-column="42" /> |
| 155 |
153 |
|
<folding /> |
| 156 |
154 |
|
</state> |
| 157 |
155 |
|
</provider> |
| 158 |
156 |
|
</entry> |
| 159 |
157 |
|
</file> |
| 160 |
|
- |
<file leaf-file-name="MapActivity.java" pinned="false" current-in-tab="false"> |
| 161 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java"> |
| |
158 |
+ |
<file leaf-file-name="ManagerActivity.java" pinned="false" current-in-tab="false"> |
| |
159 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java"> |
| 162 |
160 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 163 |
161 |
|
<state vertical-scroll-proportion="0.0"> |
| 164 |
|
- |
<caret line="750" column="41" selection-start-line="750" selection-start-column="41" selection-end-line="750" selection-end-column="41" /> |
| |
162 |
+ |
<caret line="121" column="0" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" /> |
| |
163 |
+ |
<folding> |
| |
164 |
+ |
<element signature="e#2461#2483#0" expanded="true" /> |
| |
165 |
+ |
<element signature="e#7565#7589#0" expanded="true" /> |
| |
166 |
+ |
<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" /> |
| 165 |
179 |
|
<folding> |
| 166 |
|
- |
<element signature="e#2225#2242#0" expanded="true" /> |
| 167 |
|
- |
<element signature="e#2536#2557#0" expanded="true" /> |
| 168 |
|
- |
<element signature="e#2622#2641#0" expanded="true" /> |
| 169 |
|
- |
<element signature="e#2706#2727#0" expanded="true" /> |
| 170 |
|
- |
<element signature="e#3554#3575#0" expanded="true" /> |
| 171 |
|
- |
<element signature="e#3915#3916#0" expanded="true" /> |
| 172 |
|
- |
<element signature="e#3940#3941#0" expanded="true" /> |
| 173 |
|
- |
<element signature="e#5630#11045#0" expanded="true" /> |
| 174 |
|
- |
<element signature="e#5901#10928#0" expanded="true" /> |
| 175 |
|
- |
<element signature="e#6148#6661#0" expanded="true" /> |
| 176 |
|
- |
<element signature="e#6660#6661#0" expanded="true" /> |
| 177 |
|
- |
<element signature="e#8232#8594#0" expanded="true" /> |
| 178 |
|
- |
<element signature="e#8593#8594#0" expanded="true" /> |
| 179 |
|
- |
<element signature="e#8774#9869#0" expanded="true" /> |
| 180 |
|
- |
<element signature="e#8932#9779#0" expanded="true" /> |
| 181 |
|
- |
<element signature="e#9778#9779#0" expanded="true" /> |
| 182 |
|
- |
<element signature="e#9868#9869#0" expanded="true" /> |
| 183 |
|
- |
<element signature="e#10927#10928#0" expanded="true" /> |
| 184 |
|
- |
<element signature="e#11044#11045#0" expanded="true" /> |
| 185 |
|
- |
<element signature="e#11615#11803#0" expanded="true" /> |
| 186 |
|
- |
<element signature="e#11802#11803#0" expanded="true" /> |
| 187 |
|
- |
<element signature="e#11894#13559#0" expanded="true" /> |
| 188 |
|
- |
<element signature="e#12441#12683#0" expanded="true" /> |
| 189 |
|
- |
<element signature="e#12682#12683#0" expanded="true" /> |
| 190 |
|
- |
<element signature="e#12789#13532#0" expanded="true" /> |
| 191 |
|
- |
<element signature="e#12899#13490#0" expanded="true" /> |
| 192 |
|
- |
<element signature="e#13365#13386#0" expanded="true" /> |
| 193 |
|
- |
<element signature="e#13489#13490#0" expanded="true" /> |
| 194 |
|
- |
<element signature="e#13531#13532#0" expanded="true" /> |
| 195 |
|
- |
<element signature="e#13558#13559#0" expanded="true" /> |
| 196 |
|
- |
<element signature="e#14882#14883#0" expanded="true" /> |
| 197 |
|
- |
<element signature="e#14925#14926#0" expanded="true" /> |
| 198 |
|
- |
<element signature="e#15814#15815#0" expanded="true" /> |
| 199 |
|
- |
<element signature="e#15857#15858#0" expanded="true" /> |
| 200 |
|
- |
<element signature="e#16746#20160#0" expanded="true" /> |
| 201 |
|
- |
<element signature="e#17351#17774#0" expanded="true" /> |
| 202 |
|
- |
<element signature="e#17720#17741#0" expanded="true" /> |
| 203 |
|
- |
<element signature="e#17773#17774#0" expanded="true" /> |
| 204 |
|
- |
<element signature="e#18777#19784#0" expanded="true" /> |
| 205 |
|
- |
<element signature="e#19039#19057#0" expanded="true" /> |
| 206 |
|
- |
<element signature="e#19110#19140#0" expanded="true" /> |
| 207 |
|
- |
<element signature="e#19382#19668#0" expanded="true" /> |
| 208 |
|
- |
<element signature="e#19667#19668#0" expanded="true" /> |
| 209 |
|
- |
<element signature="e#19783#19784#0" expanded="true" /> |
| 210 |
|
- |
<element signature="e#20159#20160#0" expanded="true" /> |
| 211 |
|
- |
<element signature="e#20280#20471#0" expanded="true" /> |
| 212 |
|
- |
<element signature="e#20470#20471#0" expanded="true" /> |
| 213 |
|
- |
<element signature="e#21152#22046#0" expanded="true" /> |
| 214 |
|
- |
<element signature="e#22045#22046#0" expanded="true" /> |
| 215 |
|
- |
<element signature="e#22093#22512#0" expanded="true" /> |
| 216 |
|
- |
<element signature="e#22511#22512#0" expanded="true" /> |
| 217 |
|
- |
<element signature="e#22574#25037#0" expanded="true" /> |
| 218 |
|
- |
<element signature="e#23404#24515#0" expanded="true" /> |
| 219 |
|
- |
<element signature="e#24514#24515#0" expanded="true" /> |
| 220 |
|
- |
<element signature="e#25036#25037#0" expanded="true" /> |
| 221 |
|
- |
<element signature="e#25111#26997#0" expanded="true" /> |
| 222 |
|
- |
<element signature="e#25249#25591#0" expanded="true" /> |
| 223 |
|
- |
<element signature="e#25590#25591#0" expanded="true" /> |
| 224 |
|
- |
<element signature="e#26381#26777#0" expanded="true" /> |
| 225 |
|
- |
<element signature="e#26776#26777#0" expanded="true" /> |
| 226 |
|
- |
<element signature="e#26996#26997#0" expanded="true" /> |
| 227 |
|
- |
<element signature="e#27132#27314#0" expanded="true" /> |
| 228 |
|
- |
<element signature="e#27313#27314#0" expanded="true" /> |
| 229 |
|
- |
<element signature="e#28489#28538#0" expanded="true" /> |
| 230 |
|
- |
<element signature="method#AddMarker#0;class#AddMarker#0;class#MapActivity#0" expanded="false" /> |
| 231 |
|
- |
<element signature="method#run#0;class#AddMarker#0;class#MapActivity#0" expanded="false" /> |
| |
180 |
+ |
<element signature="imports" expanded="true" /> |
| 232 |
181 |
|
</folding> |
| 233 |
182 |
|
</state> |
| 234 |
183 |
|
</provider> |
| 235 |
184 |
|
</entry> |
| 236 |
185 |
|
</file> |
| 237 |
|
- |
<file leaf-file-name="activity_map.xml" pinned="false" current-in-tab="true"> |
| 238 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml"> |
| |
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"> |
| |
188 |
+ |
<provider selected="true" editor-type-id="text-editor"> |
| |
189 |
+ |
<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" /> |
| |
191 |
+ |
<folding /> |
| |
192 |
+ |
</state> |
| |
193 |
+ |
</provider> |
| |
194 |
+ |
</entry> |
| |
195 |
+ |
</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> |
| |
203 |
+ |
</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 |
+ |
<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 /> |
| |
212 |
+ |
</state> |
| |
213 |
+ |
</provider> |
| |
214 |
+ |
</entry> |
| |
215 |
+ |
</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"> |
| 239 |
218 |
|
<provider editor-type-id="android-designer"> |
| 240 |
219 |
|
<state /> |
| 241 |
220 |
|
</provider> |
| 242 |
221 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 243 |
|
- |
<state vertical-scroll-proportion="2.2087543"> |
| 244 |
|
- |
<caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" /> |
| |
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" /> |
| 245 |
224 |
|
<folding> |
| 246 |
|
- |
<element signature="e#2344#2361#0" expanded="true" /> |
| 247 |
|
- |
<element signature="e#3421#3440#0" expanded="true" /> |
| 248 |
|
- |
<element signature="e#3892#3910#0" expanded="true" /> |
| 249 |
|
- |
<element signature="e#4726#4745#0" expanded="true" /> |
| 250 |
|
- |
<element signature="e#5432#5450#0" expanded="true" /> |
| 251 |
|
- |
<element signature="e#6111#6129#0" expanded="true" /> |
| 252 |
|
- |
<element signature="e#6224#6240#0" expanded="true" /> |
| 253 |
|
- |
<element signature="e#6704#6730#0" expanded="true" /> |
| 254 |
|
- |
<element signature="e#7162#7191#0" expanded="true" /> |
| 255 |
|
- |
<element signature="e#7915#7945#0" expanded="true" /> |
| |
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" /> |
| 256 |
237 |
|
</folding> |
| 257 |
238 |
|
</state> |
| 258 |
239 |
|
</provider> |
| 259 |
240 |
|
</entry> |
| 260 |
241 |
|
</file> |
| 261 |
|
- |
<file leaf-file-name="AndroidManifest.xml" pinned="false" current-in-tab="false"> |
| 262 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> |
| |
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"> |
| 263 |
244 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 264 |
245 |
|
<state vertical-scroll-proportion="0.0"> |
| 265 |
|
- |
<caret line="133" column="43" selection-start-line="133" selection-start-column="43" selection-end-line="133" selection-end-column="43" /> |
| |
246 |
+ |
<caret line="60" column="45" selection-start-line="60" selection-start-column="45" selection-end-line="60" selection-end-column="45" /> |
| 266 |
247 |
|
<folding /> |
| 267 |
248 |
|
</state> |
| 268 |
249 |
|
</provider> |
| 269 |
250 |
|
</entry> |
| 270 |
251 |
|
</file> |
| 271 |
|
- |
<file leaf-file-name="dimens.xml" pinned="false" current-in-tab="false"> |
| 272 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/dimens.xml"> |
| |
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"> |
| |
255 |
+ |
<state /> |
| |
256 |
+ |
</provider> |
| 273 |
257 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 274 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 275 |
|
- |
<caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" /> |
| 276 |
|
- |
<folding /> |
| |
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> |
| 277 |
275 |
|
</state> |
| 278 |
276 |
|
</provider> |
| 279 |
277 |
|
</entry> |
| |
@@ -285,14 +283,14 @@ |
| 285 |
283 |
|
<list> |
| 286 |
284 |
|
<option value="valueResourceFile" /> |
| 287 |
285 |
|
<option value="resourceFile" /> |
| 288 |
|
- |
<option value="Class" /> |
| 289 |
286 |
|
<option value="layoutResourceFile_vertical" /> |
| |
287 |
+ |
<option value="Class" /> |
| 290 |
288 |
|
</list> |
| 291 |
289 |
|
</option> |
| 292 |
290 |
|
</component> |
| 293 |
291 |
|
<component name="GenerateSignedApkSettings"> |
| 294 |
|
- |
<option name="KEY_STORE_PATH" value="C:\Users\federico\Desktop\nextrek.jks" /> |
| 295 |
|
- |
<option name="KEY_ALIAS" value="nextrek" /> |
| |
292 |
+ |
<option name="KEY_STORE_PATH" value="C:\Client\SmartCharging\SmartChargingKeyStore-helloponente.jks" /> |
| |
293 |
+ |
<option name="KEY_ALIAS" value="SmartChargingKeyStore" /> |
| 296 |
294 |
|
<option name="REMEMBER_PASSWORDS" value="true" /> |
| 297 |
295 |
|
</component> |
| 298 |
296 |
|
<component name="GradleLocalSettings"> |
| |
@@ -703,6 +701,11 @@ |
| 703 |
701 |
|
<option name="name" value="prepareComAndroidSupportCardviewV72221Library" /> |
| 704 |
702 |
|
</ExternalTaskPojo> |
| 705 |
703 |
|
<ExternalTaskPojo> |
| |
704 |
+ |
<option name="description" value="Prepare com.android.support:design:22.2.1" /> |
| |
705 |
+ |
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> |
| |
706 |
+ |
<option name="name" value="prepareComAndroidSupportDesign2221Library" /> |
| |
707 |
+ |
</ExternalTaskPojo> |
| |
708 |
+ |
<ExternalTaskPojo> |
| 706 |
709 |
|
<option name="description" value="Prepare com.android.support:support-v4:22.2.1" /> |
| 707 |
710 |
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> |
| 708 |
711 |
|
<option name="name" value="prepareComAndroidSupportSupportV42221Library" /> |
| |
@@ -713,6 +716,11 @@ |
| 713 |
716 |
|
<option name="name" value="prepareComFacebookAndroidFacebookAndroidSdk400Library" /> |
| 714 |
717 |
|
</ExternalTaskPojo> |
| 715 |
718 |
|
<ExternalTaskPojo> |
| |
719 |
+ |
<option name="description" value="Prepare com.github.ganfra:material-spinner:1.1.0" /> |
| |
720 |
+ |
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> |
| |
721 |
+ |
<option name="name" value="prepareComGithubGanfraMaterialSpinner110Library" /> |
| |
722 |
+ |
</ExternalTaskPojo> |
| |
723 |
+ |
<ExternalTaskPojo> |
| 716 |
724 |
|
<option name="description" value="Prepare com.github.paolorotolo:appintro:3.2.0" /> |
| 717 |
725 |
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$" /> |
| 718 |
726 |
|
<option name="name" value="prepareComGithubPaolorotoloAppintro320Library" /> |
| |
@@ -1328,6 +1336,11 @@ |
| 1328 |
1336 |
|
<option name="name" value="prepareComAndroidSupportCardviewV72221Library" /> |
| 1329 |
1337 |
|
</ExternalTaskPojo> |
| 1330 |
1338 |
|
<ExternalTaskPojo> |
| |
1339 |
+ |
<option name="description" value="Prepare com.android.support:design:22.2.1" /> |
| |
1340 |
+ |
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> |
| |
1341 |
+ |
<option name="name" value="prepareComAndroidSupportDesign2221Library" /> |
| |
1342 |
+ |
</ExternalTaskPojo> |
| |
1343 |
+ |
<ExternalTaskPojo> |
| 1331 |
1344 |
|
<option name="description" value="Prepare com.android.support:support-v4:22.2.1" /> |
| 1332 |
1345 |
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> |
| 1333 |
1346 |
|
<option name="name" value="prepareComAndroidSupportSupportV42221Library" /> |
| |
@@ -1338,6 +1351,11 @@ |
| 1338 |
1351 |
|
<option name="name" value="prepareComFacebookAndroidFacebookAndroidSdk400Library" /> |
| 1339 |
1352 |
|
</ExternalTaskPojo> |
| 1340 |
1353 |
|
<ExternalTaskPojo> |
| |
1354 |
+ |
<option name="description" value="Prepare com.github.ganfra:material-spinner:1.1.0" /> |
| |
1355 |
+ |
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> |
| |
1356 |
+ |
<option name="name" value="prepareComGithubGanfraMaterialSpinner110Library" /> |
| |
1357 |
+ |
</ExternalTaskPojo> |
| |
1358 |
+ |
<ExternalTaskPojo> |
| 1341 |
1359 |
|
<option name="description" value="Prepare com.github.paolorotolo:appintro:3.2.0" /> |
| 1342 |
1360 |
|
<option name="linkedExternalProjectPath" value="$PROJECT_DIR$/app" /> |
| 1343 |
1361 |
|
<option name="name" value="prepareComGithubPaolorotoloAppintro320Library" /> |
| |
@@ -1577,6 +1595,7 @@ |
| 1577 |
1595 |
|
<option name="modificationStamps"> |
| 1578 |
1596 |
|
<map> |
| 1579 |
1597 |
|
<entry key="$PROJECT_DIR$" value="4304472899838" /> |
| |
1598 |
+ |
<entry key="C:\Client\SmartCharging" value="4323720230005" /> |
| 1580 |
1599 |
|
<entry key="C:\Nextrek\SmartCharging" value="4321472708485" /> |
| 1581 |
1600 |
|
<entry key="C:\SmartCharging\SmartCharging" value="4308458371987" /> |
| 1582 |
1601 |
|
</map> |
| |
@@ -1757,13 +1776,17 @@ |
| 1757 |
1776 |
|
<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3-sources.jar" /> |
| 1758 |
1777 |
|
<option value="$APPLICATION_HOME_DIR$/gradle/m2repository/com/android/tools/external/lombok/lombok-ast/0.2.3/lombok-ast-0.2.3.jar" /> |
| 1759 |
1778 |
|
<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 |
+ |
<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" /> |
| 1760 |
1780 |
|
<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" /> |
| 1761 |
1781 |
|
<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" /> |
| 1762 |
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" /> |
| 1763 |
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" /> |
| 1764 |
1786 |
|
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.github.paolorotolo/appintro/3.2.0/eb5567286fbe895c416b0347aa9ed777f2fc6043/appintro-3.2.0.aar" /> |
| 1765 |
1787 |
|
<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" /> |
| 1766 |
1788 |
|
<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 |
+ |
<option value="$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.nineoldandroids/library/2.4.0/e9b63380f3a242dbdbf103a2355ad7e43bad17cb/library-2.4.0.jar" /> |
| 1767 |
1790 |
|
<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" /> |
| 1768 |
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" /> |
| 1769 |
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" /> |
| |
@@ -1786,7 +1809,6 @@ |
| 1786 |
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" /> |
| 1787 |
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" /> |
| 1788 |
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" /> |
| 1789 |
|
- |
<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" /> |
| 1790 |
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" /> |
| 1791 |
1813 |
|
</list> |
| 1792 |
1814 |
|
</option> |
| |
@@ -1815,57 +1837,57 @@ |
| 1815 |
1837 |
|
<component name="IdeDocumentHistory"> |
| 1816 |
1838 |
|
<option name="CHANGED_PATHS"> |
| 1817 |
1839 |
|
<list> |
| 1818 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/LoginActivity.java" /> |
| 1819 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/SelectionActivity.java" /> |
| 1820 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Utils.java" /> |
| 1821 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/SettingSelectionActivity.java" /> |
| 1822 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/MainActivity.java" /> |
| 1823 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_set_position_locale.xml" /> |
| 1824 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/RegisterActivity.java" /> |
| 1825 |
1840 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/HttpClient.java" /> |
| 1826 |
1841 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/MapActivity.java" /> |
| 1827 |
1842 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/SetPositionLocaleActivity.java" /> |
| 1828 |
1843 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/ManagerActivity.java" /> |
| 1829 |
1844 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/CallService.java" /> |
| 1830 |
1845 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/local_item.xml" /> |
| 1831 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml" /> |
| 1832 |
1846 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ImageManagerActivity.java" /> |
| 1833 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_manager.xml" /> |
| 1834 |
1847 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_image_manager.xml" /> |
| 1835 |
1848 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingSelectionActivity.java" /> |
| 1836 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java" /> |
| 1837 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SetPositionLocaleActivity.java" /> |
| 1838 |
1849 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RecensioneActivity.java" /> |
| 1839 |
1850 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/toast_layout.xml" /> |
| 1840 |
1851 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/MyLocation.java" /> |
| 1841 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/FullInfoFragment.java" /> |
| 1842 |
1852 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_recensione.xml" /> |
| 1843 |
1853 |
|
<option value="$PROJECT_DIR$/build.gradle" /> |
| 1844 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> |
| 1845 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/PrefsManager.java" /> |
| 1846 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingsActivity.java" /> |
| 1847 |
1854 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml" /> |
| 1848 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml" /> |
| 1849 |
1855 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MainActivity.java" /> |
| 1850 |
1856 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_demo.xml" /> |
| 1851 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_register_locale.xml" /> |
| 1852 |
1857 |
|
<option value="$PROJECT_DIR$/gradle.properties" /> |
| 1853 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/HttpClient.java" /> |
| 1854 |
1858 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/View/RoundedImageView.java" /> |
| 1855 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java" /> |
| 1856 |
1859 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_full_info.xml" /> |
| 1857 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java" /> |
| 1858 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SelectionActivity.java" /> |
| 1859 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml" /> |
| 1860 |
1860 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SplashScreen.java" /> |
| 1861 |
1861 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/LoginActivity.java" /> |
| 1862 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" /> |
| 1863 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/drawable/circle_violet.xml" /> |
| 1864 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/layout/commento_layout.xml" /> |
| 1865 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java" /> |
| 1866 |
1862 |
|
<option value="$PROJECT_DIR$/app/src/release/res/values/google_maps_api.xml" /> |
| 1867 |
1863 |
|
<option value="$PROJECT_DIR$/app/build/intermediates/manifests/full/debug/AndroidManifest.xml" /> |
| |
1864 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/layout/commento_layout.xml" /> |
| |
1865 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/values-v21/styles.xml" /> |
| |
1866 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/values/styles.xml" /> |
| |
1867 |
+ |
<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 |
+ |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/AppIntroFragment.java" /> |
| |
1871 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_intro.xml" /> |
| |
1872 |
+ |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/IntroActivity.java" /> |
| |
1873 |
+ |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/FullInfoFragment.java" /> |
| |
1874 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml" /> |
| |
1875 |
+ |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingsActivity.java" /> |
| |
1876 |
+ |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/PrefsManager.java" /> |
| 1868 |
1877 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml" /> |
| |
1878 |
+ |
<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 |
+ |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SetPositionLocaleActivity.java" /> |
| |
1882 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_set_position_locale.xml" /> |
| |
1883 |
+ |
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> |
| |
1884 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_manager.xml" /> |
| |
1885 |
+ |
<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 |
+ |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/HttpClient.java" /> |
| |
1888 |
+ |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SelectionActivity.java" /> |
| |
1889 |
+ |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java" /> |
| |
1890 |
+ |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java" /> |
| 1869 |
1891 |
|
</list> |
| 1870 |
1892 |
|
</option> |
| 1871 |
1893 |
|
</component> |
| |
@@ -1899,7 +1921,7 @@ |
| 1899 |
1921 |
|
<ConfirmationsSetting value="0" id="Remove" /> |
| 1900 |
1922 |
|
</component> |
| 1901 |
1923 |
|
<component name="ProjectView"> |
| 1902 |
|
- |
<navigator currentView="ProjectPane" proportions="" version="1"> |
| |
1924 |
+ |
<navigator currentView="AndroidView" proportions="" version="1"> |
| 1903 |
1925 |
|
<flattenPackages /> |
| 1904 |
1926 |
|
<showMembers /> |
| 1905 |
1927 |
|
<showModules /> |
| |
@@ -1907,11 +1929,12 @@ |
| 1907 |
1929 |
|
<hideEmptyPackages /> |
| 1908 |
1930 |
|
<abbreviatePackageNames /> |
| 1909 |
1931 |
|
<autoscrollToSource /> |
| 1910 |
|
- |
<autoscrollFromSource /> |
| |
1932 |
+ |
<autoscrollFromSource ProjectPane="true" /> |
| 1911 |
1933 |
|
<sortByType /> |
| 1912 |
1934 |
|
</navigator> |
| 1913 |
1935 |
|
<panes> |
| 1914 |
|
- |
<pane id="AndroidView" /> |
| |
1936 |
+ |
<pane id="PackagesPane" /> |
| |
1937 |
+ |
<pane id="Scratches" /> |
| 1915 |
1938 |
|
<pane id="ProjectPane"> |
| 1916 |
1939 |
|
<subPane> |
| 1917 |
1940 |
|
<PATH> |
| |
@@ -1940,11 +1963,7 @@ |
| 1940 |
1963 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 1941 |
1964 |
|
</PATH_ELEMENT> |
| 1942 |
1965 |
|
<PATH_ELEMENT> |
| 1943 |
|
- |
<option name="myItemId" value="gradle" /> |
| 1944 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 1945 |
|
- |
</PATH_ELEMENT> |
| 1946 |
|
- |
<PATH_ELEMENT> |
| 1947 |
|
- |
<option name="myItemId" value="wrapper" /> |
| |
1966 |
+ |
<option name="myItemId" value="grafica" /> |
| 1948 |
1967 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 1949 |
1968 |
|
</PATH_ELEMENT> |
| 1950 |
1969 |
|
</PATH> |
| |
@@ -1962,202 +1981,141 @@ |
| 1962 |
1981 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 1963 |
1982 |
|
</PATH_ELEMENT> |
| 1964 |
1983 |
|
</PATH> |
| |
1984 |
+ |
</subPane> |
| |
1985 |
+ |
</pane> |
| |
1986 |
+ |
<pane id="Scope" /> |
| |
1987 |
+ |
<pane id="AndroidView"> |
| |
1988 |
+ |
<subPane> |
| 1965 |
1989 |
|
<PATH> |
| 1966 |
1990 |
|
<PATH_ELEMENT> |
| 1967 |
1991 |
|
<option name="myItemId" value="SmartCharging" /> |
| 1968 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| |
1992 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> |
| 1969 |
1993 |
|
</PATH_ELEMENT> |
| |
1994 |
+ |
</PATH> |
| |
1995 |
+ |
<PATH> |
| 1970 |
1996 |
|
<PATH_ELEMENT> |
| 1971 |
1997 |
|
<option name="myItemId" value="SmartCharging" /> |
| 1972 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
1998 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> |
| 1973 |
1999 |
|
</PATH_ELEMENT> |
| 1974 |
2000 |
|
<PATH_ELEMENT> |
| 1975 |
2001 |
|
<option name="myItemId" value="app" /> |
| 1976 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2002 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> |
| 1977 |
2003 |
|
</PATH_ELEMENT> |
| 1978 |
2004 |
|
<PATH_ELEMENT> |
| 1979 |
|
- |
<option name="myItemId" value="src" /> |
| 1980 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2005 |
+ |
<option name="myItemId" value="res" /> |
| |
2006 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" /> |
| 1981 |
2007 |
|
</PATH_ELEMENT> |
| 1982 |
2008 |
|
<PATH_ELEMENT> |
| 1983 |
|
- |
<option name="myItemId" value="main" /> |
| 1984 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2009 |
+ |
<option name="myItemId" value="values" /> |
| |
2010 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderTypeNode" /> |
| 1985 |
2011 |
|
</PATH_ELEMENT> |
| 1986 |
2012 |
|
</PATH> |
| 1987 |
2013 |
|
<PATH> |
| 1988 |
2014 |
|
<PATH_ELEMENT> |
| 1989 |
2015 |
|
<option name="myItemId" value="SmartCharging" /> |
| 1990 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| 1991 |
|
- |
</PATH_ELEMENT> |
| 1992 |
|
- |
<PATH_ELEMENT> |
| 1993 |
|
- |
<option name="myItemId" value="SmartCharging" /> |
| 1994 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2016 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> |
| 1995 |
2017 |
|
</PATH_ELEMENT> |
| 1996 |
2018 |
|
<PATH_ELEMENT> |
| 1997 |
2019 |
|
<option name="myItemId" value="app" /> |
| 1998 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 1999 |
|
- |
</PATH_ELEMENT> |
| 2000 |
|
- |
<PATH_ELEMENT> |
| 2001 |
|
- |
<option name="myItemId" value="src" /> |
| 2002 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2003 |
|
- |
</PATH_ELEMENT> |
| 2004 |
|
- |
<PATH_ELEMENT> |
| 2005 |
|
- |
<option name="myItemId" value="main" /> |
| 2006 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2020 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> |
| 2007 |
2021 |
|
</PATH_ELEMENT> |
| 2008 |
2022 |
|
<PATH_ELEMENT> |
| 2009 |
2023 |
|
<option name="myItemId" value="res" /> |
| 2010 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2024 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidResFolderNode" /> |
| 2011 |
2025 |
|
</PATH_ELEMENT> |
| 2012 |
2026 |
|
</PATH> |
| 2013 |
2027 |
|
<PATH> |
| 2014 |
2028 |
|
<PATH_ELEMENT> |
| 2015 |
2029 |
|
<option name="myItemId" value="SmartCharging" /> |
| 2016 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| 2017 |
|
- |
</PATH_ELEMENT> |
| 2018 |
|
- |
<PATH_ELEMENT> |
| 2019 |
|
- |
<option name="myItemId" value="SmartCharging" /> |
| 2020 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2030 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> |
| 2021 |
2031 |
|
</PATH_ELEMENT> |
| 2022 |
2032 |
|
<PATH_ELEMENT> |
| 2023 |
2033 |
|
<option name="myItemId" value="app" /> |
| 2024 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2025 |
|
- |
</PATH_ELEMENT> |
| 2026 |
|
- |
<PATH_ELEMENT> |
| 2027 |
|
- |
<option name="myItemId" value="src" /> |
| 2028 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2029 |
|
- |
</PATH_ELEMENT> |
| 2030 |
|
- |
<PATH_ELEMENT> |
| 2031 |
|
- |
<option name="myItemId" value="main" /> |
| 2032 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2033 |
|
- |
</PATH_ELEMENT> |
| 2034 |
|
- |
<PATH_ELEMENT> |
| 2035 |
|
- |
<option name="myItemId" value="res" /> |
| 2036 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2034 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> |
| 2037 |
2035 |
|
</PATH_ELEMENT> |
| 2038 |
2036 |
|
<PATH_ELEMENT> |
| 2039 |
|
- |
<option name="myItemId" value="values" /> |
| 2040 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2037 |
+ |
<option name="myItemId" value="java" /> |
| |
2038 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" /> |
| 2041 |
2039 |
|
</PATH_ELEMENT> |
| 2042 |
2040 |
|
</PATH> |
| 2043 |
2041 |
|
<PATH> |
| 2044 |
2042 |
|
<PATH_ELEMENT> |
| 2045 |
2043 |
|
<option name="myItemId" value="SmartCharging" /> |
| 2046 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| 2047 |
|
- |
</PATH_ELEMENT> |
| 2048 |
|
- |
<PATH_ELEMENT> |
| 2049 |
|
- |
<option name="myItemId" value="SmartCharging" /> |
| 2050 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2044 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> |
| 2051 |
2045 |
|
</PATH_ELEMENT> |
| 2052 |
2046 |
|
<PATH_ELEMENT> |
| 2053 |
2047 |
|
<option name="myItemId" value="app" /> |
| 2054 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2055 |
|
- |
</PATH_ELEMENT> |
| 2056 |
|
- |
<PATH_ELEMENT> |
| 2057 |
|
- |
<option name="myItemId" value="src" /> |
| 2058 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2059 |
|
- |
</PATH_ELEMENT> |
| 2060 |
|
- |
<PATH_ELEMENT> |
| 2061 |
|
- |
<option name="myItemId" value="main" /> |
| 2062 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2048 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> |
| 2063 |
2049 |
|
</PATH_ELEMENT> |
| 2064 |
2050 |
|
<PATH_ELEMENT> |
| 2065 |
|
- |
<option name="myItemId" value="res" /> |
| 2066 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2051 |
+ |
<option name="myItemId" value="java" /> |
| |
2052 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" /> |
| 2067 |
2053 |
|
</PATH_ELEMENT> |
| 2068 |
2054 |
|
<PATH_ELEMENT> |
| 2069 |
|
- |
<option name="myItemId" value="layout" /> |
| 2070 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2055 |
+ |
<option name="myItemId" value="smartcharging" /> |
| |
2056 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" /> |
| 2071 |
2057 |
|
</PATH_ELEMENT> |
| 2072 |
2058 |
|
</PATH> |
| 2073 |
2059 |
|
<PATH> |
| 2074 |
2060 |
|
<PATH_ELEMENT> |
| 2075 |
2061 |
|
<option name="myItemId" value="SmartCharging" /> |
| 2076 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| 2077 |
|
- |
</PATH_ELEMENT> |
| 2078 |
|
- |
<PATH_ELEMENT> |
| 2079 |
|
- |
<option name="myItemId" value="SmartCharging" /> |
| 2080 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2062 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> |
| 2081 |
2063 |
|
</PATH_ELEMENT> |
| 2082 |
2064 |
|
<PATH_ELEMENT> |
| 2083 |
2065 |
|
<option name="myItemId" value="app" /> |
| 2084 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2085 |
|
- |
</PATH_ELEMENT> |
| 2086 |
|
- |
<PATH_ELEMENT> |
| 2087 |
|
- |
<option name="myItemId" value="src" /> |
| 2088 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2066 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> |
| 2089 |
2067 |
|
</PATH_ELEMENT> |
| 2090 |
2068 |
|
<PATH_ELEMENT> |
| 2091 |
|
- |
<option name="myItemId" value="main" /> |
| 2092 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2069 |
+ |
<option name="myItemId" value="java" /> |
| |
2070 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" /> |
| 2093 |
2071 |
|
</PATH_ELEMENT> |
| 2094 |
2072 |
|
<PATH_ELEMENT> |
| 2095 |
|
- |
<option name="myItemId" value="res" /> |
| 2096 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2073 |
+ |
<option name="myItemId" value="smartcharging" /> |
| |
2074 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" /> |
| 2097 |
2075 |
|
</PATH_ELEMENT> |
| 2098 |
2076 |
|
<PATH_ELEMENT> |
| 2099 |
|
- |
<option name="myItemId" value="drawable" /> |
| |
2077 |
+ |
<option name="myItemId" value="Service" /> |
| 2100 |
2078 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2101 |
2079 |
|
</PATH_ELEMENT> |
| 2102 |
2080 |
|
</PATH> |
| 2103 |
2081 |
|
<PATH> |
| 2104 |
2082 |
|
<PATH_ELEMENT> |
| 2105 |
2083 |
|
<option name="myItemId" value="SmartCharging" /> |
| 2106 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| 2107 |
|
- |
</PATH_ELEMENT> |
| 2108 |
|
- |
<PATH_ELEMENT> |
| 2109 |
|
- |
<option name="myItemId" value="SmartCharging" /> |
| 2110 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2084 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> |
| 2111 |
2085 |
|
</PATH_ELEMENT> |
| 2112 |
2086 |
|
<PATH_ELEMENT> |
| 2113 |
2087 |
|
<option name="myItemId" value="app" /> |
| 2114 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2115 |
|
- |
</PATH_ELEMENT> |
| 2116 |
|
- |
<PATH_ELEMENT> |
| 2117 |
|
- |
<option name="myItemId" value="src" /> |
| 2118 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2119 |
|
- |
</PATH_ELEMENT> |
| 2120 |
|
- |
<PATH_ELEMENT> |
| 2121 |
|
- |
<option name="myItemId" value="main" /> |
| 2122 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2088 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> |
| 2123 |
2089 |
|
</PATH_ELEMENT> |
| 2124 |
2090 |
|
<PATH_ELEMENT> |
| 2125 |
2091 |
|
<option name="myItemId" value="java" /> |
| 2126 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2092 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" /> |
| 2127 |
2093 |
|
</PATH_ELEMENT> |
| 2128 |
2094 |
|
<PATH_ELEMENT> |
| 2129 |
2095 |
|
<option name="myItemId" value="smartcharging" /> |
| |
2096 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" /> |
| |
2097 |
+ |
</PATH_ELEMENT> |
| |
2098 |
+ |
<PATH_ELEMENT> |
| |
2099 |
+ |
<option name="myItemId" value="Manager" /> |
| 2130 |
2100 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2131 |
2101 |
|
</PATH_ELEMENT> |
| 2132 |
2102 |
|
</PATH> |
| 2133 |
2103 |
|
<PATH> |
| 2134 |
2104 |
|
<PATH_ELEMENT> |
| 2135 |
2105 |
|
<option name="myItemId" value="SmartCharging" /> |
| 2136 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| 2137 |
|
- |
</PATH_ELEMENT> |
| 2138 |
|
- |
<PATH_ELEMENT> |
| 2139 |
|
- |
<option name="myItemId" value="SmartCharging" /> |
| 2140 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2106 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> |
| 2141 |
2107 |
|
</PATH_ELEMENT> |
| 2142 |
2108 |
|
<PATH_ELEMENT> |
| 2143 |
2109 |
|
<option name="myItemId" value="app" /> |
| 2144 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2145 |
|
- |
</PATH_ELEMENT> |
| 2146 |
|
- |
<PATH_ELEMENT> |
| 2147 |
|
- |
<option name="myItemId" value="src" /> |
| 2148 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2149 |
|
- |
</PATH_ELEMENT> |
| 2150 |
|
- |
<PATH_ELEMENT> |
| 2151 |
|
- |
<option name="myItemId" value="main" /> |
| 2152 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2110 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> |
| 2153 |
2111 |
|
</PATH_ELEMENT> |
| 2154 |
2112 |
|
<PATH_ELEMENT> |
| 2155 |
2113 |
|
<option name="myItemId" value="java" /> |
| 2156 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2114 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidSourceTypeNode" /> |
| 2157 |
2115 |
|
</PATH_ELEMENT> |
| 2158 |
2116 |
|
<PATH_ELEMENT> |
| 2159 |
2117 |
|
<option name="myItemId" value="smartcharging" /> |
| 2160 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2118 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidPsiDirectoryNode" /> |
| 2161 |
2119 |
|
</PATH_ELEMENT> |
| 2162 |
2120 |
|
<PATH_ELEMENT> |
| 2163 |
2121 |
|
<option name="myItemId" value="Controller" /> |
| |
@@ -2167,59 +2125,49 @@ |
| 2167 |
2125 |
|
<PATH> |
| 2168 |
2126 |
|
<PATH_ELEMENT> |
| 2169 |
2127 |
|
<option name="myItemId" value="SmartCharging" /> |
| 2170 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| 2171 |
|
- |
</PATH_ELEMENT> |
| 2172 |
|
- |
<PATH_ELEMENT> |
| 2173 |
|
- |
<option name="myItemId" value="SmartCharging" /> |
| 2174 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2128 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidViewProjectNode" /> |
| 2175 |
2129 |
|
</PATH_ELEMENT> |
| 2176 |
2130 |
|
<PATH_ELEMENT> |
| 2177 |
2131 |
|
<option name="myItemId" value="app" /> |
| 2178 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2179 |
|
- |
</PATH_ELEMENT> |
| 2180 |
|
- |
<PATH_ELEMENT> |
| 2181 |
|
- |
<option name="myItemId" value="src" /> |
| 2182 |
|
- |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2132 |
+ |
<option name="myItemType" value="com.android.tools.idea.navigator.nodes.AndroidModuleNode" /> |
| 2183 |
2133 |
|
</PATH_ELEMENT> |
| 2184 |
2134 |
|
</PATH> |
| 2185 |
2135 |
|
</subPane> |
| 2186 |
2136 |
|
</pane> |
| 2187 |
|
- |
<pane id="PackagesPane" /> |
| 2188 |
|
- |
<pane id="Scope" /> |
| 2189 |
|
- |
<pane id="Scratches" /> |
| 2190 |
2137 |
|
</panes> |
| 2191 |
2138 |
|
</component> |
| 2192 |
2139 |
|
<component name="PropertiesComponent"> |
| 2193 |
2140 |
|
<property name="recentsLimit" value="5" /> |
| 2194 |
2141 |
|
<property name="FullScreen" value="false" /> |
| 2195 |
|
- |
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="8a23499d" /> |
| |
2142 |
+ |
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="42f7c2140418bf19" /> |
| 2196 |
2143 |
|
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Nexus_5_API_22_x86" /> |
| 2197 |
2144 |
|
<property name="android.project.structure.last.selected" value="SDK Location" /> |
| 2198 |
2145 |
|
<property name="android.project.structure.proportion" value="0.15" /> |
| 2199 |
|
- |
<property name="last_opened_file_path" value="$PROJECT_DIR$/app/libs/httpcore-4.4.1.jar" /> |
| |
2146 |
+ |
<property name="last_opened_file_path" value="$PROJECT_DIR$/SmartChargingKeyStore-helloponente.jks" /> |
| 2200 |
2147 |
|
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager2.WIDTH" value="238" /> |
| 2201 |
2148 |
|
<property name="UI_DESIGNER_EDITOR_MODE.PaletteToolWindowManager.WIDTH" value="193" /> |
| 2202 |
2149 |
|
<property name="last_directory_selection" value="$PROJECT_DIR$/app/src/debug/res/drawable-mdpi" /> |
| 2203 |
2150 |
|
<property name="findjar.last.used.dir" value="$USER_HOME$/Desktop/CurrentLocationinMap/app/libs" /> |
| 2204 |
2151 |
|
<property name="settings.editor.selected.configurable" value="reference.settingsdialog.project.gradle" /> |
| 2205 |
2152 |
|
<property name="settings.editor.splitter.proportion" value="0.2" /> |
| 2206 |
|
- |
<property name="ExportApk.ApkPath" value="C:\SmartCharging\SmartCharging\app" /> |
| |
2153 |
+ |
<property name="ExportApk.ApkPath" value="C:\Client\SmartCharging" /> |
| 2207 |
2154 |
|
<property name="ExportApk.Flavors" value="" /> |
| 2208 |
2155 |
|
<property name="ExportApk.BuildType" value="release" /> |
| 2209 |
|
- |
<property name="DEBUGGABLE_DEVICE" value="oneplus-a0001-8a23499d" /> |
| |
2156 |
+ |
<property name="DEBUGGABLE_DEVICE" value="samsung-gt_i9305-42f7c2140418bf19" /> |
| 2210 |
2157 |
|
<property name="DEBUGGABLE_PROCESS" value="it.fedeloper.smartcharging" /> |
| 2211 |
2158 |
|
<property name="SHOW_ALL_PROCESSES" value="false" /> |
| |
2159 |
+ |
<property name="extract.method.default.visibility" value="private" /> |
| 2212 |
2160 |
|
</component> |
| 2213 |
2161 |
|
<component name="RecentsManager"> |
| 2214 |
2162 |
|
<key name="android.template.packageName"> |
| 2215 |
2163 |
|
<recent name="it.fedeloper.smartcharging" /> |
| 2216 |
2164 |
|
</key> |
| 2217 |
2165 |
|
<key name="CopyFile.RECENT_KEYS"> |
| |
2166 |
+ |
<recent name="C:\Client\SmartCharging\app\src\main\res\layout" /> |
| 2218 |
2167 |
|
<recent name="C:\SmartCharging\SmartCharging\app\src\main\res\drawable" /> |
| 2219 |
2168 |
|
<recent name="C:\SmartCharging\SmartCharging\app\src\main\res\anim" /> |
| 2220 |
2169 |
|
<recent name="C:\SmartCharging\SmartCharging\app\src\debug\res\drawable-mdpi" /> |
| 2221 |
2170 |
|
<recent name="C:\SmartCharging\SmartCharging\app\src\debug\res" /> |
| 2222 |
|
- |
<recent name="C:\SmartCharging\SmartCharging\app\src\main\res\layout" /> |
| 2223 |
2171 |
|
</key> |
| 2224 |
2172 |
|
<key name="MoveFile.RECENT_KEYS"> |
| 2225 |
2173 |
|
<recent name="C:\SmartCharging\SmartCharging\app\src\main\res\drawable" /> |
| |
@@ -2247,8 +2195,7 @@ |
| 2247 |
2195 |
|
<option name="mySupportsDeletion" value="false" /> |
| 2248 |
2196 |
|
<option name="myCanBeAbsent" value="false" /> |
| 2249 |
2197 |
|
<option name="myId" value="UPDATED" /> |
| 2250 |
|
- |
<PATH vcs="svn" revision="560">C:\Nextrek\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\MapActivity.java</PATH> |
| 2251 |
|
- |
<PATH vcs="svn" revision="560">C:\Nextrek\SmartCharging\app\src\main\res\values\strings.xml</PATH> |
| |
2198 |
+ |
<PATH vcs="svn" revision="687">C:\Client\SmartCharging\app\src\main\res\values\strings.xml</PATH> |
| 2252 |
2199 |
|
</FILE-GROUP> |
| 2253 |
2200 |
|
<FILE-GROUP> |
| 2254 |
2201 |
|
<option name="myUpdateName" value="Created" /> |
| |
@@ -2348,6 +2295,7 @@ |
| 2348 |
2295 |
|
<configuration default="true" type="AndroidRunConfigurationType" factoryName="Android Application"> |
| 2349 |
2296 |
|
<module name="" /> |
| 2350 |
2297 |
|
<option name="ACTIVITY_CLASS" value="" /> |
| |
2298 |
+ |
<option name="ACTIVITY_EXTRA_FLAGS" value="" /> |
| 2351 |
2299 |
|
<option name="MODE" value="default_activity" /> |
| 2352 |
2300 |
|
<option name="DEPLOY" value="true" /> |
| 2353 |
2301 |
|
<option name="ARTIFACT_NAME" value="" /> |
| |
@@ -2500,6 +2448,7 @@ |
| 2500 |
2448 |
|
<configuration default="false" name="app" type="AndroidRunConfigurationType" factoryName="Android Application"> |
| 2501 |
2449 |
|
<module name="app" /> |
| 2502 |
2450 |
|
<option name="ACTIVITY_CLASS" value="" /> |
| |
2451 |
+ |
<option name="ACTIVITY_EXTRA_FLAGS" value="" /> |
| 2503 |
2452 |
|
<option name="MODE" value="default_activity" /> |
| 2504 |
2453 |
|
<option name="DEPLOY" value="true" /> |
| 2505 |
2454 |
|
<option name="ARTIFACT_NAME" value="" /> |
| |
@@ -2551,24 +2500,24 @@ |
| 2551 |
2500 |
|
<option name="myMappingRoots"> |
| 2552 |
2501 |
|
<list> |
| 2553 |
2502 |
|
<SvnCopyRootSimple> |
| 2554 |
|
- |
<option name="myVcsRoot" value="C:\Nextrek\SmartCharging" /> |
| 2555 |
|
- |
<option name="myCopyRoot" value="C:\Nextrek\SmartCharging" /> |
| |
2503 |
+ |
<option name="myVcsRoot" value="C:\Client\SmartCharging" /> |
| |
2504 |
+ |
<option name="myCopyRoot" value="C:\Client\SmartCharging" /> |
| 2556 |
2505 |
|
</SvnCopyRootSimple> |
| 2557 |
2506 |
|
<SvnCopyRootSimple> |
| 2558 |
|
- |
<option name="myVcsRoot" value="C:\Nextrek\SmartCharging\.idea" /> |
| 2559 |
|
- |
<option name="myCopyRoot" value="C:\Nextrek\SmartCharging\.idea" /> |
| |
2507 |
+ |
<option name="myVcsRoot" value="C:\Client\SmartCharging\.idea" /> |
| |
2508 |
+ |
<option name="myCopyRoot" value="C:\Client\SmartCharging\.idea" /> |
| 2560 |
2509 |
|
</SvnCopyRootSimple> |
| 2561 |
2510 |
|
<SvnCopyRootSimple> |
| 2562 |
|
- |
<option name="myVcsRoot" value="C:\Nextrek\SmartCharging\app" /> |
| 2563 |
|
- |
<option name="myCopyRoot" value="C:\Nextrek\SmartCharging\app" /> |
| |
2511 |
+ |
<option name="myVcsRoot" value="C:\Client\SmartCharging\app" /> |
| |
2512 |
+ |
<option name="myCopyRoot" value="C:\Client\SmartCharging\app" /> |
| 2564 |
2513 |
|
</SvnCopyRootSimple> |
| 2565 |
2514 |
|
</list> |
| 2566 |
2515 |
|
</option> |
| 2567 |
2516 |
|
<option name="myMoreRealMappingRoots"> |
| 2568 |
2517 |
|
<list> |
| 2569 |
2518 |
|
<SvnCopyRootSimple> |
| 2570 |
|
- |
<option name="myVcsRoot" value="C:\Nextrek\SmartCharging" /> |
| 2571 |
|
- |
<option name="myCopyRoot" value="C:\Nextrek\SmartCharging" /> |
| |
2519 |
+ |
<option name="myVcsRoot" value="C:\Client\SmartCharging" /> |
| |
2520 |
+ |
<option name="myCopyRoot" value="C:\Client\SmartCharging" /> |
| 2572 |
2521 |
|
</SvnCopyRootSimple> |
| 2573 |
2522 |
|
</list> |
| 2574 |
2523 |
|
</option> |
| |
@@ -2610,7 +2559,61 @@ |
| 2610 |
2559 |
|
<option name="project" value="LOCAL" /> |
| 2611 |
2560 |
|
<updated>1440510411550</updated> |
| 2612 |
2561 |
|
</task> |
| 2613 |
|
- |
<option name="localTasksCounter" value="6" /> |
| |
2562 |
+ |
<task id="LOCAL-00006" summary="Fix "> |
| |
2563 |
+ |
<created>1441264068064</created> |
| |
2564 |
+ |
<option name="number" value="00006" /> |
| |
2565 |
+ |
<option name="project" value="LOCAL" /> |
| |
2566 |
+ |
<updated>1441264068064</updated> |
| |
2567 |
+ |
</task> |
| |
2568 |
+ |
<task id="LOCAL-00007" summary="me"> |
| |
2569 |
+ |
<created>1441264126873</created> |
| |
2570 |
+ |
<option name="number" value="00007" /> |
| |
2571 |
+ |
<option name="project" value="LOCAL" /> |
| |
2572 |
+ |
<updated>1441264126873</updated> |
| |
2573 |
+ |
</task> |
| |
2574 |
+ |
<task id="LOCAL-00008" summary="me"> |
| |
2575 |
+ |
<created>1441360553427</created> |
| |
2576 |
+ |
<option name="number" value="00008" /> |
| |
2577 |
+ |
<option name="project" value="LOCAL" /> |
| |
2578 |
+ |
<updated>1441360553427</updated> |
| |
2579 |
+ |
</task> |
| |
2580 |
+ |
<task id="LOCAL-00009" summary="me"> |
| |
2581 |
+ |
<created>1441364629770</created> |
| |
2582 |
+ |
<option name="number" value="00009" /> |
| |
2583 |
+ |
<option name="project" value="LOCAL" /> |
| |
2584 |
+ |
<updated>1441364629770</updated> |
| |
2585 |
+ |
</task> |
| |
2586 |
+ |
<task id="LOCAL-00010" summary="me"> |
| |
2587 |
+ |
<created>1441372305194</created> |
| |
2588 |
+ |
<option name="number" value="00010" /> |
| |
2589 |
+ |
<option name="project" value="LOCAL" /> |
| |
2590 |
+ |
<updated>1441372305194</updated> |
| |
2591 |
+ |
</task> |
| |
2592 |
+ |
<task id="LOCAL-00011" summary="me"> |
| |
2593 |
+ |
<created>1441372602458</created> |
| |
2594 |
+ |
<option name="number" value="00011" /> |
| |
2595 |
+ |
<option name="project" value="LOCAL" /> |
| |
2596 |
+ |
<updated>1441372602458</updated> |
| |
2597 |
+ |
</task> |
| |
2598 |
+ |
<task id="LOCAL-00012" summary="me"> |
| |
2599 |
+ |
<created>1441376076708</created> |
| |
2600 |
+ |
<option name="number" value="00012" /> |
| |
2601 |
+ |
<option name="project" value="LOCAL" /> |
| |
2602 |
+ |
<updated>1441376076708</updated> |
| |
2603 |
+ |
</task> |
| |
2604 |
+ |
<task id="LOCAL-00013" summary="me"> |
| |
2605 |
+ |
<created>1441376429711</created> |
| |
2606 |
+ |
<option name="number" value="00013" /> |
| |
2607 |
+ |
<option name="project" value="LOCAL" /> |
| |
2608 |
+ |
<updated>1441376429711</updated> |
| |
2609 |
+ |
</task> |
| |
2610 |
+ |
<task id="LOCAL-00014" summary="me"> |
| |
2611 |
+ |
<created>1441379438452</created> |
| |
2612 |
+ |
<option name="number" value="00014" /> |
| |
2613 |
+ |
<option name="project" value="LOCAL" /> |
| |
2614 |
+ |
<updated>1441379438452</updated> |
| |
2615 |
+ |
</task> |
| |
2616 |
+ |
<option name="localTasksCounter" value="15" /> |
| 2614 |
2617 |
|
<servers /> |
| 2615 |
2618 |
|
</component> |
| 2616 |
2619 |
|
<component name="TodoView"> |
| |
@@ -2630,29 +2633,31 @@ |
| 2630 |
2633 |
|
<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" /> |
| 2631 |
2634 |
|
<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" /> |
| 2632 |
2635 |
|
<window_info id="Palette	" 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" /> |
| 2633 |
|
- |
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.20613287" sideWeight="0.21255673" order="6" side_tool="true" 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" /> |
| 2634 |
2637 |
|
<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" /> |
| 2635 |
2638 |
|
<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" /> |
| 2636 |
|
- |
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29982963" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
| 2637 |
|
- |
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32980332" sideWeight="0.5" order="5" 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" /> |
| 2638 |
2641 |
|
<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" /> |
| 2639 |
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" /> |
| 2640 |
2643 |
|
<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" /> |
| 2641 |
2644 |
|
<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" /> |
| 2642 |
|
- |
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.42589438" sideWeight="0.54916793" order="11" side_tool="false" content_ui="tabs" /> |
| 2643 |
2645 |
|
<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" /> |
| 2644 |
2646 |
|
<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" /> |
| 2645 |
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" /> |
| 2646 |
2648 |
|
<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" /> |
| 2647 |
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" /> |
| 2648 |
2650 |
|
<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" /> |
| 2649 |
2652 |
|
<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" /> |
| 2650 |
|
- |
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.39693356" sideWeight="0.49682036" order="3" side_tool="false" content_ui="tabs" /> |
| |
2653 |
+ |
<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" /> |
| 2651 |
2654 |
|
<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" /> |
| 2652 |
2655 |
|
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
| 2653 |
2656 |
|
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> |
| 2654 |
2657 |
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> |
| 2655 |
2658 |
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> |
| |
2659 |
+ |
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29982963" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
| |
2660 |
+ |
<window_info id="Android" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.42589438" sideWeight="0.54916793" order="11" side_tool="false" content_ui="tabs" /> |
| 2656 |
2661 |
|
</layout> |
| 2657 |
2662 |
|
<layout-to-restore> |
| 2658 |
2663 |
|
<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" /> |
| |
@@ -2696,273 +2701,302 @@ |
| 2696 |
2701 |
|
<option name="myLimit" value="2678400000" /> |
| 2697 |
2702 |
|
</component> |
| 2698 |
2703 |
|
<component name="VcsManagerConfiguration"> |
| |
2704 |
+ |
<option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" /> |
| |
2705 |
+ |
<option name="CHECK_NEW_TODO" value="false" /> |
| |
2706 |
+ |
<MESSAGE value="Fix " /> |
| 2699 |
2707 |
|
<MESSAGE value="me" /> |
| 2700 |
2708 |
|
<option name="LAST_COMMIT_MESSAGE" value="me" /> |
| 2701 |
2709 |
|
</component> |
| 2702 |
2710 |
|
<component name="XDebuggerManager"> |
| 2703 |
2711 |
|
<breakpoint-manager> |
| 2704 |
2712 |
|
<breakpoints> |
| 2705 |
|
- |
<line-breakpoint enabled="true" type="java-line"> |
| |
2713 |
+ |
<line-breakpoint type="java-line"> |
| 2706 |
2714 |
|
<url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/LoginActivity.java</url> |
| 2707 |
2715 |
|
<line>264</line> |
| 2708 |
2716 |
|
<properties /> |
| 2709 |
2717 |
|
<option name="timeStamp" value="33" /> |
| 2710 |
2718 |
|
</line-breakpoint> |
| 2711 |
|
- |
</breakpoints> |
| 2712 |
|
- |
<option name="time" value="36" /> |
| 2713 |
|
- |
</breakpoint-manager> |
| 2714 |
|
- |
<watches-manager /> |
| 2715 |
|
- |
</component> |
| 2716 |
|
- |
<component name="editorHistoryManager"> |
| 2717 |
|
- |
<entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/view/View.java"> |
| 2718 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 2719 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2720 |
|
- |
<caret line="6805" column="0" selection-start-line="6805" selection-start-column="0" selection-end-line="6805" selection-end-column="0" /> |
| 2721 |
|
- |
<folding /> |
| 2722 |
|
- |
</state> |
| 2723 |
|
- |
</provider> |
| 2724 |
|
- |
</entry> |
| 2725 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/local_item.xml"> |
| 2726 |
|
- |
<provider selected="true" editor-type-id="android-designer"> |
| 2727 |
|
- |
<state /> |
| 2728 |
|
- |
</provider> |
| 2729 |
|
- |
<provider editor-type-id="text-editor"> |
| |
2719 |
+ |
<line-breakpoint type="java-line"> |
| |
2720 |
+ |
<url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java</url> |
| |
2721 |
+ |
<line>165</line> |
| |
2722 |
+ |
<properties /> |
| |
2723 |
+ |
<option name="timeStamp" value="38" /> |
| |
2724 |
+ |
</line-breakpoint> |
| |
2725 |
+ |
<line-breakpoint type="java-line"> |
| |
2726 |
+ |
<url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java</url> |
| |
2727 |
+ |
<line>166</line> |
| |
2728 |
+ |
<properties /> |
| |
2729 |
+ |
<option name="timeStamp" value="39" /> |
| |
2730 |
+ |
</line-breakpoint> |
| |
2731 |
+ |
<line-breakpoint type="java-line"> |
| |
2732 |
+ |
<url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SelectionActivity.java</url> |
| |
2733 |
+ |
<line>42</line> |
| |
2734 |
+ |
<properties /> |
| |
2735 |
+ |
<option name="timeStamp" value="44" /> |
| |
2736 |
+ |
</line-breakpoint> |
| |
2737 |
+ |
<line-breakpoint type="java-line"> |
| |
2738 |
+ |
<url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/PrefsManager.java</url> |
| |
2739 |
+ |
<line>31</line> |
| |
2740 |
+ |
<properties /> |
| |
2741 |
+ |
<option name="timeStamp" value="51" /> |
| |
2742 |
+ |
</line-breakpoint> |
| |
2743 |
+ |
<line-breakpoint enabled="true" type="java-line"> |
| |
2744 |
+ |
<url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java</url> |
| |
2745 |
+ |
<line>562</line> |
| |
2746 |
+ |
<properties /> |
| |
2747 |
+ |
<option name="timeStamp" value="60" /> |
| |
2748 |
+ |
</line-breakpoint> |
| |
2749 |
+ |
<line-breakpoint enabled="true" type="java-line"> |
| |
2750 |
+ |
<url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java</url> |
| |
2751 |
+ |
<line>560</line> |
| |
2752 |
+ |
<properties /> |
| |
2753 |
+ |
<option name="timeStamp" value="61" /> |
| |
2754 |
+ |
</line-breakpoint> |
| |
2755 |
+ |
<line-breakpoint enabled="true" type="java-line"> |
| |
2756 |
+ |
<url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java</url> |
| |
2757 |
+ |
<line>34</line> |
| |
2758 |
+ |
<properties /> |
| |
2759 |
+ |
<option name="timeStamp" value="63" /> |
| |
2760 |
+ |
</line-breakpoint> |
| |
2761 |
+ |
<line-breakpoint enabled="true" type="java-line"> |
| |
2762 |
+ |
<url>file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java</url> |
| |
2763 |
+ |
<line>35</line> |
| |
2764 |
+ |
<properties /> |
| |
2765 |
+ |
<option name="timeStamp" value="64" /> |
| |
2766 |
+ |
</line-breakpoint> |
| |
2767 |
+ |
<line-breakpoint enabled="true" type="java-line"> |
| |
2768 |
+ |
<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> |
| |
2776 |
+ |
<properties /> |
| |
2777 |
+ |
<option name="timeStamp" value="68" /> |
| |
2778 |
+ |
</line-breakpoint> |
| |
2779 |
+ |
<line-breakpoint enabled="true" type="java-line"> |
| |
2780 |
+ |
<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> |
| |
2788 |
+ |
<properties /> |
| |
2789 |
+ |
<option name="timeStamp" value="70" /> |
| |
2790 |
+ |
</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 |
+ |
</breakpoints> |
| |
2802 |
+ |
<breakpoints-dialog> |
| |
2803 |
+ |
<breakpoints-dialog /> |
| |
2804 |
+ |
</breakpoints-dialog> |
| |
2805 |
+ |
<default-breakpoints> |
| |
2806 |
+ |
<breakpoint enabled="true" suspend="ALL" type="CidrExceptionBreakpoint"> |
| |
2807 |
+ |
<properties /> |
| |
2808 |
+ |
</breakpoint> |
| |
2809 |
+ |
</default-breakpoints> |
| |
2810 |
+ |
<option name="time" value="71" /> |
| |
2811 |
+ |
</breakpoint-manager> |
| |
2812 |
+ |
<watches-manager /> |
| |
2813 |
+ |
</component> |
| |
2814 |
+ |
<component name="editorHistoryManager"> |
| |
2815 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ration.xml"> |
| |
2816 |
+ |
<provider selected="true" editor-type-id="text-editor"> |
| 2730 |
2817 |
|
<state vertical-scroll-proportion="0.0"> |
| 2731 |
2818 |
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
| 2732 |
2819 |
|
<folding /> |
| 2733 |
2820 |
|
</state> |
| 2734 |
2821 |
|
</provider> |
| 2735 |
2822 |
|
</entry> |
| 2736 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/colors.xml"> |
| 2737 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 2738 |
|
- |
<state vertical-scroll-proportion="0.04197531"> |
| 2739 |
|
- |
<caret line="1" column="29" selection-start-line="1" selection-start-column="29" selection-end-line="1" selection-end-column="38" /> |
| 2740 |
|
- |
<folding /> |
| 2741 |
|
- |
</state> |
| 2742 |
|
- |
</provider> |
| 2743 |
|
- |
</entry> |
| 2744 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_manager.xml"> |
| 2745 |
|
- |
<provider editor-type-id="android-designer"> |
| |
2823 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/base.png"> |
| |
2824 |
+ |
<provider selected="true" editor-type-id="images"> |
| 2746 |
2825 |
|
<state /> |
| 2747 |
2826 |
|
</provider> |
| 2748 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 2749 |
|
- |
<state vertical-scroll-proportion="-7.137931"> |
| 2750 |
|
- |
<caret line="260" column="48" selection-start-line="260" selection-start-column="48" selection-end-line="260" selection-end-column="48" /> |
| 2751 |
|
- |
<folding /> |
| 2752 |
|
- |
</state> |
| 2753 |
|
- |
</provider> |
| 2754 |
2827 |
|
</entry> |
| 2755 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ImageManagerActivity.java"> |
| |
2828 |
+ |
<entry file="file://$PROJECT_DIR$/local.properties"> |
| 2756 |
2829 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2757 |
2830 |
|
<state vertical-scroll-proportion="0.0"> |
| 2758 |
|
- |
<caret line="66" column="15" selection-start-line="66" selection-start-column="15" selection-end-line="66" selection-end-column="15" /> |
| 2759 |
|
- |
<folding /> |
| 2760 |
|
- |
</state> |
| 2761 |
|
- |
</provider> |
| 2762 |
|
- |
</entry> |
| 2763 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_image_manager.xml"> |
| 2764 |
|
- |
<provider selected="true" editor-type-id="android-designer"> |
| 2765 |
|
- |
<state /> |
| 2766 |
|
- |
</provider> |
| 2767 |
|
- |
<provider editor-type-id="text-editor"> |
| 2768 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2769 |
2831 |
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
| 2770 |
2832 |
|
<folding /> |
| 2771 |
2833 |
|
</state> |
| 2772 |
2834 |
|
</provider> |
| 2773 |
2835 |
|
</entry> |
| 2774 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingSelectionActivity.java"> |
| |
2836 |
+ |
<entry file="file://$PROJECT_DIR$/build.gradle"> |
| 2775 |
2837 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2776 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2777 |
|
- |
<caret line="96" column="33" selection-start-line="96" selection-start-column="33" selection-end-line="96" selection-end-column="33" /> |
| 2778 |
|
- |
<folding> |
| 2779 |
|
- |
<element signature="e#1819#1841#0" expanded="false" /> |
| 2780 |
|
- |
<element signature="e#2499#4409#0" expanded="false" /> |
| 2781 |
|
- |
<element signature="e#3456#3965#0" expanded="false" /> |
| 2782 |
|
- |
<element signature="e#3964#3965#0" expanded="false" /> |
| 2783 |
|
- |
<element signature="e#4007#4255#0" expanded="false" /> |
| 2784 |
|
- |
<element signature="e#4254#4255#0" expanded="false" /> |
| 2785 |
|
- |
<element signature="e#4408#4409#0" expanded="false" /> |
| 2786 |
|
- |
<element signature="method#registerFailed#0;class#SettingSelectionActivity#0" expanded="false" /> |
| 2787 |
|
- |
<element signature="method#addimage#0;class#SettingSelectionActivity#0" expanded="false" /> |
| 2788 |
|
- |
<element signature="e#13190#13198#0" expanded="false" /> |
| 2789 |
|
- |
<element signature="method#onOptionsItemSelected#0;class#SettingSelectionActivity#0" expanded="false" /> |
| 2790 |
|
- |
</folding> |
| |
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 /> |
| 2791 |
2841 |
|
</state> |
| 2792 |
2842 |
|
</provider> |
| 2793 |
2843 |
|
</entry> |
| 2794 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java"> |
| 2795 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 2796 |
|
- |
<state vertical-scroll-proportion="-2.9310346"> |
| 2797 |
|
- |
<caret line="401" column="5" selection-start-line="401" selection-start-column="5" selection-end-line="408" selection-end-column="9" /> |
| 2798 |
|
- |
<folding /> |
| 2799 |
|
- |
</state> |
| |
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 /> |
| 2800 |
2847 |
|
</provider> |
| 2801 |
2848 |
|
</entry> |
| 2802 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SetPositionLocaleActivity.java"> |
| |
2849 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml"> |
| |
2850 |
+ |
<provider editor-type-id="android-designer"> |
| |
2851 |
+ |
<state /> |
| |
2852 |
+ |
</provider> |
| 2803 |
2853 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2804 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2805 |
|
- |
<caret line="85" column="12" selection-start-line="85" selection-start-column="12" selection-end-line="115" selection-end-column="23" /> |
| |
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" /> |
| 2806 |
2856 |
|
<folding> |
| 2807 |
|
- |
<element signature="e#2920#4095#0" expanded="false" /> |
| 2808 |
|
- |
<element signature="e#4094#4095#0" expanded="false" /> |
| 2809 |
|
- |
<element signature="e#5273#8304#0" expanded="false" /> |
| 2810 |
|
- |
<element signature="e#6846#7381#0" expanded="false" /> |
| 2811 |
|
- |
<element signature="e#7380#7381#0" expanded="false" /> |
| 2812 |
|
- |
<element signature="e#8303#8304#0" expanded="false" /> |
| |
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" /> |
| 2813 |
2860 |
|
</folding> |
| 2814 |
2861 |
|
</state> |
| 2815 |
2862 |
|
</provider> |
| 2816 |
2863 |
|
</entry> |
| 2817 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/MyLocation.java"> |
| |
2864 |
+ |
<entry file="file://$PROJECT_DIR$/gradle.properties"> |
| 2818 |
2865 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2819 |
2866 |
|
<state vertical-scroll-proportion="0.0"> |
| 2820 |
|
- |
<caret line="51" column="0" selection-start-line="51" selection-start-column="0" selection-end-line="51" selection-end-column="0" /> |
| 2821 |
|
- |
<folding> |
| 2822 |
|
- |
<element signature="imports" expanded="false" /> |
| 2823 |
|
- |
</folding> |
| |
2867 |
+ |
<caret line="16" column="95" selection-start-line="16" selection-start-column="95" selection-end-line="16" selection-end-column="95" /> |
| 2824 |
2868 |
|
</state> |
| 2825 |
2869 |
|
</provider> |
| 2826 |
2870 |
|
</entry> |
| 2827 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml"> |
| 2828 |
|
- |
<provider selected="true" editor-type-id="android-designer"> |
| 2829 |
|
- |
<state /> |
| 2830 |
|
- |
</provider> |
| 2831 |
|
- |
<provider editor-type-id="text-editor"> |
| |
2871 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/View/RoundedImageView.java"> |
| |
2872 |
+ |
<provider selected="true" editor-type-id="text-editor"> |
| 2832 |
2873 |
|
<state vertical-scroll-proportion="0.0"> |
| 2833 |
|
- |
<caret line="7" column="4" selection-start-line="7" selection-start-column="4" selection-end-line="7" selection-end-column="4" /> |
| |
2874 |
+ |
<caret line="64" column="43" selection-start-line="64" selection-start-column="43" selection-end-line="64" selection-end-column="43" /> |
| 2834 |
2875 |
|
<folding /> |
| 2835 |
2876 |
|
</state> |
| 2836 |
2877 |
|
</provider> |
| 2837 |
2878 |
|
</entry> |
| 2838 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_recensione.xml"> |
| |
2879 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_demo.xml"> |
| 2839 |
2880 |
|
<provider editor-type-id="android-designer"> |
| 2840 |
2881 |
|
<state /> |
| 2841 |
2882 |
|
</provider> |
| 2842 |
2883 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2843 |
|
- |
<state vertical-scroll-proportion="-1.1034483"> |
| 2844 |
|
- |
<caret line="48" column="16" selection-start-line="48" selection-start-column="16" selection-end-line="48" selection-end-column="16" /> |
| |
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" /> |
| 2845 |
2886 |
|
<folding /> |
| 2846 |
2887 |
|
</state> |
| 2847 |
2888 |
|
</provider> |
| 2848 |
2889 |
|
</entry> |
| 2849 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/spinner_back.xml"> |
| |
2890 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/dimens.xml"> |
| 2850 |
2891 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2851 |
2892 |
|
<state vertical-scroll-proportion="0.0"> |
| 2852 |
|
- |
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
| |
2893 |
+ |
<caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" /> |
| 2853 |
2894 |
|
<folding /> |
| 2854 |
2895 |
|
</state> |
| 2855 |
2896 |
|
</provider> |
| 2856 |
2897 |
|
</entry> |
| 2857 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml"> |
| |
2898 |
+ |
<entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/widget/LinearLayout.java"> |
| 2858 |
2899 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2859 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2860 |
|
- |
<caret line="42" column="61" selection-start-line="42" selection-start-column="61" selection-end-line="42" selection-end-column="61" /> |
| |
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" /> |
| 2861 |
2902 |
|
<folding /> |
| 2862 |
2903 |
|
</state> |
| 2863 |
2904 |
|
</provider> |
| 2864 |
2905 |
|
</entry> |
| 2865 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/ration.xml"> |
| |
2906 |
+ |
<entry file="file://$PROJECT_DIR$/app/app.iml"> |
| 2866 |
2907 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2867 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| |
2908 |
+ |
<state vertical-scroll-proportion="-1.0304115"> |
| 2868 |
2909 |
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
| 2869 |
2910 |
|
<folding /> |
| 2870 |
2911 |
|
</state> |
| 2871 |
2912 |
|
</provider> |
| 2872 |
2913 |
|
</entry> |
| 2873 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml"> |
| 2874 |
|
- |
<provider selected="true" editor-type-id="android-designer"> |
| 2875 |
|
- |
<state /> |
| 2876 |
|
- |
</provider> |
| 2877 |
|
- |
<provider editor-type-id="text-editor"> |
| 2878 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2879 |
|
- |
<caret line="2" column="40" selection-start-line="2" selection-start-column="40" selection-end-line="2" selection-end-column="40" /> |
| |
2914 |
+ |
<entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/widget/RelativeLayout.java"> |
| |
2915 |
+ |
<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" /> |
| 2880 |
2918 |
|
<folding /> |
| 2881 |
2919 |
|
</state> |
| 2882 |
2920 |
|
</provider> |
| 2883 |
2921 |
|
</entry> |
| 2884 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/base.png"> |
| 2885 |
|
- |
<provider selected="true" editor-type-id="images"> |
| 2886 |
|
- |
<state /> |
| |
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" /> |
| 2887 |
2925 |
|
</provider> |
| 2888 |
2926 |
|
</entry> |
| 2889 |
|
- |
<entry file="file://$PROJECT_DIR$/local.properties"> |
| |
2927 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_full_info.xml"> |
| |
2928 |
+ |
<provider editor-type-id="android-designer"> |
| |
2929 |
+ |
<state /> |
| |
2930 |
+ |
</provider> |
| 2890 |
2931 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2891 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2892 |
|
- |
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
| |
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" /> |
| 2893 |
2934 |
|
<folding /> |
| 2894 |
2935 |
|
</state> |
| 2895 |
2936 |
|
</provider> |
| 2896 |
2937 |
|
</entry> |
| 2897 |
|
- |
<entry file="file://$PROJECT_DIR$/build.gradle"> |
| |
2938 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/circle_violet.xml"> |
| 2898 |
2939 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2899 |
|
- |
<state vertical-scroll-proportion="-4.148148"> |
| 2900 |
|
- |
<caret line="7" column="55" selection-start-line="7" selection-start-column="55" selection-end-line="7" selection-end-column="55" /> |
| |
2940 |
+ |
<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" /> |
| 2901 |
2942 |
|
<folding /> |
| 2902 |
2943 |
|
</state> |
| 2903 |
2944 |
|
</provider> |
| 2904 |
2945 |
|
</entry> |
| 2905 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable-hdpi/ic_settings_white_24dp.png"> |
| 2906 |
|
- |
<provider selected="true" editor-type-id="images"> |
| |
2946 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/commento_layout.xml"> |
| |
2947 |
+ |
<provider editor-type-id="android-designer"> |
| 2907 |
2948 |
|
<state /> |
| 2908 |
2949 |
|
</provider> |
| 2909 |
|
- |
</entry> |
| 2910 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/PrefsManager.java"> |
| 2911 |
2950 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2912 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2913 |
|
- |
<caret line="100" column="56" selection-start-line="100" selection-start-column="56" selection-end-line="100" selection-end-column="56" /> |
| |
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" /> |
| 2914 |
2953 |
|
<folding /> |
| 2915 |
2954 |
|
</state> |
| 2916 |
2955 |
|
</provider> |
| 2917 |
2956 |
|
</entry> |
| 2918 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingsActivity.java"> |
| |
2957 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml"> |
| |
2958 |
+ |
<provider editor-type-id="android-designer"> |
| |
2959 |
+ |
<state /> |
| |
2960 |
+ |
</provider> |
| 2919 |
2961 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2920 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2921 |
|
- |
<caret line="37" column="69" selection-start-line="37" selection-start-column="69" selection-end-line="37" selection-end-column="69" /> |
| |
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" /> |
| 2922 |
2964 |
|
<folding> |
| 2923 |
|
- |
<element signature="e#1457#1603#0" expanded="false" /> |
| 2924 |
|
- |
<element signature="e#1602#1603#0" expanded="false" /> |
| |
2965 |
+ |
<element signature="e#1034#1053#0" expanded="false" /> |
| 2925 |
2966 |
|
</folding> |
| 2926 |
2967 |
|
</state> |
| 2927 |
2968 |
|
</provider> |
| 2928 |
2969 |
|
</entry> |
| 2929 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_settings.xml"> |
| |
2970 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_intro.xml"> |
| 2930 |
2971 |
|
<provider editor-type-id="android-designer"> |
| 2931 |
2972 |
|
<state /> |
| 2932 |
2973 |
|
</provider> |
| 2933 |
2974 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2934 |
|
- |
<state vertical-scroll-proportion="-7.0"> |
| 2935 |
|
- |
<caret line="24" column="56" selection-start-line="24" selection-start-column="56" selection-end-line="24" selection-end-column="56" /> |
| |
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 /> |
| |
2978 |
+ |
</state> |
| |
2979 |
+ |
</provider> |
| |
2980 |
+ |
</entry> |
| |
2981 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/AppIntroFragment.java"> |
| |
2982 |
+ |
<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" /> |
| 2936 |
2985 |
|
<folding> |
| 2937 |
|
- |
<element signature="e#851#869#0" expanded="true" /> |
| 2938 |
|
- |
<element signature="e#909#927#0" expanded="true" /> |
| 2939 |
|
- |
<element signature="e#966#984#0" expanded="true" /> |
| 2940 |
|
- |
<element signature="e#1067#1086#0" expanded="true" /> |
| 2941 |
|
- |
<element signature="e#1675#1706#0" expanded="true" /> |
| 2942 |
|
- |
<element signature="e#1748#1763#0" expanded="true" /> |
| 2943 |
|
- |
<element signature="e#2003#2037#0" expanded="true" /> |
| 2944 |
|
- |
<element signature="e#2079#2094#0" expanded="true" /> |
| 2945 |
|
- |
<element signature="e#2530#2548#0" expanded="true" /> |
| 2946 |
|
- |
<element signature="e#2588#2606#0" expanded="true" /> |
| 2947 |
|
- |
<element signature="e#2645#2663#0" expanded="true" /> |
| 2948 |
|
- |
<element signature="e#2704#2722#0" expanded="true" /> |
| 2949 |
|
- |
<element signature="e#2805#2824#0" expanded="true" /> |
| 2950 |
|
- |
<element signature="e#3413#3451#0" expanded="true" /> |
| 2951 |
|
- |
<element signature="e#3493#3508#0" expanded="true" /> |
| 2952 |
|
- |
<element signature="e#3748#3789#0" expanded="true" /> |
| 2953 |
|
- |
<element signature="e#3831#3846#0" expanded="true" /> |
| |
2986 |
+ |
<element signature="imports" expanded="false" /> |
| 2954 |
2987 |
|
</folding> |
| 2955 |
2988 |
|
</state> |
| 2956 |
2989 |
|
</provider> |
| 2957 |
2990 |
|
</entry> |
| 2958 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml"> |
| 2959 |
|
- |
<provider editor-type-id="android-designer"> |
| 2960 |
|
- |
<state /> |
| 2961 |
|
- |
</provider> |
| |
2991 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/IntroActivity.java"> |
| 2962 |
2992 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2963 |
|
- |
<state vertical-scroll-proportion="-0.27862597"> |
| 2964 |
|
- |
<caret line="133" column="56" selection-start-line="133" selection-start-column="56" selection-end-line="133" selection-end-column="56" /> |
| 2965 |
|
- |
<folding /> |
| |
2993 |
+ |
<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" /> |
| |
2995 |
+ |
<folding> |
| |
2996 |
+ |
<element signature="imports" expanded="false" /> |
| |
2997 |
+ |
<element signature="e#428#466#0" expanded="false" /> |
| |
2998 |
+ |
<element signature="e#728#766#0" expanded="false" /> |
| |
2999 |
+ |
</folding> |
| 2966 |
3000 |
|
</state> |
| 2967 |
3001 |
|
</provider> |
| 2968 |
3002 |
|
</entry> |
| |
@@ -2971,329 +3005,330 @@ |
| 2971 |
3005 |
|
<state /> |
| 2972 |
3006 |
|
</provider> |
| 2973 |
3007 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2974 |
|
- |
<state vertical-scroll-proportion="-1.6428572"> |
| 2975 |
|
- |
<caret line="488" column="0" selection-start-line="488" selection-start-column="0" selection-end-line="488" selection-end-column="0" /> |
| |
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" /> |
| 2976 |
3010 |
|
<folding /> |
| 2977 |
3011 |
|
</state> |
| 2978 |
3012 |
|
</provider> |
| 2979 |
3013 |
|
</entry> |
| 2980 |
|
- |
<entry file="file://$PROJECT_DIR$/gradle.properties"> |
| |
3014 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values-v21/styles.xml"> |
| 2981 |
3015 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2982 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2983 |
|
- |
<caret line="16" column="95" selection-start-line="16" selection-start-column="95" selection-end-line="16" selection-end-column="95" /> |
| |
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" /> |
| 2984 |
3018 |
|
<folding /> |
| 2985 |
3019 |
|
</state> |
| 2986 |
3020 |
|
</provider> |
| 2987 |
3021 |
|
</entry> |
| 2988 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/HttpClient.java"> |
| |
3022 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/styles.xml"> |
| 2989 |
3023 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2990 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2991 |
|
- |
<caret line="135" column="19" selection-start-line="135" selection-start-column="19" selection-end-line="135" selection-end-column="19" /> |
| |
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" /> |
| 2992 |
3026 |
|
<folding /> |
| 2993 |
3027 |
|
</state> |
| 2994 |
3028 |
|
</provider> |
| 2995 |
3029 |
|
</entry> |
| 2996 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/View/RoundedImageView.java"> |
| |
3030 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/LoginActivity.java"> |
| 2997 |
3031 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2998 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2999 |
|
- |
<caret line="64" column="43" selection-start-line="64" selection-start-column="43" selection-end-line="64" selection-end-column="43" /> |
| |
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" /> |
| 3000 |
3034 |
|
<folding /> |
| 3001 |
3035 |
|
</state> |
| 3002 |
3036 |
|
</provider> |
| 3003 |
3037 |
|
</entry> |
| 3004 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java"> |
| |
3038 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SplashScreen.java"> |
| 3005 |
3039 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3006 |
3040 |
|
<state vertical-scroll-proportion="0.0"> |
| 3007 |
|
- |
<caret line="107" column="19" selection-start-line="107" selection-start-column="19" selection-end-line="107" selection-end-column="19" /> |
| |
3041 |
+ |
<caret line="69" column="33" selection-start-line="69" selection-start-column="0" selection-end-line="70" selection-end-column="0" /> |
| 3008 |
3042 |
|
<folding /> |
| 3009 |
3043 |
|
</state> |
| 3010 |
3044 |
|
</provider> |
| 3011 |
3045 |
|
</entry> |
| 3012 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_full_info.xml"> |
| 3013 |
|
- |
<provider editor-type-id="android-designer"> |
| 3014 |
|
- |
<state /> |
| 3015 |
|
- |
</provider> |
| |
3046 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingsActivity.java"> |
| 3016 |
3047 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3017 |
|
- |
<state vertical-scroll-proportion="-10.0"> |
| 3018 |
|
- |
<caret line="36" column="51" selection-start-line="36" selection-start-column="51" selection-end-line="36" selection-end-column="51" /> |
| 3019 |
|
- |
<folding /> |
| |
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> |
| 3020 |
3055 |
|
</state> |
| 3021 |
3056 |
|
</provider> |
| 3022 |
3057 |
|
</entry> |
| 3023 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_demo.xml"> |
| 3024 |
|
- |
<provider editor-type-id="android-designer"> |
| 3025 |
|
- |
<state /> |
| 3026 |
|
- |
</provider> |
| |
3058 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml"> |
| 3027 |
3059 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3028 |
|
- |
<state vertical-scroll-proportion="0.03018868"> |
| 3029 |
|
- |
<caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> |
| |
3060 |
+ |
<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" /> |
| 3030 |
3062 |
|
<folding /> |
| 3031 |
3063 |
|
</state> |
| 3032 |
3064 |
|
</provider> |
| 3033 |
3065 |
|
</entry> |
| 3034 |
|
- |
<entry file="file://$PROJECT_DIR$/build/intermediates/dex-cache/cache.xml"> |
| |
3066 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/PrefsManager.java"> |
| 3035 |
3067 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3036 |
|
- |
<state vertical-scroll-proportion="0.7996422"> |
| 3037 |
|
- |
<caret line="221" column="2" selection-start-line="221" selection-start-column="2" selection-end-line="221" selection-end-column="2" /> |
| |
3068 |
+ |
<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" /> |
| 3038 |
3070 |
|
<folding /> |
| 3039 |
3071 |
|
</state> |
| 3040 |
3072 |
|
</provider> |
| 3041 |
3073 |
|
</entry> |
| 3042 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RecensioneActivity.java"> |
| |
3074 |
+ |
<entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/net/Uri.java"> |
| 3043 |
3075 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3044 |
|
- |
<state vertical-scroll-proportion="0.42754918"> |
| 3045 |
|
- |
<caret line="235" column="24" selection-start-line="235" selection-start-column="24" selection-end-line="235" selection-end-column="24" /> |
| 3046 |
|
- |
<folding /> |
| |
3076 |
+ |
<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> |
| 3047 |
3082 |
|
</state> |
| 3048 |
3083 |
|
</provider> |
| 3049 |
3084 |
|
</entry> |
| 3050 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml"> |
| |
3085 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml"> |
| 3051 |
3086 |
|
<provider editor-type-id="android-designer"> |
| 3052 |
3087 |
|
<state /> |
| 3053 |
3088 |
|
</provider> |
| 3054 |
3089 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3055 |
|
- |
<state vertical-scroll-proportion="-1.1034483"> |
| 3056 |
|
- |
<caret line="2" column="4" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="4" /> |
| |
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" /> |
| 3057 |
3092 |
|
<folding /> |
| 3058 |
3093 |
|
</state> |
| 3059 |
3094 |
|
</provider> |
| 3060 |
3095 |
|
</entry> |
| 3061 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SplashScreen.java"> |
| |
3096 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml"> |
| 3062 |
3097 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3063 |
|
- |
<state vertical-scroll-proportion="0.22898032"> |
| 3064 |
|
- |
<caret line="30" column="81" selection-start-line="30" selection-start-column="81" selection-end-line="30" selection-end-column="81" /> |
| |
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" /> |
| 3065 |
3100 |
|
<folding /> |
| 3066 |
3101 |
|
</state> |
| 3067 |
3102 |
|
</provider> |
| 3068 |
3103 |
|
</entry> |
| 3069 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SelectionActivity.java"> |
| |
3104 |
+ |
<entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/view/View.java"> |
| 3070 |
3105 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3071 |
|
- |
<state vertical-scroll-proportion="0.4293381"> |
| 3072 |
|
- |
<caret line="28" column="35" selection-start-line="28" selection-start-column="35" selection-end-line="28" selection-end-column="35" /> |
| |
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" /> |
| 3073 |
3108 |
|
<folding /> |
| 3074 |
3109 |
|
</state> |
| 3075 |
3110 |
|
</provider> |
| 3076 |
3111 |
|
</entry> |
| 3077 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java"> |
| |
3112 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml"> |
| |
3113 |
+ |
<provider editor-type-id="android-designer"> |
| |
3114 |
+ |
<state /> |
| |
3115 |
+ |
</provider> |
| |
3116 |
+ |
<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 |
+ |
<folding /> |
| |
3120 |
+ |
</state> |
| |
3121 |
+ |
</provider> |
| |
3122 |
+ |
</entry> |
| |
3123 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java"> |
| 3078 |
3124 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3079 |
|
- |
<state vertical-scroll-proportion="-3.236136"> |
| 3080 |
|
- |
<caret line="390" column="13" selection-start-line="390" selection-start-column="13" selection-end-line="390" selection-end-column="13" /> |
| |
3125 |
+ |
<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" /> |
| 3081 |
3127 |
|
<folding> |
| 3082 |
|
- |
<element signature="e#4246#4281#0" expanded="false" /> |
| |
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" /> |
| 3083 |
3153 |
|
</folding> |
| 3084 |
3154 |
|
</state> |
| 3085 |
3155 |
|
</provider> |
| 3086 |
3156 |
|
</entry> |
| 3087 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/circle_violet.xml"> |
| |
3157 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SetPositionLocaleActivity.java"> |
| 3088 |
3158 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3089 |
3159 |
|
<state vertical-scroll-proportion="0.0"> |
| 3090 |
|
- |
<caret line="8" column="37" selection-start-line="8" selection-start-column="37" selection-end-line="8" selection-end-column="37" /> |
| 3091 |
|
- |
<folding /> |
| |
3160 |
+ |
<caret line="59" column="42" selection-start-line="59" selection-start-column="42" selection-end-line="59" selection-end-column="42" /> |
| |
3161 |
+ |
<folding> |
| |
3162 |
+ |
<element signature="imports" expanded="true" /> |
| |
3163 |
+ |
</folding> |
| 3092 |
3164 |
|
</state> |
| 3093 |
3165 |
|
</provider> |
| 3094 |
3166 |
|
</entry> |
| 3095 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/commento_layout.xml"> |
| |
3167 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_set_position_locale.xml"> |
| 3096 |
3168 |
|
<provider editor-type-id="android-designer"> |
| 3097 |
3169 |
|
<state /> |
| 3098 |
3170 |
|
</provider> |
| 3099 |
3171 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3100 |
|
- |
<state vertical-scroll-proportion="0.6981132"> |
| 3101 |
|
- |
<caret line="69" column="54" selection-start-line="69" selection-start-column="54" selection-end-line="69" selection-end-column="54" /> |
| 3102 |
|
- |
<folding> |
| 3103 |
|
- |
<element signature="e#254#273#0" expanded="true" /> |
| 3104 |
|
- |
<element signature="e#502#520#0" expanded="true" /> |
| 3105 |
|
- |
<element signature="e#831#849#0" expanded="true" /> |
| 3106 |
|
- |
<element signature="e#1733#1751#0" expanded="true" /> |
| 3107 |
|
- |
<element signature="e#2322#2340#0" expanded="true" /> |
| 3108 |
|
- |
<element signature="e#2370#2385#0" expanded="true" /> |
| 3109 |
|
- |
</folding> |
| |
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" /> |
| |
3174 |
+ |
<folding /> |
| 3110 |
3175 |
|
</state> |
| 3111 |
3176 |
|
</provider> |
| 3112 |
3177 |
|
</entry> |
| 3113 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/FullInfoFragment.java"> |
| |
3178 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> |
| 3114 |
3179 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3115 |
|
- |
<state vertical-scroll-proportion="0.60544217"> |
| 3116 |
|
- |
<caret line="216" column="99" selection-start-line="216" selection-start-column="99" selection-end-line="216" selection-end-column="99" /> |
| |
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" /> |
| 3117 |
3182 |
|
<folding> |
| 3118 |
|
- |
<element signature="e#9230#11229#0" expanded="false" /> |
| 3119 |
|
- |
<element signature="e#11228#11229#0" expanded="false" /> |
| 3120 |
|
- |
<element signature="e#11779#13248#0" expanded="false" /> |
| 3121 |
|
- |
<element signature="e#12638#13125#0" expanded="false" /> |
| 3122 |
|
- |
<element signature="e#13124#13125#0" expanded="false" /> |
| 3123 |
|
- |
<element signature="e#13247#13248#0" expanded="false" /> |
| |
3183 |
+ |
<element signature="e#6417#6455#0" expanded="true" /> |
| 3124 |
3184 |
|
</folding> |
| 3125 |
3185 |
|
</state> |
| 3126 |
3186 |
|
</provider> |
| 3127 |
3187 |
|
</entry> |
| 3128 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/strings.xml"> |
| |
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> |
| 3129 |
3192 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3130 |
|
- |
<state vertical-scroll-proportion="0.7593985"> |
| 3131 |
|
- |
<caret line="130" column="52" selection-start-line="130" selection-start-column="52" selection-end-line="130" selection-end-column="52" /> |
| |
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" /> |
| 3132 |
3195 |
|
<folding /> |
| 3133 |
3196 |
|
</state> |
| 3134 |
3197 |
|
</provider> |
| 3135 |
3198 |
|
</entry> |
| 3136 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/dimens.xml"> |
| |
3199 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RecensioneActivity.java"> |
| 3137 |
3200 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3138 |
3201 |
|
<state vertical-scroll-proportion="0.0"> |
| 3139 |
|
- |
<caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" /> |
| |
3202 |
+ |
<caret line="56" column="42" selection-start-line="56" selection-start-column="42" selection-end-line="56" selection-end-column="42" /> |
| 3140 |
3203 |
|
<folding /> |
| 3141 |
3204 |
|
</state> |
| 3142 |
3205 |
|
</provider> |
| 3143 |
3206 |
|
</entry> |
| 3144 |
|
- |
<entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/widget/LinearLayout.java"> |
| |
3207 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingSelectionActivity.java"> |
| 3145 |
3208 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3146 |
|
- |
<state vertical-scroll-proportion="0.33273703"> |
| 3147 |
|
- |
<caret line="62" column="13" selection-start-line="62" selection-start-column="13" selection-end-line="62" selection-end-column="13" /> |
| |
3209 |
+ |
<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" /> |
| 3148 |
3211 |
|
<folding /> |
| 3149 |
3212 |
|
</state> |
| 3150 |
3213 |
|
</provider> |
| 3151 |
3214 |
|
</entry> |
| 3152 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> |
| |
3215 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml"> |
| |
3216 |
+ |
<provider editor-type-id="android-designer"> |
| |
3217 |
+ |
<state /> |
| |
3218 |
+ |
</provider> |
| 3153 |
3219 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3154 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 3155 |
|
- |
<caret line="133" column="43" selection-start-line="133" selection-start-column="43" selection-end-line="133" selection-end-column="43" /> |
| 3156 |
|
- |
<folding /> |
| |
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> |
| 3157 |
3237 |
|
</state> |
| 3158 |
3238 |
|
</provider> |
| 3159 |
3239 |
|
</entry> |
| 3160 |
|
- |
<entry file="file://$PROJECT_DIR$/app/app.iml"> |
| |
3240 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_manager.xml"> |
| |
3241 |
+ |
<provider editor-type-id="android-designer"> |
| |
3242 |
+ |
<state /> |
| |
3243 |
+ |
</provider> |
| 3161 |
3244 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3162 |
|
- |
<state vertical-scroll-proportion="-1.0304115"> |
| 3163 |
|
- |
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
| |
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" /> |
| 3164 |
3268 |
|
<folding /> |
| 3165 |
3269 |
|
</state> |
| 3166 |
3270 |
|
</provider> |
| 3167 |
3271 |
|
</entry> |
| 3168 |
|
- |
<entry file="file://$PROJECT_DIR$/app/build/intermediates/manifests/full/debug/AndroidManifest.xml"> |
| |
3272 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/CallService.java"> |
| 3169 |
3273 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3170 |
|
- |
<state vertical-scroll-proportion="0.36842105"> |
| 3171 |
|
- |
<caret line="141" column="27" selection-start-line="141" selection-start-column="27" selection-end-line="141" selection-end-column="27" /> |
| |
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" /> |
| 3172 |
3276 |
|
<folding /> |
| 3173 |
3277 |
|
</state> |
| 3174 |
3278 |
|
</provider> |
| 3175 |
3279 |
|
</entry> |
| 3176 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml"> |
| |
3280 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/HttpClient.java"> |
| 3177 |
3281 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3178 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 3179 |
|
- |
<caret line="9" column="90" selection-start-line="9" selection-start-column="90" selection-end-line="9" selection-end-column="90" /> |
| |
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" /> |
| 3180 |
3284 |
|
<folding /> |
| 3181 |
3285 |
|
</state> |
| 3182 |
3286 |
|
</provider> |
| 3183 |
3287 |
|
</entry> |
| 3184 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/LoginActivity.java"> |
| |
3288 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java"> |
| 3185 |
3289 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3186 |
3290 |
|
<state vertical-scroll-proportion="0.0"> |
| 3187 |
|
- |
<caret line="221" column="21" selection-start-line="221" selection-start-column="21" selection-end-line="221" selection-end-column="21" /> |
| |
3291 |
+ |
<caret line="121" column="0" selection-start-line="121" selection-start-column="0" selection-end-line="121" selection-end-column="0" /> |
| 3188 |
3292 |
|
<folding> |
| 3189 |
|
- |
<element signature="e#4144#5205#0" expanded="true" /> |
| 3190 |
|
- |
<element signature="e#5204#5205#0" expanded="true" /> |
| 3191 |
|
- |
<element signature="e#8771#8805#0" expanded="true" /> |
| |
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" /> |
| 3192 |
3298 |
|
</folding> |
| 3193 |
3299 |
|
</state> |
| 3194 |
3300 |
|
</provider> |
| 3195 |
3301 |
|
</entry> |
| 3196 |
|
- |
<entry file="file://$USER_HOME$/AppData/Local/Android/sdk/sources/android-22/android/widget/RelativeLayout.java"> |
| |
3302 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SelectionActivity.java"> |
| 3197 |
3303 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3198 |
|
- |
<state vertical-scroll-proportion="0.33333334"> |
| 3199 |
|
- |
<caret line="1734" column="0" selection-start-line="1734" selection-start-column="0" selection-end-line="1734" selection-end-column="0" /> |
| |
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" /> |
| 3200 |
3306 |
|
<folding /> |
| 3201 |
3307 |
|
</state> |
| 3202 |
3308 |
|
</provider> |
| 3203 |
3309 |
|
</entry> |
| 3204 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java"> |
| |
3310 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java"> |
| 3205 |
3311 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3206 |
3312 |
|
<state vertical-scroll-proportion="0.0"> |
| 3207 |
|
- |
<caret line="750" column="41" selection-start-line="750" selection-start-column="41" selection-end-line="750" selection-end-column="41" /> |
| 3208 |
|
- |
<folding> |
| 3209 |
|
- |
<element signature="e#2225#2242#0" expanded="true" /> |
| 3210 |
|
- |
<element signature="e#2536#2557#0" expanded="true" /> |
| 3211 |
|
- |
<element signature="e#2622#2641#0" expanded="true" /> |
| 3212 |
|
- |
<element signature="e#2706#2727#0" expanded="true" /> |
| 3213 |
|
- |
<element signature="e#3554#3575#0" expanded="true" /> |
| 3214 |
|
- |
<element signature="e#3915#3916#0" expanded="true" /> |
| 3215 |
|
- |
<element signature="e#3940#3941#0" expanded="true" /> |
| 3216 |
|
- |
<element signature="e#5630#11045#0" expanded="true" /> |
| 3217 |
|
- |
<element signature="e#5901#10928#0" expanded="true" /> |
| 3218 |
|
- |
<element signature="e#6148#6661#0" expanded="true" /> |
| 3219 |
|
- |
<element signature="e#6660#6661#0" expanded="true" /> |
| 3220 |
|
- |
<element signature="e#8232#8594#0" expanded="true" /> |
| 3221 |
|
- |
<element signature="e#8593#8594#0" expanded="true" /> |
| 3222 |
|
- |
<element signature="e#8774#9869#0" expanded="true" /> |
| 3223 |
|
- |
<element signature="e#8932#9779#0" expanded="true" /> |
| 3224 |
|
- |
<element signature="e#9778#9779#0" expanded="true" /> |
| 3225 |
|
- |
<element signature="e#9868#9869#0" expanded="true" /> |
| 3226 |
|
- |
<element signature="e#10927#10928#0" expanded="true" /> |
| 3227 |
|
- |
<element signature="e#11044#11045#0" expanded="true" /> |
| 3228 |
|
- |
<element signature="e#11615#11803#0" expanded="true" /> |
| 3229 |
|
- |
<element signature="e#11802#11803#0" expanded="true" /> |
| 3230 |
|
- |
<element signature="e#11894#13559#0" expanded="true" /> |
| 3231 |
|
- |
<element signature="e#12441#12683#0" expanded="true" /> |
| 3232 |
|
- |
<element signature="e#12682#12683#0" expanded="true" /> |
| 3233 |
|
- |
<element signature="e#12789#13532#0" expanded="true" /> |
| 3234 |
|
- |
<element signature="e#12899#13490#0" expanded="true" /> |
| 3235 |
|
- |
<element signature="e#13365#13386#0" expanded="true" /> |
| 3236 |
|
- |
<element signature="e#13489#13490#0" expanded="true" /> |
| 3237 |
|
- |
<element signature="e#13531#13532#0" expanded="true" /> |
| 3238 |
|
- |
<element signature="e#13558#13559#0" expanded="true" /> |
| 3239 |
|
- |
<element signature="e#14882#14883#0" expanded="true" /> |
| 3240 |
|
- |
<element signature="e#14925#14926#0" expanded="true" /> |
| 3241 |
|
- |
<element signature="e#15814#15815#0" expanded="true" /> |
| 3242 |
|
- |
<element signature="e#15857#15858#0" expanded="true" /> |
| 3243 |
|
- |
<element signature="e#16746#20160#0" expanded="true" /> |
| 3244 |
|
- |
<element signature="e#17351#17774#0" expanded="true" /> |
| 3245 |
|
- |
<element signature="e#17720#17741#0" expanded="true" /> |
| 3246 |
|
- |
<element signature="e#17773#17774#0" expanded="true" /> |
| 3247 |
|
- |
<element signature="e#18777#19784#0" expanded="true" /> |
| 3248 |
|
- |
<element signature="e#19039#19057#0" expanded="true" /> |
| 3249 |
|
- |
<element signature="e#19110#19140#0" expanded="true" /> |
| 3250 |
|
- |
<element signature="e#19382#19668#0" expanded="true" /> |
| 3251 |
|
- |
<element signature="e#19667#19668#0" expanded="true" /> |
| 3252 |
|
- |
<element signature="e#19783#19784#0" expanded="true" /> |
| 3253 |
|
- |
<element signature="e#20159#20160#0" expanded="true" /> |
| 3254 |
|
- |
<element signature="e#20280#20471#0" expanded="true" /> |
| 3255 |
|
- |
<element signature="e#20470#20471#0" expanded="true" /> |
| 3256 |
|
- |
<element signature="e#21152#22046#0" expanded="true" /> |
| 3257 |
|
- |
<element signature="e#22045#22046#0" expanded="true" /> |
| 3258 |
|
- |
<element signature="e#22093#22512#0" expanded="true" /> |
| 3259 |
|
- |
<element signature="e#22511#22512#0" expanded="true" /> |
| 3260 |
|
- |
<element signature="e#22574#25037#0" expanded="true" /> |
| 3261 |
|
- |
<element signature="e#23404#24515#0" expanded="true" /> |
| 3262 |
|
- |
<element signature="e#24514#24515#0" expanded="true" /> |
| 3263 |
|
- |
<element signature="e#25036#25037#0" expanded="true" /> |
| 3264 |
|
- |
<element signature="e#25111#26997#0" expanded="true" /> |
| 3265 |
|
- |
<element signature="e#25249#25591#0" expanded="true" /> |
| 3266 |
|
- |
<element signature="e#25590#25591#0" expanded="true" /> |
| 3267 |
|
- |
<element signature="e#26381#26777#0" expanded="true" /> |
| 3268 |
|
- |
<element signature="e#26776#26777#0" expanded="true" /> |
| 3269 |
|
- |
<element signature="e#26996#26997#0" expanded="true" /> |
| 3270 |
|
- |
<element signature="e#27132#27314#0" expanded="true" /> |
| 3271 |
|
- |
<element signature="e#27313#27314#0" expanded="true" /> |
| 3272 |
|
- |
<element signature="e#28489#28538#0" expanded="true" /> |
| 3273 |
|
- |
<element signature="method#AddMarker#0;class#AddMarker#0;class#MapActivity#0" expanded="false" /> |
| 3274 |
|
- |
<element signature="method#run#0;class#AddMarker#0;class#MapActivity#0" expanded="false" /> |
| 3275 |
|
- |
</folding> |
| |
3313 |
+ |
<caret line="36" column="26" selection-start-line="36" selection-start-column="8" selection-end-line="36" selection-end-column="34" /> |
| |
3314 |
+ |
<folding /> |
| 3276 |
3315 |
|
</state> |
| 3277 |
3316 |
|
</provider> |
| 3278 |
3317 |
|
</entry> |
| 3279 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml"> |
| 3280 |
|
- |
<provider editor-type-id="android-designer"> |
| 3281 |
|
- |
<state /> |
| |
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> |
| 3282 |
3324 |
|
</provider> |
| |
3325 |
+ |
</entry> |
| |
3326 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java"> |
| 3283 |
3327 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3284 |
|
- |
<state vertical-scroll-proportion="2.2087543"> |
| 3285 |
|
- |
<caret line="68" column="0" selection-start-line="68" selection-start-column="0" selection-end-line="68" selection-end-column="0" /> |
| |
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" /> |
| 3286 |
3330 |
|
<folding> |
| 3287 |
|
- |
<element signature="e#2344#2361#0" expanded="true" /> |
| 3288 |
|
- |
<element signature="e#3421#3440#0" expanded="true" /> |
| 3289 |
|
- |
<element signature="e#3892#3910#0" expanded="true" /> |
| 3290 |
|
- |
<element signature="e#4726#4745#0" expanded="true" /> |
| 3291 |
|
- |
<element signature="e#5432#5450#0" expanded="true" /> |
| 3292 |
|
- |
<element signature="e#6111#6129#0" expanded="true" /> |
| 3293 |
|
- |
<element signature="e#6224#6240#0" expanded="true" /> |
| 3294 |
|
- |
<element signature="e#6704#6730#0" expanded="true" /> |
| 3295 |
|
- |
<element signature="e#7162#7191#0" expanded="true" /> |
| 3296 |
|
- |
<element signature="e#7915#7945#0" expanded="true" /> |
| |
3331 |
+ |
<element signature="imports" expanded="true" /> |
| 3297 |
3332 |
|
</folding> |
| 3298 |
3333 |
|
</state> |
| 3299 |
3334 |
|
</provider> |
View this file contents
View the full history
Commits for