| |
@@ -16,9 +16,11 @@ |
| 16 |
16 |
|
<shared> |
| 17 |
17 |
|
<config> |
| 18 |
18 |
|
<devices> |
| |
19 |
+ |
<device id="Nexus 5" /> |
| |
20 |
+ |
<device id="Nexus 10" /> |
| 19 |
21 |
|
<device id="Nexus 6" /> |
| |
22 |
+ |
<device id="Nexus 7 2013" /> |
| 20 |
23 |
|
<device id="Nexus 9" /> |
| 21 |
|
- |
<device id="Nexus 5" /> |
| 22 |
24 |
|
<device id="Nexus 7" /> |
| 23 |
25 |
|
</devices> |
| 24 |
26 |
|
<target>android-22</target> |
| |
@@ -58,26 +60,21 @@ |
| 58 |
60 |
|
</component> |
| 59 |
61 |
|
<component name="ChangeListManager"> |
| 60 |
62 |
|
<list default="true" readonly="true" id="dc564432-0882-4a2b-94b7-3913b736c3c7" name="Default" comment=""> |
| 61 |
|
- |
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/logoregione.png" /> |
| 62 |
|
- |
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/placeholder.jpg" /> |
| 63 |
|
- |
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/screen_region.png" /> |
| |
63 |
+ |
<change type="MOVED" beforePath="C:\Client\SmartCharging\app\src\main\res\values-w820dp\dimens.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values-sw600dp/dimens.xml" /> |
| 64 |
64 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/cache.properties.lock" /> |
| 65 |
65 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileHashes.bin" /> |
| 66 |
66 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/fileSnapshots.bin" /> |
| 67 |
67 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/outputFileStates.bin" /> |
| 68 |
68 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" afterPath="$PROJECT_DIR$/.gradle/2.2.1/taskArtifacts/taskArtifacts.bin" /> |
| 69 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java" /> |
| 70 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java" /> |
| 71 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java" afterPath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java" /> |
| 72 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java" afterPath="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java" /> |
| 73 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_register_locale.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_register_locale.xml" /> |
| |
69 |
+ |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml" /> |
| 74 |
70 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml" /> |
| 75 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml" /> |
| |
71 |
+ |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml" /> |
| 76 |
72 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/build.gradle" afterPath="$PROJECT_DIR$/app/build.gradle" /> |
| 77 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/drawable/button_color_state.xml" afterPath="$PROJECT_DIR$/app/src/main/res/drawable/button_color_state.xml" /> |
| |
73 |
+ |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/src/main/res/values/dimens.xml" afterPath="$PROJECT_DIR$/app/src/main/res/values/dimens.xml" /> |
| |
74 |
+ |
<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" /> |
| 78 |
75 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/local.properties" afterPath="$PROJECT_DIR$/local.properties" /> |
| 79 |
|
- |
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/misc.xml" afterPath="$PROJECT_DIR$/.idea/misc.xml" /> |
| 80 |
76 |
|
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> |
| |
77 |
+ |
<change type="MOVED" beforePath="C:\Client\SmartCharging\app\src\main\res\values-w820dp" afterPath="$PROJECT_DIR$/app/src/main/res/values-sw600dp" /> |
| 81 |
78 |
|
</list> |
| 82 |
79 |
|
<ignored path="SmartCharging.iws" /> |
| 83 |
80 |
|
<ignored path=".idea/workspace.xml" /> |
| |
@@ -107,109 +104,100 @@ |
| 107 |
104 |
|
</component> |
| 108 |
105 |
|
<component name="FileEditorManager"> |
| 109 |
106 |
|
<leaf> |
| 110 |
|
- |
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="false"> |
| |
107 |
+ |
<file leaf-file-name="build.gradle" pinned="false" current-in-tab="true"> |
| 111 |
108 |
|
<entry file="file://$PROJECT_DIR$/app/build.gradle"> |
| 112 |
109 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 113 |
110 |
|
<state vertical-scroll-proportion="0.0"> |
| 114 |
|
- |
<caret line="15" column="24" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" /> |
| |
111 |
+ |
<caret line="14" column="21" selection-start-line="14" selection-start-column="21" selection-end-line="14" selection-end-column="21" /> |
| 115 |
112 |
|
<folding /> |
| 116 |
113 |
|
</state> |
| 117 |
114 |
|
</provider> |
| 118 |
115 |
|
</entry> |
| 119 |
116 |
|
</file> |
| 120 |
|
- |
<file leaf-file-name="RegisterActivity.java" pinned="false" current-in-tab="false"> |
| 121 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java"> |
| |
117 |
+ |
<file leaf-file-name="activity_splash.xml" pinned="false" current-in-tab="false"> |
| |
118 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml"> |
| 122 |
119 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 123 |
120 |
|
<state vertical-scroll-proportion="0.0"> |
| 124 |
|
- |
<caret line="514" column="24" selection-start-line="514" selection-start-column="24" selection-end-line="516" selection-end-column="47" /> |
| |
121 |
+ |
<caret line="13" column="48" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" /> |
| 125 |
122 |
|
<folding /> |
| 126 |
123 |
|
</state> |
| 127 |
124 |
|
</provider> |
| |
125 |
+ |
<provider editor-type-id="android-designer"> |
| |
126 |
+ |
<state /> |
| |
127 |
+ |
</provider> |
| 128 |
128 |
|
</entry> |
| 129 |
129 |
|
</file> |
| 130 |
|
- |
<file leaf-file-name="ManagerActivity.java" pinned="false" current-in-tab="false"> |
| 131 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java"> |
| |
130 |
+ |
<file leaf-file-name="activity_selection.xml" pinned="false" current-in-tab="false"> |
| |
131 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml"> |
| 132 |
132 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 133 |
133 |
|
<state vertical-scroll-proportion="0.0"> |
| 134 |
|
- |
<caret line="293" column="33" selection-start-line="293" selection-start-column="33" selection-end-line="293" selection-end-column="33" /> |
| 135 |
|
- |
<folding> |
| 136 |
|
- |
<element signature="e#2461#2483#0" expanded="true" /> |
| 137 |
|
- |
<element signature="e#7565#7589#0" expanded="true" /> |
| 138 |
|
- |
<element signature="e#8972#9004#0" expanded="true" /> |
| 139 |
|
- |
<element signature="e#10451#12566#0" expanded="true" /> |
| 140 |
|
- |
<element signature="e#11597#11849#0" expanded="true" /> |
| 141 |
|
- |
<element signature="e#11759#11783#0" expanded="true" /> |
| 142 |
|
- |
<element signature="e#12063#12101#0" expanded="true" /> |
| 143 |
|
- |
<element signature="e#12565#12566#0" expanded="true" /> |
| 144 |
|
- |
<element signature="e#12897#12927#0" expanded="true" /> |
| 145 |
|
- |
</folding> |
| |
134 |
+ |
<caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> |
| |
135 |
+ |
<folding /> |
| 146 |
136 |
|
</state> |
| 147 |
137 |
|
</provider> |
| |
138 |
+ |
<provider editor-type-id="android-designer"> |
| |
139 |
+ |
<state /> |
| |
140 |
+ |
</provider> |
| 148 |
141 |
|
</entry> |
| 149 |
142 |
|
</file> |
| 150 |
|
- |
<file leaf-file-name="SplashScreen.java" pinned="false" current-in-tab="false"> |
| 151 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SplashScreen.java"> |
| |
143 |
+ |
<file leaf-file-name="dimens.xml" pinned="false" current-in-tab="false"> |
| |
144 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values-sw600dp/dimens.xml"> |
| 152 |
145 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 153 |
146 |
|
<state vertical-scroll-proportion="0.0"> |
| 154 |
|
- |
<caret line="29" column="71" selection-start-line="29" selection-start-column="71" selection-end-line="29" selection-end-column="71" /> |
| |
147 |
+ |
<caret line="6" column="40" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" /> |
| 155 |
148 |
|
<folding /> |
| 156 |
149 |
|
</state> |
| 157 |
150 |
|
</provider> |
| 158 |
151 |
|
</entry> |
| 159 |
152 |
|
</file> |
| 160 |
|
- |
<file leaf-file-name="activity_splash.xml" pinned="false" current-in-tab="false"> |
| 161 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml"> |
| |
153 |
+ |
<file leaf-file-name="activity_login2.xml" pinned="false" current-in-tab="false"> |
| |
154 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml"> |
| |
155 |
+ |
<provider selected="true" editor-type-id="text-editor"> |
| |
156 |
+ |
<state vertical-scroll-proportion="0.0"> |
| |
157 |
+ |
<caret line="13" column="47" selection-start-line="13" selection-start-column="47" selection-end-line="13" selection-end-column="47" /> |
| |
158 |
+ |
<folding /> |
| |
159 |
+ |
</state> |
| |
160 |
+ |
</provider> |
| 162 |
161 |
|
<provider editor-type-id="android-designer"> |
| 163 |
162 |
|
<state /> |
| 164 |
163 |
|
</provider> |
| |
164 |
+ |
</entry> |
| |
165 |
+ |
</file> |
| |
166 |
+ |
<file leaf-file-name="dimens.xml" pinned="false" current-in-tab="false"> |
| |
167 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/dimens.xml"> |
| 165 |
168 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 166 |
|
- |
<state vertical-scroll-proportion="1.0689656"> |
| 167 |
|
- |
<caret line="13" column="48" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" /> |
| 168 |
|
- |
<folding> |
| 169 |
|
- |
<element signature="e#1224#1243#0" expanded="true" /> |
| 170 |
|
- |
</folding> |
| |
169 |
+ |
<state vertical-scroll-proportion="0.0"> |
| |
170 |
+ |
<caret line="22" column="30" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="30" /> |
| |
171 |
+ |
<folding /> |
| 171 |
172 |
|
</state> |
| 172 |
173 |
|
</provider> |
| 173 |
174 |
|
</entry> |
| 174 |
175 |
|
</file> |
| 175 |
|
- |
<file leaf-file-name="activity_selection.xml" pinned="false" current-in-tab="true"> |
| 176 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml"> |
| 177 |
|
- |
<provider editor-type-id="android-designer"> |
| 178 |
|
- |
<state /> |
| 179 |
|
- |
</provider> |
| |
176 |
+ |
<file leaf-file-name="google_maps_api.xml" pinned="false" current-in-tab="false"> |
| |
177 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml"> |
| 180 |
178 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 181 |
|
- |
<state vertical-scroll-proportion="0.798005"> |
| 182 |
|
- |
<caret line="95" column="45" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="45" /> |
| 183 |
|
- |
<folding> |
| 184 |
|
- |
<element signature="e#4221#4240#0" expanded="true" /> |
| 185 |
|
- |
<element signature="e#4288#4307#0" expanded="true" /> |
| 186 |
|
- |
</folding> |
| |
179 |
+ |
<state vertical-scroll-proportion="0.0"> |
| |
180 |
+ |
<caret line="18" column="47" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" /> |
| |
181 |
+ |
<folding /> |
| 187 |
182 |
|
</state> |
| 188 |
183 |
|
</provider> |
| 189 |
184 |
|
</entry> |
| 190 |
185 |
|
</file> |
| 191 |
186 |
|
<file leaf-file-name="activity_setting_selection.xml" pinned="false" current-in-tab="false"> |
| 192 |
187 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml"> |
| 193 |
|
- |
<provider editor-type-id="android-designer"> |
| 194 |
|
- |
<state /> |
| 195 |
|
- |
</provider> |
| 196 |
188 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 197 |
|
- |
<state vertical-scroll-proportion="-3.862069"> |
| 198 |
|
- |
<caret line="20" column="29" selection-start-line="20" selection-start-column="29" selection-end-line="20" selection-end-column="29" /> |
| |
189 |
+ |
<state vertical-scroll-proportion="0.0"> |
| |
190 |
+ |
<caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" /> |
| 199 |
191 |
|
<folding /> |
| 200 |
192 |
|
</state> |
| 201 |
193 |
|
</provider> |
| 202 |
|
- |
</entry> |
| 203 |
|
- |
</file> |
| 204 |
|
- |
<file leaf-file-name="screen1.png" pinned="false" current-in-tab="false"> |
| 205 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/screen1.png"> |
| 206 |
|
- |
<provider selected="true" editor-type-id="images"> |
| |
194 |
+ |
<provider editor-type-id="android-designer"> |
| 207 |
195 |
|
<state /> |
| 208 |
196 |
|
</provider> |
| 209 |
197 |
|
</entry> |
| 210 |
198 |
|
</file> |
| 211 |
|
- |
<file leaf-file-name="logo.png" pinned="false" current-in-tab="false"> |
| 212 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/logo.png"> |
| |
199 |
+ |
<file leaf-file-name="screen1.png" pinned="false" current-in-tab="false"> |
| |
200 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/screen1.png"> |
| 213 |
201 |
|
<provider selected="true" editor-type-id="images"> |
| 214 |
202 |
|
<state /> |
| 215 |
203 |
|
</provider> |
| |
@@ -1554,7 +1542,7 @@ |
| 1554 |
1542 |
|
<option name="modificationStamps"> |
| 1555 |
1543 |
|
<map> |
| 1556 |
1544 |
|
<entry key="$PROJECT_DIR$" value="4304472899838" /> |
| 1557 |
|
- |
<entry key="C:\Client\SmartCharging" value="4325279797338" /> |
| |
1545 |
+ |
<entry key="C:\Client\SmartCharging" value="4325367841608" /> |
| 1558 |
1546 |
|
<entry key="C:\Nextrek\SmartCharging" value="4321472708485" /> |
| 1559 |
1547 |
|
<entry key="C:\SmartCharging\SmartCharging" value="4308458371987" /> |
| 1560 |
1548 |
|
</map> |
| |
@@ -1798,9 +1786,6 @@ |
| 1798 |
1786 |
|
<component name="IdeDocumentHistory"> |
| 1799 |
1787 |
|
<option name="CHANGED_PATHS"> |
| 1800 |
1788 |
|
<list> |
| 1801 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/ManagerActivity.java" /> |
| 1802 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/CallService.java" /> |
| 1803 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/layout/local_item.xml" /> |
| 1804 |
1789 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ImageManagerActivity.java" /> |
| 1805 |
1790 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_image_manager.xml" /> |
| 1806 |
1791 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingSelectionActivity.java" /> |
| |
@@ -1826,7 +1811,6 @@ |
| 1826 |
1811 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/fragment_intro.xml" /> |
| 1827 |
1812 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/IntroActivity.java" /> |
| 1828 |
1813 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/FullInfoFragment.java" /> |
| 1829 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml" /> |
| 1830 |
1814 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingsActivity.java" /> |
| 1831 |
1815 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/PrefsManager.java" /> |
| 1832 |
1816 |
|
<option value="$PROJECT_DIR$/app/src/main/res/values/strings.xml" /> |
| |
@@ -1834,7 +1818,6 @@ |
| 1834 |
1818 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_set_position_locale.xml" /> |
| 1835 |
1819 |
|
<option value="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" /> |
| 1836 |
1820 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_manager.xml" /> |
| 1837 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml" /> |
| 1838 |
1821 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/HttpClient.java" /> |
| 1839 |
1822 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SelectionActivity.java" /> |
| 1840 |
1823 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_recensione.xml" /> |
| |
@@ -1845,10 +1828,15 @@ |
| 1845 |
1828 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java" /> |
| 1846 |
1829 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/RegisterActivity.java" /> |
| 1847 |
1830 |
|
<option value="$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/ManagerActivity.java" /> |
| 1848 |
|
- |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml" /> |
| 1849 |
1831 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml" /> |
| 1850 |
|
- |
<option value="$PROJECT_DIR$/app/build.gradle" /> |
| |
1832 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml" /> |
| |
1833 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/values-w820dp/dimens.xml" /> |
| |
1834 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/values/dimens.xml" /> |
| |
1835 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml" /> |
| |
1836 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/values-sw600dp/dimens.xml" /> |
| |
1837 |
+ |
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml" /> |
| 1851 |
1838 |
|
<option value="$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml" /> |
| |
1839 |
+ |
<option value="$PROJECT_DIR$/app/build.gradle" /> |
| 1852 |
1840 |
|
</list> |
| 1853 |
1841 |
|
</option> |
| 1854 |
1842 |
|
</component> |
| |
@@ -1868,7 +1856,7 @@ |
| 1868 |
1856 |
|
<component name="ProjectFrameBounds"> |
| 1869 |
1857 |
|
<option name="x" value="-8" /> |
| 1870 |
1858 |
|
<option name="y" value="-8" /> |
| 1871 |
|
- |
<option name="width" value="1382" /> |
| |
1859 |
+ |
<option name="width" value="1370" /> |
| 1872 |
1860 |
|
<option name="height" value="744" /> |
| 1873 |
1861 |
|
</component> |
| 1874 |
1862 |
|
<component name="ProjectLevelVcsManager" settingsEditedManually="false"> |
| |
@@ -1968,9 +1956,6 @@ |
| 1968 |
1956 |
|
</PATH> |
| 1969 |
1957 |
|
</subPane> |
| 1970 |
1958 |
|
</pane> |
| 1971 |
|
- |
<pane id="PackagesPane" /> |
| 1972 |
|
- |
<pane id="Scope" /> |
| 1973 |
|
- |
<pane id="Scratches" /> |
| 1974 |
1959 |
|
<pane id="ProjectPane"> |
| 1975 |
1960 |
|
<subPane> |
| 1976 |
1961 |
|
<PATH> |
| |
@@ -2091,6 +2076,66 @@ |
| 2091 |
2076 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2092 |
2077 |
|
</PATH_ELEMENT> |
| 2093 |
2078 |
|
<PATH_ELEMENT> |
| |
2079 |
+ |
<option name="myItemId" value="values-sw600dp" /> |
| |
2080 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2081 |
+ |
</PATH_ELEMENT> |
| |
2082 |
+ |
</PATH> |
| |
2083 |
+ |
<PATH> |
| |
2084 |
+ |
<PATH_ELEMENT> |
| |
2085 |
+ |
<option name="myItemId" value="SmartCharging" /> |
| |
2086 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| |
2087 |
+ |
</PATH_ELEMENT> |
| |
2088 |
+ |
<PATH_ELEMENT> |
| |
2089 |
+ |
<option name="myItemId" value="SmartCharging" /> |
| |
2090 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2091 |
+ |
</PATH_ELEMENT> |
| |
2092 |
+ |
<PATH_ELEMENT> |
| |
2093 |
+ |
<option name="myItemId" value="app" /> |
| |
2094 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2095 |
+ |
</PATH_ELEMENT> |
| |
2096 |
+ |
<PATH_ELEMENT> |
| |
2097 |
+ |
<option name="myItemId" value="src" /> |
| |
2098 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2099 |
+ |
</PATH_ELEMENT> |
| |
2100 |
+ |
<PATH_ELEMENT> |
| |
2101 |
+ |
<option name="myItemId" value="main" /> |
| |
2102 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2103 |
+ |
</PATH_ELEMENT> |
| |
2104 |
+ |
<PATH_ELEMENT> |
| |
2105 |
+ |
<option name="myItemId" value="res" /> |
| |
2106 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2107 |
+ |
</PATH_ELEMENT> |
| |
2108 |
+ |
<PATH_ELEMENT> |
| |
2109 |
+ |
<option name="myItemId" value="values" /> |
| |
2110 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2111 |
+ |
</PATH_ELEMENT> |
| |
2112 |
+ |
</PATH> |
| |
2113 |
+ |
<PATH> |
| |
2114 |
+ |
<PATH_ELEMENT> |
| |
2115 |
+ |
<option name="myItemId" value="SmartCharging" /> |
| |
2116 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> |
| |
2117 |
+ |
</PATH_ELEMENT> |
| |
2118 |
+ |
<PATH_ELEMENT> |
| |
2119 |
+ |
<option name="myItemId" value="SmartCharging" /> |
| |
2120 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2121 |
+ |
</PATH_ELEMENT> |
| |
2122 |
+ |
<PATH_ELEMENT> |
| |
2123 |
+ |
<option name="myItemId" value="app" /> |
| |
2124 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2125 |
+ |
</PATH_ELEMENT> |
| |
2126 |
+ |
<PATH_ELEMENT> |
| |
2127 |
+ |
<option name="myItemId" value="src" /> |
| |
2128 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2129 |
+ |
</PATH_ELEMENT> |
| |
2130 |
+ |
<PATH_ELEMENT> |
| |
2131 |
+ |
<option name="myItemId" value="main" /> |
| |
2132 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2133 |
+ |
</PATH_ELEMENT> |
| |
2134 |
+ |
<PATH_ELEMENT> |
| |
2135 |
+ |
<option name="myItemId" value="res" /> |
| |
2136 |
+ |
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| |
2137 |
+ |
</PATH_ELEMENT> |
| |
2138 |
+ |
<PATH_ELEMENT> |
| 2094 |
2139 |
|
<option name="myItemId" value="layout" /> |
| 2095 |
2140 |
|
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> |
| 2096 |
2141 |
|
</PATH_ELEMENT> |
| |
@@ -2145,16 +2190,19 @@ |
| 2145 |
2190 |
|
</PATH> |
| 2146 |
2191 |
|
</subPane> |
| 2147 |
2192 |
|
</pane> |
| |
2193 |
+ |
<pane id="PackagesPane" /> |
| |
2194 |
+ |
<pane id="Scope" /> |
| |
2195 |
+ |
<pane id="Scratches" /> |
| 2148 |
2196 |
|
</panes> |
| 2149 |
2197 |
|
</component> |
| 2150 |
2198 |
|
<component name="PropertiesComponent"> |
| 2151 |
2199 |
|
<property name="recentsLimit" value="5" /> |
| 2152 |
2200 |
|
<property name="FullScreen" value="false" /> |
| 2153 |
|
- |
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="8a23499d" /> |
| |
2201 |
+ |
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_SERIALS" value="9f1d688f08a52c89" /> |
| 2154 |
2202 |
|
<property name="ANDROID_EXTENDED_DEVICE_CHOOSER_AVD" value="Nexus_5_API_22_x86" /> |
| 2155 |
2203 |
|
<property name="android.project.structure.last.selected" value="SDK Location" /> |
| 2156 |
2204 |
|
<property name="android.project.structure.proportion" value="0.15" /> |
| 2157 |
|
- |
<property name="last_opened_file_path" value="$PROJECT_DIR$/SmartChargingKeyStore-helloponente.jks" /> |
| |
2205 |
+ |
<property name="last_opened_file_path" value="C:/GitHub/Android-App-Template" /> |
| 2158 |
2206 |
|
<property name="UI_DESIGNER_EDITOR_MODE.UIDesignerToolWindowManager2.WIDTH" value="238" /> |
| 2159 |
2207 |
|
<property name="UI_DESIGNER_EDITOR_MODE.PaletteToolWindowManager.WIDTH" value="193" /> |
| 2160 |
2208 |
|
<property name="last_directory_selection" value="$PROJECT_DIR$/app/src/debug/res/drawable-mdpi" /> |
| |
@@ -2206,14 +2254,8 @@ |
| 2206 |
2254 |
|
<option name="mySupportsDeletion" value="false" /> |
| 2207 |
2255 |
|
<option name="myCanBeAbsent" value="false" /> |
| 2208 |
2256 |
|
<option name="myId" value="UPDATED" /> |
| 2209 |
|
- |
<PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\res\layout\activity_full_info.xml</PATH> |
| 2210 |
|
- |
<PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\res\values\strings.xml</PATH> |
| 2211 |
|
- |
<PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Manager\MyLocation.java</PATH> |
| 2212 |
|
- |
<PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\ImageManagerActivity.java</PATH> |
| 2213 |
|
- |
<PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\MapActivity.java</PATH> |
| 2214 |
|
- |
<PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\RegisterActivity.java</PATH> |
| 2215 |
|
- |
<PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\FullInfoFragment.java</PATH> |
| 2216 |
|
- |
<PATH vcs="svn" revision="762">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\RecensioneActivity.java</PATH> |
| |
2257 |
+ |
<PATH vcs="svn" revision="777">C:\Client\SmartCharging\app\src\main\java\it\fedeloper\smartcharging\Controller\MapActivity.java</PATH> |
| |
2258 |
+ |
<PATH vcs="svn" revision="777">C:\Client\SmartCharging\app\src\main\res\layout\activity_map.xml</PATH> |
| 2217 |
2259 |
|
</FILE-GROUP> |
| 2218 |
2260 |
|
<FILE-GROUP> |
| 2219 |
2261 |
|
<option name="myUpdateName" value="Created" /> |
| |
@@ -2658,7 +2700,13 @@ |
| 2658 |
2700 |
|
<option name="project" value="LOCAL" /> |
| 2659 |
2701 |
|
<updated>1441703592332</updated> |
| 2660 |
2702 |
|
</task> |
| 2661 |
|
- |
<option name="localTasksCounter" value="19" /> |
| |
2703 |
+ |
<task id="LOCAL-00019" summary="me"> |
| |
2704 |
+ |
<created>1442916186727</created> |
| |
2705 |
+ |
<option name="number" value="00019" /> |
| |
2706 |
+ |
<option name="project" value="LOCAL" /> |
| |
2707 |
+ |
<updated>1442916186727</updated> |
| |
2708 |
+ |
</task> |
| |
2709 |
+ |
<option name="localTasksCounter" value="20" /> |
| 2662 |
2710 |
|
<servers /> |
| 2663 |
2711 |
|
</component> |
| 2664 |
2712 |
|
<component name="TodoView"> |
| |
@@ -2671,7 +2719,7 @@ |
| 2671 |
2719 |
|
</todo-panel> |
| 2672 |
2720 |
|
</component> |
| 2673 |
2721 |
|
<component name="ToolWindowManager"> |
| 2674 |
|
- |
<frame x="-8" y="-8" width="1382" height="744" extended-state="6" /> |
| |
2722 |
+ |
<frame x="-8" y="-8" width="1370" height="744" extended-state="0" /> |
| 2675 |
2723 |
|
<editor active="false" /> |
| 2676 |
2724 |
|
<layout> |
| 2677 |
2725 |
|
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32367972" sideWeight="0.4871407" order="8" side_tool="false" content_ui="tabs" /> |
| |
@@ -2681,16 +2729,14 @@ |
| 2681 |
2729 |
|
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.867121" sideWeight="0.5060514" order="6" side_tool="true" content_ui="tabs" /> |
| 2682 |
2730 |
|
<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" /> |
| 2683 |
2731 |
|
<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" /> |
| 2684 |
|
- |
<window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.2197615" sideWeight="0.49394855" order="14" side_tool="false" content_ui="tabs" /> |
| 2685 |
|
- |
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.28517398" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
| 2686 |
|
- |
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32367972" sideWeight="0.47806355" order="9" side_tool="false" content_ui="tabs" /> |
| |
2732 |
+ |
<window_info id="Android Monitor" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39863715" sideWeight="0.49394855" order="14" side_tool="false" content_ui="tabs" /> |
| |
2733 |
+ |
<window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32367972" sideWeight="0.47806355" order="9" side_tool="false" content_ui="tabs" /> |
| 2687 |
2734 |
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.47189096" sideWeight="0.64220876" order="2" side_tool="false" content_ui="tabs" /> |
| 2688 |
2735 |
|
<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" /> |
| 2689 |
2736 |
|
<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" /> |
| 2690 |
2737 |
|
<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" /> |
| 2691 |
2738 |
|
<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" /> |
| 2692 |
|
- |
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26096824" sideWeight="0.61669505" order="0" side_tool="false" content_ui="combo" /> |
| 2693 |
|
- |
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3270869" sideWeight="0.49394855" order="1" side_tool="false" content_ui="tabs" /> |
| |
2739 |
+ |
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.26030535" sideWeight="0.61669505" order="0" side_tool="false" content_ui="combo" /> |
| 2694 |
2740 |
|
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.204236" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> |
| 2695 |
2741 |
|
<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" /> |
| 2696 |
2742 |
|
<window_info id="Android Model" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32980332" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" /> |
| |
@@ -2702,7 +2748,9 @@ |
| 2702 |
2748 |
|
<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" /> |
| 2703 |
2749 |
|
<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" /> |
| 2704 |
2750 |
|
<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" /> |
| |
2751 |
+ |
<window_info id="Preview" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.28517398" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> |
| 2705 |
2752 |
|
<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" /> |
| |
2753 |
+ |
<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" /> |
| 2706 |
2754 |
|
</layout> |
| 2707 |
2755 |
|
<layout-to-restore> |
| 2708 |
2756 |
|
<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" /> |
| |
@@ -2835,14 +2883,6 @@ |
| 2835 |
2883 |
|
<watches-manager /> |
| 2836 |
2884 |
|
</component> |
| 2837 |
2885 |
|
<component name="editorHistoryManager"> |
| 2838 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/button_text_state.xml"> |
| 2839 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 2840 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2841 |
|
- |
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
| 2842 |
|
- |
<folding /> |
| 2843 |
|
- |
</state> |
| 2844 |
|
- |
</provider> |
| 2845 |
|
- |
</entry> |
| 2846 |
2886 |
|
<entry file="file://$PROJECT_DIR$/app/build.gradle"> |
| 2847 |
2887 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2848 |
2888 |
|
<state vertical-scroll-proportion="0.0"> |
| |
@@ -2851,13 +2891,6 @@ |
| 2851 |
2891 |
|
</state> |
| 2852 |
2892 |
|
</provider> |
| 2853 |
2893 |
|
</entry> |
| 2854 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/dimens.xml"> |
| 2855 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 2856 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2857 |
|
- |
<caret line="17" column="17" selection-start-line="17" selection-start-column="17" selection-end-line="17" selection-end-column="17" /> |
| 2858 |
|
- |
</state> |
| 2859 |
|
- |
</provider> |
| 2860 |
|
- |
</entry> |
| 2861 |
2894 |
|
<entry file="file://$PROJECT_DIR$/app/app.iml"> |
| 2862 |
2895 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2863 |
2896 |
|
<state vertical-scroll-proportion="-1.0304115"> |
| |
@@ -2871,14 +2904,14 @@ |
| 2871 |
2904 |
|
</provider> |
| 2872 |
2905 |
|
</entry> |
| 2873 |
2906 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_full_info.xml"> |
| 2874 |
|
- |
<provider editor-type-id="android-designer"> |
| 2875 |
|
- |
<state /> |
| 2876 |
|
- |
</provider> |
| 2877 |
2907 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2878 |
2908 |
|
<state vertical-scroll-proportion="-19.862068"> |
| 2879 |
2909 |
|
<caret line="36" column="47" selection-start-line="36" selection-start-column="47" selection-end-line="36" selection-end-column="47" /> |
| 2880 |
2910 |
|
</state> |
| 2881 |
2911 |
|
</provider> |
| |
2912 |
+ |
<provider editor-type-id="android-designer"> |
| |
2913 |
+ |
<state /> |
| |
2914 |
+ |
</provider> |
| 2882 |
2915 |
|
</entry> |
| 2883 |
2916 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/circle_violet.xml"> |
| 2884 |
2917 |
|
<provider selected="true" editor-type-id="text-editor"> |
| |
@@ -2888,24 +2921,24 @@ |
| 2888 |
2921 |
|
</provider> |
| 2889 |
2922 |
|
</entry> |
| 2890 |
2923 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/commento_layout.xml"> |
| 2891 |
|
- |
<provider editor-type-id="android-designer"> |
| 2892 |
|
- |
<state /> |
| 2893 |
|
- |
</provider> |
| 2894 |
2924 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2895 |
2925 |
|
<state vertical-scroll-proportion="0.8754717"> |
| 2896 |
2926 |
|
<caret line="29" column="48" selection-start-line="29" selection-start-column="48" selection-end-line="29" selection-end-column="48" /> |
| 2897 |
2927 |
|
</state> |
| 2898 |
2928 |
|
</provider> |
| 2899 |
|
- |
</entry> |
| 2900 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_intro.xml"> |
| 2901 |
2929 |
|
<provider editor-type-id="android-designer"> |
| 2902 |
2930 |
|
<state /> |
| 2903 |
2931 |
|
</provider> |
| |
2932 |
+ |
</entry> |
| |
2933 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/fragment_intro.xml"> |
| 2904 |
2934 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2905 |
2935 |
|
<state vertical-scroll-proportion="-8.103448"> |
| 2906 |
2936 |
|
<caret line="25" column="32" selection-start-line="25" selection-start-column="32" selection-end-line="25" selection-end-column="32" /> |
| 2907 |
2937 |
|
</state> |
| 2908 |
2938 |
|
</provider> |
| |
2939 |
+ |
<provider editor-type-id="android-designer"> |
| |
2940 |
+ |
<state /> |
| |
2941 |
+ |
</provider> |
| 2909 |
2942 |
|
</entry> |
| 2910 |
2943 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/AppIntroFragment.java"> |
| 2911 |
2944 |
|
<provider selected="true" editor-type-id="text-editor"> |
| |
@@ -2921,13 +2954,6 @@ |
| 2921 |
2954 |
|
</state> |
| 2922 |
2955 |
|
</provider> |
| 2923 |
2956 |
|
</entry> |
| 2924 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml"> |
| 2925 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 2926 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2927 |
|
- |
<caret line="18" column="47" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" /> |
| 2928 |
|
- |
</state> |
| 2929 |
|
- |
</provider> |
| 2930 |
|
- |
</entry> |
| 2931 |
2957 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/PrefsManager.java"> |
| 2932 |
2958 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2933 |
2959 |
|
<state vertical-scroll-proportion="0.0"> |
| |
@@ -2951,21 +2977,13 @@ |
| 2951 |
2977 |
|
</provider> |
| 2952 |
2978 |
|
</entry> |
| 2953 |
2979 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_set_position_locale.xml"> |
| 2954 |
|
- |
<provider editor-type-id="android-designer"> |
| 2955 |
|
- |
<state /> |
| 2956 |
|
- |
</provider> |
| 2957 |
2980 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2958 |
2981 |
|
<state vertical-scroll-proportion="3.4482758"> |
| 2959 |
2982 |
|
<caret line="49" column="19" selection-start-line="49" selection-start-column="19" selection-end-line="49" selection-end-column="19" /> |
| 2960 |
2983 |
|
</state> |
| 2961 |
2984 |
|
</provider> |
| 2962 |
|
- |
</entry> |
| 2963 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> |
| 2964 |
|
- |
<provider selected="true" editor-type-id="text-editor"> |
| 2965 |
|
- |
<state vertical-scroll-proportion="0.0"> |
| 2966 |
|
- |
<caret line="116" column="45" selection-start-line="116" selection-start-column="45" selection-end-line="116" selection-end-column="45" /> |
| 2967 |
|
- |
<folding /> |
| 2968 |
|
- |
</state> |
| |
2985 |
+ |
<provider editor-type-id="android-designer"> |
| |
2986 |
+ |
<state /> |
| 2969 |
2987 |
|
</provider> |
| 2970 |
2988 |
|
</entry> |
| 2971 |
2989 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/SettingSelectionActivity.java"> |
| |
@@ -2976,14 +2994,14 @@ |
| 2976 |
2994 |
|
</provider> |
| 2977 |
2995 |
|
</entry> |
| 2978 |
2996 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_manager.xml"> |
| 2979 |
|
- |
<provider editor-type-id="android-designer"> |
| 2980 |
|
- |
<state /> |
| 2981 |
|
- |
</provider> |
| 2982 |
2997 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 2983 |
2998 |
|
<state vertical-scroll-proportion="-0.0"> |
| 2984 |
2999 |
|
<caret line="6" column="4" selection-start-line="6" selection-start-column="4" selection-end-line="6" selection-end-column="4" /> |
| 2985 |
3000 |
|
</state> |
| 2986 |
3001 |
|
</provider> |
| |
3002 |
+ |
<provider editor-type-id="android-designer"> |
| |
3003 |
+ |
<state /> |
| |
3004 |
+ |
</provider> |
| 2987 |
3005 |
|
</entry> |
| 2988 |
3006 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Service/CallService.java"> |
| 2989 |
3007 |
|
<provider selected="true" editor-type-id="text-editor"> |
| |
@@ -3056,7 +3074,6 @@ |
| 3056 |
3074 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3057 |
3075 |
|
<state vertical-scroll-proportion="0.09726444"> |
| 3058 |
3076 |
|
<caret line="2" column="8" selection-start-line="2" selection-start-column="8" selection-end-line="2" selection-end-column="8" /> |
| 3059 |
|
- |
<folding /> |
| 3060 |
3077 |
|
</state> |
| 3061 |
3078 |
|
</provider> |
| 3062 |
3079 |
|
</entry> |
| |
@@ -3064,7 +3081,6 @@ |
| 3064 |
3081 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3065 |
3082 |
|
<state vertical-scroll-proportion="0.0"> |
| 3066 |
3083 |
|
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> |
| 3067 |
|
- |
<folding /> |
| 3068 |
3084 |
|
</state> |
| 3069 |
3085 |
|
</provider> |
| 3070 |
3086 |
|
</entry> |
| |
@@ -3080,7 +3096,6 @@ |
| 3080 |
3096 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3081 |
3097 |
|
<state vertical-scroll-proportion="0.0"> |
| 3082 |
3098 |
|
<caret line="1" column="0" selection-start-line="1" selection-start-column="0" selection-end-line="1" selection-end-column="0" /> |
| 3083 |
|
- |
<folding /> |
| 3084 |
3099 |
|
</state> |
| 3085 |
3100 |
|
</provider> |
| 3086 |
3101 |
|
</entry> |
| |
@@ -3101,55 +3116,31 @@ |
| 3101 |
3116 |
|
</provider> |
| 3102 |
3117 |
|
</entry> |
| 3103 |
3118 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_recensione.xml"> |
| 3104 |
|
- |
<provider editor-type-id="android-designer"> |
| 3105 |
|
- |
<state /> |
| 3106 |
|
- |
</provider> |
| 3107 |
3119 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3108 |
3120 |
|
<state vertical-scroll-proportion="29.793104"> |
| 3109 |
3121 |
|
<caret line="27" column="49" selection-start-line="27" selection-start-column="49" selection-end-line="27" selection-end-column="49" /> |
| 3110 |
3122 |
|
<folding /> |
| 3111 |
3123 |
|
</state> |
| 3112 |
3124 |
|
</provider> |
| 3113 |
|
- |
</entry> |
| 3114 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml"> |
| 3115 |
3125 |
|
<provider editor-type-id="android-designer"> |
| 3116 |
3126 |
|
<state /> |
| 3117 |
3127 |
|
</provider> |
| |
3128 |
+ |
</entry> |
| |
3129 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_map.xml"> |
| 3118 |
3130 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3119 |
3131 |
|
<state vertical-scroll-proportion="-7.724138"> |
| 3120 |
3132 |
|
<caret line="94" column="57" selection-start-line="94" selection-start-column="57" selection-end-line="94" selection-end-column="57" /> |
| 3121 |
3133 |
|
<folding /> |
| 3122 |
3134 |
|
</state> |
| 3123 |
3135 |
|
</provider> |
| |
3136 |
+ |
<provider editor-type-id="android-designer"> |
| |
3137 |
+ |
<state /> |
| |
3138 |
+ |
</provider> |
| 3124 |
3139 |
|
</entry> |
| 3125 |
3140 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Controller/MapActivity.java"> |
| 3126 |
3141 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3127 |
3142 |
|
<state vertical-scroll-proportion="0.0"> |
| 3128 |
3143 |
|
<caret line="946" column="30" selection-start-line="946" selection-start-column="30" selection-end-line="946" selection-end-column="30" /> |
| 3129 |
|
- |
<folding> |
| 3130 |
|
- |
<element signature="e#3011#3032#0" expanded="false" /> |
| 3131 |
|
- |
<element signature="e#3097#3118#0" expanded="false" /> |
| 3132 |
|
- |
<element signature="e#3201#3222#0" expanded="false" /> |
| 3133 |
|
- |
<element signature="e#5533#5558#0" expanded="false" /> |
| 3134 |
|
- |
<element signature="e#20300#20318#0" expanded="false" /> |
| 3135 |
|
- |
<element signature="e#20371#20406#0" expanded="false" /> |
| 3136 |
|
- |
<element signature="e#25323#25360#0" expanded="false" /> |
| 3137 |
|
- |
<element signature="e#33044#33081#0" expanded="false" /> |
| 3138 |
|
- |
<element signature="e#36352#36380#0" expanded="false" /> |
| 3139 |
|
- |
<element signature="e#36485#36514#0" expanded="false" /> |
| 3140 |
|
- |
<element signature="e#36692#36721#0" expanded="false" /> |
| 3141 |
|
- |
<element signature="e#37797#37825#0" expanded="false" /> |
| 3142 |
|
- |
<element signature="e#37954#37983#0" expanded="false" /> |
| 3143 |
|
- |
<element signature="e#38196#38225#0" expanded="false" /> |
| 3144 |
|
- |
<element signature="e#38826#43656#0" expanded="false" /> |
| 3145 |
|
- |
<element signature="e#41119#41573#0" expanded="false" /> |
| 3146 |
|
- |
<element signature="e#41572#41573#0" expanded="false" /> |
| 3147 |
|
- |
<element signature="e#41651#42123#0" expanded="false" /> |
| 3148 |
|
- |
<element signature="e#42122#42123#0" expanded="false" /> |
| 3149 |
|
- |
<element signature="e#43655#43656#0" expanded="false" /> |
| 3150 |
|
- |
<element signature="e#45692#45709#0" expanded="false" /> |
| 3151 |
|
- |
<element signature="e#47009#47037#0" expanded="false" /> |
| 3152 |
|
- |
</folding> |
| 3153 |
3144 |
|
</state> |
| 3154 |
3145 |
|
</provider> |
| 3155 |
3146 |
|
</entry> |
| |
@@ -3157,23 +3148,19 @@ |
| 3157 |
3148 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3158 |
3149 |
|
<state vertical-scroll-proportion="0.0"> |
| 3159 |
3150 |
|
<caret line="132" column="44" selection-start-line="132" selection-start-column="44" selection-end-line="132" selection-end-column="73" /> |
| 3160 |
|
- |
<folding> |
| 3161 |
|
- |
<element signature="e#3121#4841#0" expanded="false" /> |
| 3162 |
|
- |
<element signature="e#4840#4841#0" expanded="false" /> |
| 3163 |
|
- |
</folding> |
| 3164 |
3151 |
|
</state> |
| 3165 |
3152 |
|
</provider> |
| 3166 |
3153 |
|
</entry> |
| 3167 |
3154 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_register_locale.xml"> |
| 3168 |
|
- |
<provider editor-type-id="android-designer"> |
| 3169 |
|
- |
<state /> |
| 3170 |
|
- |
</provider> |
| 3171 |
3155 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3172 |
3156 |
|
<state vertical-scroll-proportion="-4.965517"> |
| 3173 |
3157 |
|
<caret line="141" column="42" selection-start-line="141" selection-start-column="42" selection-end-line="141" selection-end-column="42" /> |
| 3174 |
3158 |
|
<folding /> |
| 3175 |
3159 |
|
</state> |
| 3176 |
3160 |
|
</provider> |
| |
3161 |
+ |
<provider editor-type-id="android-designer"> |
| |
3162 |
+ |
<state /> |
| |
3163 |
+ |
</provider> |
| 3177 |
3164 |
|
</entry> |
| 3178 |
3165 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/java/it/fedeloper/smartcharging/Manager/Utils.java"> |
| 3179 |
3166 |
|
<provider selected="true" editor-type-id="text-editor"> |
| |
@@ -3195,17 +3182,6 @@ |
| 3195 |
3182 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3196 |
3183 |
|
<state vertical-scroll-proportion="0.0"> |
| 3197 |
3184 |
|
<caret line="293" column="33" selection-start-line="293" selection-start-column="33" selection-end-line="293" selection-end-column="33" /> |
| 3198 |
|
- |
<folding> |
| 3199 |
|
- |
<element signature="e#2461#2483#0" expanded="true" /> |
| 3200 |
|
- |
<element signature="e#7565#7589#0" expanded="true" /> |
| 3201 |
|
- |
<element signature="e#8972#9004#0" expanded="true" /> |
| 3202 |
|
- |
<element signature="e#10451#12566#0" expanded="true" /> |
| 3203 |
|
- |
<element signature="e#11597#11849#0" expanded="true" /> |
| 3204 |
|
- |
<element signature="e#11759#11783#0" expanded="true" /> |
| 3205 |
|
- |
<element signature="e#12063#12101#0" expanded="true" /> |
| 3206 |
|
- |
<element signature="e#12565#12566#0" expanded="true" /> |
| 3207 |
|
- |
<element signature="e#12897#12927#0" expanded="true" /> |
| 3208 |
|
- |
</folding> |
| 3209 |
3185 |
|
</state> |
| 3210 |
3186 |
|
</provider> |
| 3211 |
3187 |
|
</entry> |
| |
@@ -3213,7 +3189,6 @@ |
| 3213 |
3189 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3214 |
3190 |
|
<state vertical-scroll-proportion="0.0"> |
| 3215 |
3191 |
|
<caret line="29" column="71" selection-start-line="29" selection-start-column="71" selection-end-line="29" selection-end-column="71" /> |
| 3216 |
|
- |
<folding /> |
| 3217 |
3192 |
|
</state> |
| 3218 |
3193 |
|
</provider> |
| 3219 |
3194 |
|
</entry> |
| |
@@ -3227,65 +3202,92 @@ |
| 3227 |
3202 |
|
<state /> |
| 3228 |
3203 |
|
</provider> |
| 3229 |
3204 |
|
</entry> |
| 3230 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml"> |
| |
3205 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml"> |
| |
3206 |
+ |
<provider selected="true" editor-type-id="text-editor"> |
| |
3207 |
+ |
<state vertical-scroll-proportion="0.0"> |
| |
3208 |
+ |
<caret line="13" column="48" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" /> |
| |
3209 |
+ |
<folding /> |
| |
3210 |
+ |
</state> |
| |
3211 |
+ |
</provider> |
| 3231 |
3212 |
|
<provider editor-type-id="android-designer"> |
| 3232 |
3213 |
|
<state /> |
| 3233 |
3214 |
|
</provider> |
| |
3215 |
+ |
</entry> |
| |
3216 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/logoregione.png"> |
| |
3217 |
+ |
<provider selected="true" editor-type-id="images"> |
| |
3218 |
+ |
<state /> |
| |
3219 |
+ |
</provider> |
| |
3220 |
+ |
</entry> |
| |
3221 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/google_maps_api.xml"> |
| |
3222 |
+ |
<provider selected="true" editor-type-id="text-editor"> |
| |
3223 |
+ |
<state vertical-scroll-proportion="0.0"> |
| |
3224 |
+ |
<caret line="18" column="47" selection-start-line="18" selection-start-column="47" selection-end-line="18" selection-end-column="47" /> |
| |
3225 |
+ |
<folding /> |
| |
3226 |
+ |
</state> |
| |
3227 |
+ |
</provider> |
| |
3228 |
+ |
</entry> |
| |
3229 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/AndroidManifest.xml"> |
| 3234 |
3230 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3235 |
|
- |
<state vertical-scroll-proportion="-3.862069"> |
| 3236 |
|
- |
<caret line="20" column="29" selection-start-line="20" selection-start-column="29" selection-end-line="20" selection-end-column="29" /> |
| |
3231 |
+ |
<state vertical-scroll-proportion="2.7076924"> |
| |
3232 |
+ |
<caret line="125" column="12" selection-start-line="125" selection-start-column="12" selection-end-line="126" selection-end-column="48" /> |
| 3237 |
3233 |
|
<folding /> |
| 3238 |
3234 |
|
</state> |
| 3239 |
3235 |
|
</provider> |
| 3240 |
3236 |
|
</entry> |
| 3241 |
|
- |
<entry file="file://$PROJECT_DIR$/app/build.gradle"> |
| |
3237 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values-sw600dp/dimens.xml"> |
| 3242 |
3238 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3243 |
3239 |
|
<state vertical-scroll-proportion="0.0"> |
| 3244 |
|
- |
<caret line="15" column="24" selection-start-line="15" selection-start-column="24" selection-end-line="15" selection-end-column="24" /> |
| |
3240 |
+ |
<caret line="6" column="40" selection-start-line="6" selection-start-column="40" selection-end-line="6" selection-end-column="40" /> |
| 3245 |
3241 |
|
<folding /> |
| 3246 |
3242 |
|
</state> |
| 3247 |
3243 |
|
</provider> |
| 3248 |
3244 |
|
</entry> |
| 3249 |
3245 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_login2.xml"> |
| |
3246 |
+ |
<provider selected="true" editor-type-id="text-editor"> |
| |
3247 |
+ |
<state vertical-scroll-proportion="0.0"> |
| |
3248 |
+ |
<caret line="13" column="47" selection-start-line="13" selection-start-column="47" selection-end-line="13" selection-end-column="47" /> |
| |
3249 |
+ |
<folding /> |
| |
3250 |
+ |
</state> |
| |
3251 |
+ |
</provider> |
| 3250 |
3252 |
|
<provider editor-type-id="android-designer"> |
| 3251 |
3253 |
|
<state /> |
| 3252 |
3254 |
|
</provider> |
| |
3255 |
+ |
</entry> |
| |
3256 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_setting_selection.xml"> |
| 3253 |
3257 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3254 |
|
- |
<state vertical-scroll-proportion="0.27930173"> |
| 3255 |
|
- |
<caret line="16" column="38" selection-start-line="16" selection-start-column="38" selection-end-line="16" selection-end-column="38" /> |
| |
3258 |
+ |
<state vertical-scroll-proportion="0.0"> |
| |
3259 |
+ |
<caret line="18" column="60" selection-start-line="18" selection-start-column="60" selection-end-line="18" selection-end-column="60" /> |
| 3256 |
3260 |
|
<folding /> |
| 3257 |
3261 |
|
</state> |
| 3258 |
3262 |
|
</provider> |
| 3259 |
|
- |
</entry> |
| 3260 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_splash.xml"> |
| 3261 |
3263 |
|
<provider editor-type-id="android-designer"> |
| 3262 |
3264 |
|
<state /> |
| 3263 |
3265 |
|
</provider> |
| |
3266 |
+ |
</entry> |
| |
3267 |
+ |
<entry file="file://$PROJECT_DIR$/app/src/main/res/values/dimens.xml"> |
| 3264 |
3268 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3265 |
|
- |
<state vertical-scroll-proportion="1.0689656"> |
| 3266 |
|
- |
<caret line="13" column="48" selection-start-line="13" selection-start-column="48" selection-end-line="13" selection-end-column="48" /> |
| 3267 |
|
- |
<folding> |
| 3268 |
|
- |
<element signature="e#1224#1243#0" expanded="true" /> |
| 3269 |
|
- |
</folding> |
| |
3269 |
+ |
<state vertical-scroll-proportion="0.0"> |
| |
3270 |
+ |
<caret line="22" column="30" selection-start-line="22" selection-start-column="17" selection-end-line="22" selection-end-column="30" /> |
| |
3271 |
+ |
<folding /> |
| 3270 |
3272 |
|
</state> |
| 3271 |
3273 |
|
</provider> |
| 3272 |
3274 |
|
</entry> |
| 3273 |
|
- |
<entry file="file://$PROJECT_DIR$/app/src/main/res/drawable/logoregione.png"> |
| 3274 |
|
- |
<provider selected="true" editor-type-id="images"> |
| 3275 |
|
- |
<state /> |
| 3276 |
|
- |
</provider> |
| 3277 |
|
- |
</entry> |
| 3278 |
3275 |
|
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_selection.xml"> |
| |
3276 |
+ |
<provider selected="true" editor-type-id="text-editor"> |
| |
3277 |
+ |
<state vertical-scroll-proportion="0.0"> |
| |
3278 |
+ |
<caret line="26" column="25" selection-start-line="26" selection-start-column="25" selection-end-line="26" selection-end-column="25" /> |
| |
3279 |
+ |
<folding /> |
| |
3280 |
+ |
</state> |
| |
3281 |
+ |
</provider> |
| 3279 |
3282 |
|
<provider editor-type-id="android-designer"> |
| 3280 |
3283 |
|
<state /> |
| 3281 |
3284 |
|
</provider> |
| |
3285 |
+ |
</entry> |
| |
3286 |
+ |
<entry file="file://$PROJECT_DIR$/app/build.gradle"> |
| 3282 |
3287 |
|
<provider selected="true" editor-type-id="text-editor"> |
| 3283 |
|
- |
<state vertical-scroll-proportion="0.798005"> |
| 3284 |
|
- |
<caret line="95" column="45" selection-start-line="95" selection-start-column="45" selection-end-line="95" selection-end-column="45" /> |
| 3285 |
|
- |
<folding> |
| 3286 |
|
- |
<element signature="e#4221#4240#0" expanded="true" /> |
| 3287 |
|
- |
<element signature="e#4288#4307#0" expanded="true" /> |
| 3288 |
|
- |
</folding> |
| |
3288 |
+ |
<state vertical-scroll-proportion="0.0"> |
| |
3289 |
+ |
<caret line="14" column="21" selection-start-line="14" selection-start-column="21" selection-end-line="14" selection-end-column="21" /> |
| |
3290 |
+ |
<folding /> |
| 3289 |
3291 |
|
</state> |
| 3290 |
3292 |
|
</provider> |
| 3291 |
3293 |
|
</entry> |
View this file contents
View the full history
Commits for