luis 5 years ago
parent
commit
a4f2fc3bad

+ 116
- 0
.idea/codeStyles/Project.xml View File

@@ -0,0 +1,116 @@
1
+<component name="ProjectCodeStyleConfiguration">
2
+  <code_scheme name="Project" version="173">
3
+    <codeStyleSettings language="XML">
4
+      <indentOptions>
5
+        <option name="CONTINUATION_INDENT_SIZE" value="4" />
6
+      </indentOptions>
7
+      <arrangement>
8
+        <rules>
9
+          <section>
10
+            <rule>
11
+              <match>
12
+                <AND>
13
+                  <NAME>xmlns:android</NAME>
14
+                  <XML_ATTRIBUTE />
15
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
16
+                </AND>
17
+              </match>
18
+            </rule>
19
+          </section>
20
+          <section>
21
+            <rule>
22
+              <match>
23
+                <AND>
24
+                  <NAME>xmlns:.*</NAME>
25
+                  <XML_ATTRIBUTE />
26
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
27
+                </AND>
28
+              </match>
29
+              <order>BY_NAME</order>
30
+            </rule>
31
+          </section>
32
+          <section>
33
+            <rule>
34
+              <match>
35
+                <AND>
36
+                  <NAME>.*:id</NAME>
37
+                  <XML_ATTRIBUTE />
38
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
39
+                </AND>
40
+              </match>
41
+            </rule>
42
+          </section>
43
+          <section>
44
+            <rule>
45
+              <match>
46
+                <AND>
47
+                  <NAME>.*:name</NAME>
48
+                  <XML_ATTRIBUTE />
49
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
50
+                </AND>
51
+              </match>
52
+            </rule>
53
+          </section>
54
+          <section>
55
+            <rule>
56
+              <match>
57
+                <AND>
58
+                  <NAME>name</NAME>
59
+                  <XML_ATTRIBUTE />
60
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
61
+                </AND>
62
+              </match>
63
+            </rule>
64
+          </section>
65
+          <section>
66
+            <rule>
67
+              <match>
68
+                <AND>
69
+                  <NAME>style</NAME>
70
+                  <XML_ATTRIBUTE />
71
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
72
+                </AND>
73
+              </match>
74
+            </rule>
75
+          </section>
76
+          <section>
77
+            <rule>
78
+              <match>
79
+                <AND>
80
+                  <NAME>.*</NAME>
81
+                  <XML_ATTRIBUTE />
82
+                  <XML_NAMESPACE>^$</XML_NAMESPACE>
83
+                </AND>
84
+              </match>
85
+              <order>BY_NAME</order>
86
+            </rule>
87
+          </section>
88
+          <section>
89
+            <rule>
90
+              <match>
91
+                <AND>
92
+                  <NAME>.*</NAME>
93
+                  <XML_ATTRIBUTE />
94
+                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
95
+                </AND>
96
+              </match>
97
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
98
+            </rule>
99
+          </section>
100
+          <section>
101
+            <rule>
102
+              <match>
103
+                <AND>
104
+                  <NAME>.*</NAME>
105
+                  <XML_ATTRIBUTE />
106
+                  <XML_NAMESPACE>.*</XML_NAMESPACE>
107
+                </AND>
108
+              </match>
109
+              <order>BY_NAME</order>
110
+            </rule>
111
+          </section>
112
+        </rules>
113
+      </arrangement>
114
+    </codeStyleSettings>
115
+  </code_scheme>
116
+</component>

+ 24
- 0
.idea/kilometro0.iml View File

@@ -0,0 +1,24 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<module type="JAVA_MODULE" version="4">
3
+  <component name="FacetManager">
4
+    <facet type="android" name="Android">
5
+      <configuration>
6
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/../../kilometro0/gen" />
7
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/../../kilometro0/gen" />
8
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/../../kilometro0/AndroidManifest.xml" />
9
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/../../kilometro0/res" />
10
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/../../kilometro0/assets" />
11
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/../../kilometro0/libs" />
12
+        <option name="PROGUARD_LOGS_FOLDER_RELATIVE_PATH" value="/../../kilometro0/proguard_logs" />
13
+      </configuration>
14
+    </facet>
15
+  </component>
16
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
17
+    <exclude-output />
18
+    <content url="file://$MODULE_DIR$">
19
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
20
+    </content>
21
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
22
+    <orderEntry type="sourceFolder" forTests="false" />
23
+  </component>
24
+</module>

+ 4
- 0
.idea/misc.xml View File

@@ -0,0 +1,4 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_12" default="false" project-jdk-name="Android API 29 Platform" project-jdk-type="Android SDK" />
4
+</project>

+ 8
- 0
.idea/modules.xml View File

@@ -0,0 +1,8 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectModuleManager">
4
+    <modules>
5
+      <module fileurl="file://$PROJECT_DIR$/.idea/kilometro0.iml" filepath="$PROJECT_DIR$/.idea/kilometro0.iml" />
6
+    </modules>
7
+  </component>
8
+</project>

+ 6
- 0
.idea/vcs.xml View File

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="VcsDirectoryMappings">
4
+    <mapping directory="" vcs="Git" />
5
+  </component>
6
+</project>

+ 189
- 0
.idea/workspace.xml View File

@@ -0,0 +1,189 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ChangeListManager">
4
+    <list default="true" id="68909454-58ef-4cf0-b62a-176c2df4017a" name="Default Changelist" comment="">
5
+      <change beforePath="$PROJECT_DIR$/km0App/platforms/android/CordovaLib/CordovaLib.iml" beforeDir="false" />
6
+      <change beforePath="$PROJECT_DIR$/km0App/platforms/android/android.iml" beforeDir="false" />
7
+      <change beforePath="$PROJECT_DIR$/km0App/platforms/android/app/app.iml" beforeDir="false" />
8
+      <change beforePath="$PROJECT_DIR$/km0App/platforms/ios/www/img/logo.png" beforeDir="false" afterPath="$PROJECT_DIR$/km0App/platforms/ios/www/img/logo.png" afterDir="false" />
9
+      <change beforePath="$PROJECT_DIR$/km0App/platforms/ios/www/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/km0App/platforms/ios/www/index.html" afterDir="false" />
10
+    </list>
11
+    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
12
+    <option name="SHOW_DIALOG" value="false" />
13
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
14
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
15
+    <option name="LAST_RESOLUTION" value="IGNORE" />
16
+  </component>
17
+  <component name="Git.Settings">
18
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
19
+  </component>
20
+  <component name="ProjectFrameBounds">
21
+    <option name="x" value="282" />
22
+    <option name="y" value="67" />
23
+    <option name="width" value="1400" />
24
+    <option name="height" value="958" />
25
+  </component>
26
+  <component name="ProjectView">
27
+    <navigator currentView="ProjectPane" proportions="" version="1">
28
+      <foldersAlwaysOnTop value="true" />
29
+    </navigator>
30
+    <panes>
31
+      <pane id="ProjectPane">
32
+        <subPane>
33
+          <expand>
34
+            <path>
35
+              <item name="kilometro0" type="b2602c69:ProjectViewProjectNode" />
36
+              <item name="kilometro0" type="462c0819:PsiDirectoryNode" />
37
+            </path>
38
+          </expand>
39
+          <select />
40
+        </subPane>
41
+      </pane>
42
+      <pane id="AndroidView" />
43
+      <pane id="PackagesPane" />
44
+      <pane id="Scope" />
45
+    </panes>
46
+  </component>
47
+  <component name="PropertiesComponent">
48
+    <property name="android.sdk.path" value="$USER_HOME$/Android/Sdk" />
49
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
50
+    <property name="project.structure.last.edited" value="SDKs" />
51
+    <property name="project.structure.proportion" value="0.15" />
52
+    <property name="project.structure.side.proportion" value="0.2" />
53
+    <property name="settings.editor.selected.configurable" value="reference.idesettings.quicklists" />
54
+  </component>
55
+  <component name="RunDashboard">
56
+    <option name="ruleStates">
57
+      <list>
58
+        <RuleState>
59
+          <option name="name" value="ConfigurationTypeDashboardGroupingRule" />
60
+        </RuleState>
61
+        <RuleState>
62
+          <option name="name" value="StatusDashboardGroupingRule" />
63
+        </RuleState>
64
+      </list>
65
+    </option>
66
+  </component>
67
+  <component name="SvnConfiguration">
68
+    <configuration />
69
+  </component>
70
+  <component name="TaskManager">
71
+    <task active="true" id="Default" summary="Default task">
72
+      <changelist id="68909454-58ef-4cf0-b62a-176c2df4017a" name="Default Changelist" comment="" />
73
+      <created>1570663791594</created>
74
+      <option name="number" value="Default" />
75
+      <option name="presentableId" value="Default" />
76
+      <updated>1570663791594</updated>
77
+    </task>
78
+    <servers />
79
+  </component>
80
+  <component name="ToolWindowManager">
81
+    <frame x="282" y="67" width="1400" height="958" extended-state="0" />
82
+    <layout>
83
+      <window_info id="Captures" order="0" side_tool="true" weight="0.25" />
84
+      <window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.3353028" />
85
+      <window_info id="Structure" order="2" side_tool="true" />
86
+      <window_info id="Favorites" order="3" side_tool="true" />
87
+      <window_info id="Build Variants" order="4" side_tool="true" />
88
+      <window_info id="Image Layers" order="5" />
89
+      <window_info id="Designer" order="6" />
90
+      <window_info id="Resources Explorer" order="7" />
91
+      <window_info id="Capture Tool" order="8" />
92
+      <window_info anchor="bottom" id="Version Control" order="0" />
93
+      <window_info anchor="bottom" id="Logcat" order="1" />
94
+      <window_info anchor="bottom" id="TODO" order="2" />
95
+      <window_info anchor="bottom" id="Terminal" order="3" />
96
+      <window_info anchor="bottom" id="Event Log" order="4" side_tool="true" />
97
+      <window_info anchor="bottom" id="Android Profiler" order="5" show_stripe_button="false" />
98
+      <window_info anchor="right" id="Device File Explorer" order="0" side_tool="true" />
99
+      <window_info anchor="right" id="Capture Analysis" order="1" />
100
+      <window_info anchor="right" id="Theme Preview" order="2" />
101
+      <window_info anchor="right" id="Palette&#9;" order="3" />
102
+    </layout>
103
+  </component>
104
+  <component name="masterDetails">
105
+    <states>
106
+      <state key="ArtifactsStructureConfigurable.UI">
107
+        <settings>
108
+          <artifact-editor />
109
+          <splitter-proportions>
110
+            <option name="proportions">
111
+              <list>
112
+                <option value="0.2" />
113
+              </list>
114
+            </option>
115
+          </splitter-proportions>
116
+        </settings>
117
+      </state>
118
+      <state key="FacetStructureConfigurable.UI">
119
+        <settings>
120
+          <last-edited>Android</last-edited>
121
+          <splitter-proportions>
122
+            <option name="proportions">
123
+              <list>
124
+                <option value="0.2" />
125
+              </list>
126
+            </option>
127
+          </splitter-proportions>
128
+        </settings>
129
+      </state>
130
+      <state key="GlobalLibrariesConfigurable.UI">
131
+        <settings>
132
+          <splitter-proportions>
133
+            <option name="proportions">
134
+              <list>
135
+                <option value="0.2" />
136
+              </list>
137
+            </option>
138
+          </splitter-proportions>
139
+        </settings>
140
+      </state>
141
+      <state key="JdkListConfigurable.UI">
142
+        <settings>
143
+          <last-edited>Android API 29 Platform</last-edited>
144
+          <splitter-proportions>
145
+            <option name="proportions">
146
+              <list>
147
+                <option value="0.2" />
148
+              </list>
149
+            </option>
150
+          </splitter-proportions>
151
+        </settings>
152
+      </state>
153
+      <state key="ModuleStructureConfigurable.UI">
154
+        <settings>
155
+          <last-edited>kilometro0</last-edited>
156
+          <splitter-proportions>
157
+            <option name="proportions">
158
+              <list>
159
+                <option value="0.2" />
160
+              </list>
161
+            </option>
162
+          </splitter-proportions>
163
+        </settings>
164
+      </state>
165
+      <state key="ProjectLibrariesConfigurable.UI">
166
+        <settings>
167
+          <splitter-proportions>
168
+            <option name="proportions">
169
+              <list>
170
+                <option value="0.2" />
171
+              </list>
172
+            </option>
173
+          </splitter-proportions>
174
+        </settings>
175
+      </state>
176
+      <state key="ScopeChooserConfigurable.UI">
177
+        <settings>
178
+          <splitter-proportions>
179
+            <option name="proportions">
180
+              <list>
181
+                <option value="0.2" />
182
+              </list>
183
+            </option>
184
+          </splitter-proportions>
185
+        </settings>
186
+      </state>
187
+    </states>
188
+  </component>
189
+</project>

+ 9
- 7
km0App/platforms/android/CordovaLib/CordovaLib.iml View File

@@ -4,8 +4,8 @@
4 4
     <facet type="android-gradle" name="Android-Gradle">
5 5
       <configuration>
6 6
         <option name="GRADLE_PROJECT_PATH" value=":CordovaLib" />
7
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.0" />
8
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.0" />
7
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.1" />
8
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.1" />
9 9
       </configuration>
10 10
     </facet>
11 11
     <facet type="android" name="Android">
@@ -17,28 +17,30 @@
17 17
           <task>generateDebugSources</task>
18 18
         </afterSyncTasks>
19 19
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
20
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/debug;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
21
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
20 22
         <option name="PROJECT_TYPE" value="1" />
21 23
       </configuration>
22 24
     </facet>
23 25
   </component>
24 26
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
25
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
26
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
27
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
28
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
27 29
     <exclude-output />
28 30
     <content url="file://$MODULE_DIR$">
29
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
31
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
30 32
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
31 33
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
32 34
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
33 35
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
34 36
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
35
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
37
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
36 38
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
37 39
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
38 40
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
39 41
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
40 42
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
41
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
43
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
42 44
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
43 45
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
44 46
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

+ 1
- 1
km0App/platforms/android/CordovaLib/build.gradle View File

@@ -31,7 +31,7 @@ buildscript {
31 31
     dependencies {
32 32
         // The gradle plugin and the maven plugin have to be updated after each version of Android
33 33
         // studio comes out
34
-        classpath 'com.android.tools.build:gradle:3.3.0'
34
+        classpath 'com.android.tools.build:gradle:3.5.1'
35 35
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
36 36
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
37 37
     }

+ 8
- 8
km0App/platforms/android/app/app.iml View File

@@ -4,8 +4,8 @@
4 4
     <facet type="android-gradle" name="Android-Gradle">
5 5
       <configuration>
6 6
         <option name="GRADLE_PROJECT_PATH" value=":app" />
7
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.0" />
8
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.0" />
7
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.1" />
8
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.1" />
9 9
       </configuration>
10 10
     </facet>
11 11
     <facet type="android" name="Android">
@@ -19,30 +19,30 @@
19 19
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
20 20
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
21 21
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
22
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
22
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/resValues/debug" />
23 23
         <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
24 24
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
25 25
       </configuration>
26 26
     </facet>
27 27
   </component>
28 28
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
29
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
30
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
29
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
30
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
31 31
     <exclude-output />
32 32
     <content url="file://$MODULE_DIR$">
33
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
33
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
34 34
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
35 35
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
36 36
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
37 37
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
38 38
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
39
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
39
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
40 40
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
41 41
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
42 42
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
43 43
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
44 44
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
45
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
45
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
46 46
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
47 47
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
48 48
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

+ 1
- 1
km0App/platforms/android/app/build.gradle View File

@@ -27,7 +27,7 @@ buildscript {
27 27
     }
28 28
 
29 29
     dependencies {
30
-        classpath 'com.android.tools.build:gradle:3.3.0'
30
+        classpath 'com.android.tools.build:gradle:3.5.1'
31 31
     }
32 32
 }
33 33
 

+ 1
- 1
km0App/platforms/android/build.gradle View File

@@ -28,7 +28,7 @@ buildscript {
28 28
         // NOTE: Do not place your application dependencies here; they belong
29 29
         // in the individual module build.gradle files
30 30
 
31
-        classpath 'com.android.tools.build:gradle:3.3.0'
31
+        classpath 'com.android.tools.build:gradle:3.5.1'
32 32
     }
33 33
 }
34 34
 

+ 0
- 0
km0App/platforms/ios/www/img/logo.png View File


+ 2
- 2
km0App/platforms/ios/www/index.html View File

@@ -28,10 +28,10 @@
28 28
             * Disables use of inline scripts in order to mitigate risk of XSS vulnerabilities. To change this:
29 29
                 * Enable inline JS: add 'unsafe-inline' to default-src
30 30
         -->
31
-        <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *">
31
+        <meta http-equiv="Content-Security-Policy" content="default-src 'self' data: gap: https://ssl.gstatic.com 'unsafe-eval'; style-src 'self' 'unsafe-inline'; media-src *; img-src 'self' data: content:;">
32 32
         <meta name="format-detection" content="telephone=no">
33 33
         <meta name="msapplication-tap-highlight" content="no">
34
-        <meta name="viewport" content="user-scalable=no, initial-scale=1, maximum-scale=1, minimum-scale=1, width=device-width">
34
+        <meta name="viewport" content="initial-scale=1, width=device-width, viewport-fit=cover">
35 35
         <link rel="stylesheet" type="text/css" href="css/index.css">
36 36
         <title>Hello World</title>
37 37
     </head>