瀏覽代碼

Location Button created and functional

dariel.ramirez 4 年之前
父節點
當前提交
e9cbe30232
共有 69 個文件被更改,包括 1793 次插入779 次删除
  1. 14
    14
      Trolley_App/.gitignore
  2. 124
    124
      Trolley_App/.idea/codeStyles/Project.xml
  3. 4
    4
      Trolley_App/.idea/codeStyles/codeStyleConfig.xml
  4. 18
    18
      Trolley_App/.idea/gradle.xml
  5. 8
    8
      Trolley_App/.idea/misc.xml
  6. 11
    11
      Trolley_App/.idea/runConfigurations.xml
  7. 0
    6
      Trolley_App/.idea/vcs.xml
  8. 1
    1
      Trolley_App/app/.gitignore
  9. 35
    36
      Trolley_App/app/build.gradle
  10. 21
    21
      Trolley_App/app/proguard-rules.pro
  11. 24
    24
      Trolley_App/app/src/androidTest/java/com/example/trolleylocation/ExampleInstrumentedTest.kt
  12. 23
    21
      Trolley_App/app/src/main/AndroidManifest.xml
  13. 0
    15
      Trolley_App/app/src/main/java/com/example/trolley_app/ListaDeParadas.kt
  14. 0
    21
      Trolley_App/app/src/main/java/com/example/trolley_app/MainActivity.kt
  15. 146
    0
      Trolley_App/app/src/main/java/com/example/trolleylocation/MainActivity.kt
  16. 34
    34
      Trolley_App/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
  17. 170
    170
      Trolley_App/app/src/main/res/drawable/ic_launcher_background.xml
  18. 二進制
      Trolley_App/app/src/main/res/drawable/mapa_uprrp_alpha.jpg
  19. 0
    102
      Trolley_App/app/src/main/res/layout/activity_lista_de_paradas.xml
  20. 29
    31
      Trolley_App/app/src/main/res/layout/activity_main.xml
  21. 4
    4
      Trolley_App/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  22. 4
    4
      Trolley_App/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  23. 6
    6
      Trolley_App/app/src/main/res/values/colors.xml
  24. 3
    19
      Trolley_App/app/src/main/res/values/strings.xml
  25. 11
    11
      Trolley_App/app/src/main/res/values/styles.xml
  26. 17
    17
      Trolley_App/app/src/test/java/com/example/trolleylocation/ExampleUnitTest.kt
  27. 28
    28
      Trolley_App/build.gradle
  28. 21
    21
      Trolley_App/gradle.properties
  29. 6
    6
      Trolley_App/gradle/wrapper/gradle-wrapper.properties
  30. 0
    0
      Trolley_App/gradlew
  31. 2
    2
      Trolley_App/settings.gradle
  32. 14
    0
      Trolley_Location_Button/.gitignore
  33. 125
    0
      Trolley_Location_Button/.idea/codeStyles/Project.xml
  34. 5
    0
      Trolley_Location_Button/.idea/codeStyles/codeStyleConfig.xml
  35. 19
    0
      Trolley_Location_Button/.idea/gradle.xml
  36. 9
    0
      Trolley_Location_Button/.idea/misc.xml
  37. 12
    0
      Trolley_Location_Button/.idea/runConfigurations.xml
  38. 1
    0
      Trolley_Location_Button/app/.gitignore
  39. 35
    0
      Trolley_Location_Button/app/build.gradle
  40. 21
    0
      Trolley_Location_Button/app/proguard-rules.pro
  41. 24
    0
      Trolley_Location_Button/app/src/androidTest/java/com/example/trolleylocation/ExampleInstrumentedTest.kt
  42. 24
    0
      Trolley_Location_Button/app/src/main/AndroidManifest.xml
  43. 146
    0
      Trolley_Location_Button/app/src/main/java/com/example/trolleylocation/MainActivity.kt
  44. 34
    0
      Trolley_Location_Button/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
  45. 170
    0
      Trolley_Location_Button/app/src/main/res/drawable/ic_launcher_background.xml
  46. 30
    0
      Trolley_Location_Button/app/src/main/res/layout/activity_main.xml
  47. 5
    0
      Trolley_Location_Button/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  48. 5
    0
      Trolley_Location_Button/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  49. 二進制
      Trolley_Location_Button/app/src/main/res/mipmap-hdpi/ic_launcher.png
  50. 二進制
      Trolley_Location_Button/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
  51. 二進制
      Trolley_Location_Button/app/src/main/res/mipmap-mdpi/ic_launcher.png
  52. 二進制
      Trolley_Location_Button/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
  53. 二進制
      Trolley_Location_Button/app/src/main/res/mipmap-xhdpi/ic_launcher.png
  54. 二進制
      Trolley_Location_Button/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
  55. 二進制
      Trolley_Location_Button/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  56. 二進制
      Trolley_Location_Button/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
  57. 二進制
      Trolley_Location_Button/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  58. 二進制
      Trolley_Location_Button/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
  59. 6
    0
      Trolley_Location_Button/app/src/main/res/values/colors.xml
  60. 3
    0
      Trolley_Location_Button/app/src/main/res/values/strings.xml
  61. 11
    0
      Trolley_Location_Button/app/src/main/res/values/styles.xml
  62. 17
    0
      Trolley_Location_Button/app/src/test/java/com/example/trolleylocation/ExampleUnitTest.kt
  63. 28
    0
      Trolley_Location_Button/build.gradle
  64. 21
    0
      Trolley_Location_Button/gradle.properties
  65. 二進制
      Trolley_Location_Button/gradle/wrapper/gradle-wrapper.jar
  66. 6
    0
      Trolley_Location_Button/gradle/wrapper/gradle-wrapper.properties
  67. 172
    0
      Trolley_Location_Button/gradlew
  68. 84
    0
      Trolley_Location_Button/gradlew.bat
  69. 2
    0
      Trolley_Location_Button/settings.gradle

+ 14
- 14
Trolley_App/.gitignore 查看文件

@@ -1,14 +1,14 @@
1
-*.iml
2
-.gradle
3
-/local.properties
4
-/.idea/caches
5
-/.idea/libraries
6
-/.idea/modules.xml
7
-/.idea/workspace.xml
8
-/.idea/navEditor.xml
9
-/.idea/assetWizardSettings.xml
10
-.DS_Store
11
-/build
12
-/captures
13
-.externalNativeBuild
14
-.cxx
1
+*.iml
2
+.gradle
3
+/local.properties
4
+/.idea/caches
5
+/.idea/libraries
6
+/.idea/modules.xml
7
+/.idea/workspace.xml
8
+/.idea/navEditor.xml
9
+/.idea/assetWizardSettings.xml
10
+.DS_Store
11
+/build
12
+/captures
13
+.externalNativeBuild
14
+.cxx

+ 124
- 124
Trolley_App/.idea/codeStyles/Project.xml 查看文件

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

+ 4
- 4
Trolley_App/.idea/codeStyles/codeStyleConfig.xml 查看文件

@@ -1,5 +1,5 @@
1
-<component name="ProjectCodeStyleConfiguration">
2
-  <state>
3
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
4
-  </state>
1
+<component name="ProjectCodeStyleConfiguration">
2
+  <state>
3
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
4
+  </state>
5 5
 </component>

+ 18
- 18
Trolley_App/.idea/gradle.xml 查看文件

@@ -1,19 +1,19 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="GradleSettings">
4
-    <option name="linkedExternalProjectsSettings">
5
-      <GradleProjectSettings>
6
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
7
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
8
-        <option name="modules">
9
-          <set>
10
-            <option value="$PROJECT_DIR$" />
11
-            <option value="$PROJECT_DIR$/app" />
12
-          </set>
13
-        </option>
14
-        <option name="resolveModulePerSourceSet" value="false" />
15
-        <option name="testRunner" value="PLATFORM" />
16
-      </GradleProjectSettings>
17
-    </option>
18
-  </component>
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="GradleSettings">
4
+    <option name="linkedExternalProjectsSettings">
5
+      <GradleProjectSettings>
6
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
7
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
8
+        <option name="modules">
9
+          <set>
10
+            <option value="$PROJECT_DIR$" />
11
+            <option value="$PROJECT_DIR$/app" />
12
+          </set>
13
+        </option>
14
+        <option name="resolveModulePerSourceSet" value="false" />
15
+        <option name="testRunner" value="PLATFORM" />
16
+      </GradleProjectSettings>
17
+    </option>
18
+  </component>
19 19
 </project>

+ 8
- 8
Trolley_App/.idea/misc.xml 查看文件

@@ -1,9 +1,9 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
4
-    <output url="file://$PROJECT_DIR$/build/classes" />
5
-  </component>
6
-  <component name="ProjectType">
7
-    <option name="id" value="Android" />
8
-  </component>
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
4
+    <output url="file://$PROJECT_DIR$/build/classes" />
5
+  </component>
6
+  <component name="ProjectType">
7
+    <option name="id" value="Android" />
8
+  </component>
9 9
 </project>

+ 11
- 11
Trolley_App/.idea/runConfigurations.xml 查看文件

@@ -1,12 +1,12 @@
1
-<?xml version="1.0" encoding="UTF-8"?>
2
-<project version="4">
3
-  <component name="RunConfigurationProducerService">
4
-    <option name="ignoredProducers">
5
-      <set>
6
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
7
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
8
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
9
-      </set>
10
-    </option>
11
-  </component>
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="RunConfigurationProducerService">
4
+    <option name="ignoredProducers">
5
+      <set>
6
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
7
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
8
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
9
+      </set>
10
+    </option>
11
+  </component>
12 12
 </project>

+ 0
- 6
Trolley_App/.idea/vcs.xml 查看文件

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

+ 1
- 1
Trolley_App/app/.gitignore 查看文件

@@ -1 +1 @@
1
-/build
1
+/build

+ 35
- 36
Trolley_App/app/build.gradle 查看文件

@@ -1,36 +1,35 @@
1
-apply plugin: 'com.android.application'
2
-
3
-apply plugin: 'kotlin-android'
4
-
5
-apply plugin: 'kotlin-android-extensions'
6
-
7
-android {
8
-    compileSdkVersion 29
9
-    buildToolsVersion "29.0.2"
10
-    defaultConfig {
11
-        applicationId "com.example.trolley_app"
12
-        minSdkVersion 14
13
-        targetSdkVersion 29
14
-        versionCode 1
15
-        versionName "1.0"
16
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
17
-    }
18
-    buildTypes {
19
-        release {
20
-            minifyEnabled false
21
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
22
-        }
23
-    }
24
-}
25
-
26
-dependencies {
27
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
28
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
29
-    implementation 'androidx.appcompat:appcompat:1.0.2'
30
-    implementation 'androidx.core:core-ktx:1.0.2'
31
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
32
-    testImplementation 'junit:junit:4.12'
33
-    androidTestImplementation 'androidx.test.ext:junit:1.1.0'
34
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
35
-    implementation 'com.google.android.material:material:1.0.0'
36
-}
1
+apply plugin: 'com.android.application'
2
+
3
+apply plugin: 'kotlin-android'
4
+
5
+apply plugin: 'kotlin-android-extensions'
6
+
7
+android {
8
+    compileSdkVersion 29
9
+    buildToolsVersion "29.0.2"
10
+    defaultConfig {
11
+        applicationId "com.example.trolleylocation"
12
+        minSdkVersion 23
13
+        targetSdkVersion 29
14
+        versionCode 1
15
+        versionName "1.0"
16
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
17
+    }
18
+    buildTypes {
19
+        release {
20
+            minifyEnabled false
21
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
22
+        }
23
+    }
24
+}
25
+
26
+dependencies {
27
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
28
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
29
+    implementation 'androidx.appcompat:appcompat:1.1.0'
30
+    implementation 'androidx.core:core-ktx:1.1.0'
31
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
32
+    testImplementation 'junit:junit:4.12'
33
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
34
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
35
+}

+ 21
- 21
Trolley_App/app/proguard-rules.pro 查看文件

@@ -1,21 +1,21 @@
1
-# Add project specific ProGuard rules here.
2
-# You can control the set of applied configuration files using the
3
-# proguardFiles setting in build.gradle.
4
-#
5
-# For more details, see
6
-#   http://developer.android.com/guide/developing/tools/proguard.html
7
-
8
-# If your project uses WebView with JS, uncomment the following
9
-# and specify the fully qualified class name to the JavaScript interface
10
-# class:
11
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12
-#   public *;
13
-#}
14
-
15
-# Uncomment this to preserve the line number information for
16
-# debugging stack traces.
17
-#-keepattributes SourceFile,LineNumberTable
18
-
19
-# If you keep the line number information, uncomment this to
20
-# hide the original source file name.
21
-#-renamesourcefileattribute SourceFile
1
+# Add project specific ProGuard rules here.
2
+# You can control the set of applied configuration files using the
3
+# proguardFiles setting in build.gradle.
4
+#
5
+# For more details, see
6
+#   http://developer.android.com/guide/developing/tools/proguard.html
7
+
8
+# If your project uses WebView with JS, uncomment the following
9
+# and specify the fully qualified class name to the JavaScript interface
10
+# class:
11
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12
+#   public *;
13
+#}
14
+
15
+# Uncomment this to preserve the line number information for
16
+# debugging stack traces.
17
+#-keepattributes SourceFile,LineNumberTable
18
+
19
+# If you keep the line number information, uncomment this to
20
+# hide the original source file name.
21
+#-renamesourcefileattribute SourceFile

Trolley_App/app/src/androidTest/java/com/example/trolley_app/ExampleInstrumentedTest.kt → Trolley_App/app/src/androidTest/java/com/example/trolleylocation/ExampleInstrumentedTest.kt 查看文件

@@ -1,24 +1,24 @@
1
-package com.example.trolley_app
2
-
3
-import androidx.test.platform.app.InstrumentationRegistry
4
-import androidx.test.ext.junit.runners.AndroidJUnit4
5
-
6
-import org.junit.Test
7
-import org.junit.runner.RunWith
8
-
9
-import org.junit.Assert.*
10
-
11
-/**
12
- * Instrumented test, which will execute on an Android device.
13
- *
14
- * See [testing documentation](http://d.android.com/tools/testing).
15
- */
16
-@RunWith(AndroidJUnit4::class)
17
-class ExampleInstrumentedTest {
18
-    @Test
19
-    fun useAppContext() {
20
-        // Context of the app under test.
21
-        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22
-        assertEquals("com.example.trolley_app", appContext.packageName)
23
-    }
24
-}
1
+package com.example.trolleylocation
2
+
3
+import androidx.test.platform.app.InstrumentationRegistry
4
+import androidx.test.ext.junit.runners.AndroidJUnit4
5
+
6
+import org.junit.Test
7
+import org.junit.runner.RunWith
8
+
9
+import org.junit.Assert.*
10
+
11
+/**
12
+ * Instrumented test, which will execute on an Android device.
13
+ *
14
+ * See [testing documentation](http://d.android.com/tools/testing).
15
+ */
16
+@RunWith(AndroidJUnit4::class)
17
+class ExampleInstrumentedTest {
18
+    @Test
19
+    fun useAppContext() {
20
+        // Context of the app under test.
21
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22
+        assertEquals("com.example.trolleylocation", appContext.packageName)
23
+    }
24
+}

+ 23
- 21
Trolley_App/app/src/main/AndroidManifest.xml 查看文件

@@ -1,22 +1,24 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
-    package="com.example.trolley_app">
4
-
5
-    <application
6
-        android:allowBackup="true"
7
-        android:icon="@mipmap/ic_launcher"
8
-        android:label="@string/app_name"
9
-        android:roundIcon="@mipmap/ic_launcher_round"
10
-        android:supportsRtl="true"
11
-        android:theme="@style/AppTheme">
12
-        <activity android:name=".ListaDeParadas"></activity>
13
-        <activity android:name=".MainActivity">
14
-            <intent-filter>
15
-                <action android:name="android.intent.action.MAIN" />
16
-
17
-                <category android:name="android.intent.category.LAUNCHER" />
18
-            </intent-filter>
19
-        </activity>
20
-    </application>
21
-
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
+    package="com.example.trolleylocation">
4
+
5
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
6
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
7
+
8
+    <application
9
+        android:allowBackup="true"
10
+        android:icon="@mipmap/ic_launcher"
11
+        android:label="@string/app_name"
12
+        android:roundIcon="@mipmap/ic_launcher_round"
13
+        android:supportsRtl="true"
14
+        android:theme="@style/AppTheme">
15
+        <activity android:name=".MainActivity">
16
+            <intent-filter>
17
+                <action android:name="android.intent.action.MAIN" />
18
+
19
+                <category android:name="android.intent.category.LAUNCHER" />
20
+            </intent-filter>
21
+        </activity>
22
+    </application>
23
+
22 24
 </manifest>

+ 0
- 15
Trolley_App/app/src/main/java/com/example/trolley_app/ListaDeParadas.kt 查看文件

@@ -1,15 +0,0 @@
1
-package com.example.trolley_app
2
-
3
-import android.content.Intent
4
-import androidx.appcompat.app.AppCompatActivity
5
-import android.os.Bundle
6
-import android.widget.Button
7
-
8
-class ListaDeParadas : AppCompatActivity() {
9
-
10
-    override fun onCreate(savedInstanceState: Bundle?) {
11
-        super.onCreate(savedInstanceState)
12
-        setContentView(R.layout.activity_lista_de_paradas)
13
-
14
-    }
15
-}

+ 0
- 21
Trolley_App/app/src/main/java/com/example/trolley_app/MainActivity.kt 查看文件

@@ -1,21 +0,0 @@
1
-package com.example.trolley_app
2
-
3
-import android.content.Intent
4
-import androidx.appcompat.app.AppCompatActivity
5
-import android.os.Bundle
6
-import android.widget.Button
7
-
8
-class MainActivity : AppCompatActivity() {
9
-
10
-    override fun onCreate(savedInstanceState: Bundle?) {
11
-        super.onCreate(savedInstanceState)
12
-        setContentView(R.layout.activity_main)
13
-        //Funcion del botdon Paradas que al precionarce, va a llevar al usuario
14
-        // a la pagina de lista de paradas.
15
-        val openParadas:Button = findViewById(R.id.button_paradas)
16
-        openParadas.setOnClickListener {
17
-            val intent = Intent(this, ListaDeParadas :: class.java)
18
-            startActivity(intent)
19
-        }
20
-    }
21
-}

+ 146
- 0
Trolley_App/app/src/main/java/com/example/trolleylocation/MainActivity.kt 查看文件

@@ -0,0 +1,146 @@
1
+package com.example.trolleylocation
2
+
3
+
4
+import android.Manifest
5
+import android.annotation.SuppressLint
6
+import android.content.Context
7
+import android.content.Intent
8
+import android.content.pm.PackageManager
9
+import android.location.Location
10
+import android.location.LocationListener
11
+import android.location.LocationManager
12
+import android.os.Build
13
+import android.os.Bundle
14
+import android.provider.Settings
15
+import android.util.Log
16
+import android.widget.Toast
17
+import android.widget.ToggleButton
18
+import androidx.appcompat.app.AppCompatActivity
19
+import kotlinx.android.synthetic.main.activity_main.*
20
+
21
+private const val PERMISSION_REQUEST = 10
22
+
23
+class MainActivity : AppCompatActivity() {
24
+
25
+
26
+    lateinit var locationManager: LocationManager
27
+    private var hasGps = false
28
+    private var locationGps: Location? = null
29
+
30
+    private var permissions = arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION)
31
+    override fun onCreate(savedInstanceState: Bundle?) {
32
+        super.onCreate(savedInstanceState)
33
+        setContentView(R.layout.activity_main)
34
+        disableView()
35
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
36
+            if (checkPermission(permissions)) {
37
+                enableView()
38
+            } else {
39
+                requestPermissions(permissions, PERMISSION_REQUEST)
40
+            }
41
+        } else {
42
+            enableView()
43
+        }
44
+
45
+        // Button that toggles when clicked
46
+        val toggleButton = findViewById<ToggleButton>(R.id.toggle_location)
47
+        toggleButton?.setOnCheckedChangeListener { buttonView, isChecked ->
48
+            val msg = "Tracking is " + if (isChecked) "ON" else "OFF"
49
+            Toast.makeText(this@MainActivity, msg, Toast.LENGTH_SHORT).show()
50
+            if(isChecked){
51
+                toggle_location.setOnClickListener{ getLocation() }
52
+            }
53
+        }
54
+    }
55
+
56
+    private fun disableView() {
57
+        toggle_location.isEnabled = false
58
+        toggle_location.alpha = 0.5F
59
+    }
60
+
61
+    private fun enableView() {
62
+        toggle_location.isEnabled = true
63
+        toggle_location.alpha = 1F
64
+        Toast.makeText(this, "GPS enabled", Toast.LENGTH_SHORT).show()
65
+    }
66
+
67
+    @SuppressLint("MissingPermission")
68
+    private fun getLocation() {
69
+        locationManager = getSystemService(Context.LOCATION_SERVICE) as LocationManager
70
+        hasGps = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
71
+        if (hasGps) {
72
+
73
+            if (hasGps) {
74
+                Log.d("CodeAndroidLocation", "hasGps")
75
+                locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 5000, 0F, object : LocationListener {
76
+
77
+                    override fun onLocationChanged(location: Location?) {
78
+                        if (toggle_location.isChecked == false){
79
+                            locationManager.removeUpdates(this)
80
+                        }
81
+
82
+                        if (location != null) {
83
+                            locationGps = location
84
+                            tv_result.append("\nGPS ")
85
+                            tv_result.append("\nLatitude : " + locationGps!!.latitude)
86
+                            tv_result.append("\nLongitude : " + locationGps!!.longitude)
87
+                            Log.d("CodeAndroidLocation", " GPS Latitude : " + locationGps!!.latitude)
88
+                            Log.d("CodeAndroidLocation", " GPS Longitude : " + locationGps!!.longitude)
89
+                        }
90
+
91
+                    }
92
+
93
+                    override fun onStatusChanged(provider: String?, status: Int, extras: Bundle?) {
94
+
95
+                    }
96
+
97
+                    override fun onProviderEnabled(provider: String?) {
98
+
99
+                    }
100
+
101
+                    override fun onProviderDisabled(provider: String?) {
102
+
103
+                    }
104
+
105
+                })
106
+
107
+                val localGpsLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
108
+                if (localGpsLocation != null)
109
+                    locationGps = localGpsLocation
110
+            }
111
+
112
+        } else {
113
+            startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS))
114
+        }
115
+    }
116
+
117
+    private fun checkPermission(permissionArray: Array<String>): Boolean {
118
+        var allSuccess = true
119
+        for (i in permissionArray.indices) {
120
+            if (checkCallingOrSelfPermission(permissionArray[i]) == PackageManager.PERMISSION_DENIED)
121
+                allSuccess = false
122
+        }
123
+        return allSuccess
124
+    }
125
+
126
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
127
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
128
+        if (requestCode == PERMISSION_REQUEST) {
129
+            var allSuccess = true
130
+            for (i in permissions.indices) {
131
+                if (grantResults[i] == PackageManager.PERMISSION_DENIED) {
132
+                    allSuccess = false
133
+                    val requestAgain = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && shouldShowRequestPermissionRationale(permissions[i])
134
+                    if (requestAgain) {
135
+                        Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show()
136
+                    } else {
137
+                        Toast.makeText(this, "Go to settings and enable the permission", Toast.LENGTH_SHORT).show()
138
+                    }
139
+                }
140
+            }
141
+            if (allSuccess)
142
+                enableView()
143
+
144
+        }
145
+    }
146
+}

+ 34
- 34
Trolley_App/app/src/main/res/drawable-v24/ic_launcher_foreground.xml 查看文件

@@ -1,34 +1,34 @@
1
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
-    xmlns:aapt="http://schemas.android.com/aapt"
3
-    android:width="108dp"
4
-    android:height="108dp"
5
-    android:viewportWidth="108"
6
-    android:viewportHeight="108">
7
-    <path
8
-        android:fillType="evenOdd"
9
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
10
-        android:strokeWidth="1"
11
-        android:strokeColor="#00000000">
12
-        <aapt:attr name="android:fillColor">
13
-            <gradient
14
-                android:endX="78.5885"
15
-                android:endY="90.9159"
16
-                android:startX="48.7653"
17
-                android:startY="61.0927"
18
-                android:type="linear">
19
-                <item
20
-                    android:color="#44000000"
21
-                    android:offset="0.0" />
22
-                <item
23
-                    android:color="#00000000"
24
-                    android:offset="1.0" />
25
-            </gradient>
26
-        </aapt:attr>
27
-    </path>
28
-    <path
29
-        android:fillColor="#FFFFFF"
30
-        android:fillType="nonZero"
31
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
32
-        android:strokeWidth="1"
33
-        android:strokeColor="#00000000" />
34
-</vector>
1
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
+    xmlns:aapt="http://schemas.android.com/aapt"
3
+    android:width="108dp"
4
+    android:height="108dp"
5
+    android:viewportWidth="108"
6
+    android:viewportHeight="108">
7
+    <path
8
+        android:fillType="evenOdd"
9
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
10
+        android:strokeWidth="1"
11
+        android:strokeColor="#00000000">
12
+        <aapt:attr name="android:fillColor">
13
+            <gradient
14
+                android:endX="78.5885"
15
+                android:endY="90.9159"
16
+                android:startX="48.7653"
17
+                android:startY="61.0927"
18
+                android:type="linear">
19
+                <item
20
+                    android:color="#44000000"
21
+                    android:offset="0.0" />
22
+                <item
23
+                    android:color="#00000000"
24
+                    android:offset="1.0" />
25
+            </gradient>
26
+        </aapt:attr>
27
+    </path>
28
+    <path
29
+        android:fillColor="#FFFFFF"
30
+        android:fillType="nonZero"
31
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
32
+        android:strokeWidth="1"
33
+        android:strokeColor="#00000000" />
34
+</vector>

+ 170
- 170
Trolley_App/app/src/main/res/drawable/ic_launcher_background.xml 查看文件

@@ -1,170 +1,170 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
3
-    android:width="108dp"
4
-    android:height="108dp"
5
-    android:viewportWidth="108"
6
-    android:viewportHeight="108">
7
-    <path
8
-        android:fillColor="#008577"
9
-        android:pathData="M0,0h108v108h-108z" />
10
-    <path
11
-        android:fillColor="#00000000"
12
-        android:pathData="M9,0L9,108"
13
-        android:strokeWidth="0.8"
14
-        android:strokeColor="#33FFFFFF" />
15
-    <path
16
-        android:fillColor="#00000000"
17
-        android:pathData="M19,0L19,108"
18
-        android:strokeWidth="0.8"
19
-        android:strokeColor="#33FFFFFF" />
20
-    <path
21
-        android:fillColor="#00000000"
22
-        android:pathData="M29,0L29,108"
23
-        android:strokeWidth="0.8"
24
-        android:strokeColor="#33FFFFFF" />
25
-    <path
26
-        android:fillColor="#00000000"
27
-        android:pathData="M39,0L39,108"
28
-        android:strokeWidth="0.8"
29
-        android:strokeColor="#33FFFFFF" />
30
-    <path
31
-        android:fillColor="#00000000"
32
-        android:pathData="M49,0L49,108"
33
-        android:strokeWidth="0.8"
34
-        android:strokeColor="#33FFFFFF" />
35
-    <path
36
-        android:fillColor="#00000000"
37
-        android:pathData="M59,0L59,108"
38
-        android:strokeWidth="0.8"
39
-        android:strokeColor="#33FFFFFF" />
40
-    <path
41
-        android:fillColor="#00000000"
42
-        android:pathData="M69,0L69,108"
43
-        android:strokeWidth="0.8"
44
-        android:strokeColor="#33FFFFFF" />
45
-    <path
46
-        android:fillColor="#00000000"
47
-        android:pathData="M79,0L79,108"
48
-        android:strokeWidth="0.8"
49
-        android:strokeColor="#33FFFFFF" />
50
-    <path
51
-        android:fillColor="#00000000"
52
-        android:pathData="M89,0L89,108"
53
-        android:strokeWidth="0.8"
54
-        android:strokeColor="#33FFFFFF" />
55
-    <path
56
-        android:fillColor="#00000000"
57
-        android:pathData="M99,0L99,108"
58
-        android:strokeWidth="0.8"
59
-        android:strokeColor="#33FFFFFF" />
60
-    <path
61
-        android:fillColor="#00000000"
62
-        android:pathData="M0,9L108,9"
63
-        android:strokeWidth="0.8"
64
-        android:strokeColor="#33FFFFFF" />
65
-    <path
66
-        android:fillColor="#00000000"
67
-        android:pathData="M0,19L108,19"
68
-        android:strokeWidth="0.8"
69
-        android:strokeColor="#33FFFFFF" />
70
-    <path
71
-        android:fillColor="#00000000"
72
-        android:pathData="M0,29L108,29"
73
-        android:strokeWidth="0.8"
74
-        android:strokeColor="#33FFFFFF" />
75
-    <path
76
-        android:fillColor="#00000000"
77
-        android:pathData="M0,39L108,39"
78
-        android:strokeWidth="0.8"
79
-        android:strokeColor="#33FFFFFF" />
80
-    <path
81
-        android:fillColor="#00000000"
82
-        android:pathData="M0,49L108,49"
83
-        android:strokeWidth="0.8"
84
-        android:strokeColor="#33FFFFFF" />
85
-    <path
86
-        android:fillColor="#00000000"
87
-        android:pathData="M0,59L108,59"
88
-        android:strokeWidth="0.8"
89
-        android:strokeColor="#33FFFFFF" />
90
-    <path
91
-        android:fillColor="#00000000"
92
-        android:pathData="M0,69L108,69"
93
-        android:strokeWidth="0.8"
94
-        android:strokeColor="#33FFFFFF" />
95
-    <path
96
-        android:fillColor="#00000000"
97
-        android:pathData="M0,79L108,79"
98
-        android:strokeWidth="0.8"
99
-        android:strokeColor="#33FFFFFF" />
100
-    <path
101
-        android:fillColor="#00000000"
102
-        android:pathData="M0,89L108,89"
103
-        android:strokeWidth="0.8"
104
-        android:strokeColor="#33FFFFFF" />
105
-    <path
106
-        android:fillColor="#00000000"
107
-        android:pathData="M0,99L108,99"
108
-        android:strokeWidth="0.8"
109
-        android:strokeColor="#33FFFFFF" />
110
-    <path
111
-        android:fillColor="#00000000"
112
-        android:pathData="M19,29L89,29"
113
-        android:strokeWidth="0.8"
114
-        android:strokeColor="#33FFFFFF" />
115
-    <path
116
-        android:fillColor="#00000000"
117
-        android:pathData="M19,39L89,39"
118
-        android:strokeWidth="0.8"
119
-        android:strokeColor="#33FFFFFF" />
120
-    <path
121
-        android:fillColor="#00000000"
122
-        android:pathData="M19,49L89,49"
123
-        android:strokeWidth="0.8"
124
-        android:strokeColor="#33FFFFFF" />
125
-    <path
126
-        android:fillColor="#00000000"
127
-        android:pathData="M19,59L89,59"
128
-        android:strokeWidth="0.8"
129
-        android:strokeColor="#33FFFFFF" />
130
-    <path
131
-        android:fillColor="#00000000"
132
-        android:pathData="M19,69L89,69"
133
-        android:strokeWidth="0.8"
134
-        android:strokeColor="#33FFFFFF" />
135
-    <path
136
-        android:fillColor="#00000000"
137
-        android:pathData="M19,79L89,79"
138
-        android:strokeWidth="0.8"
139
-        android:strokeColor="#33FFFFFF" />
140
-    <path
141
-        android:fillColor="#00000000"
142
-        android:pathData="M29,19L29,89"
143
-        android:strokeWidth="0.8"
144
-        android:strokeColor="#33FFFFFF" />
145
-    <path
146
-        android:fillColor="#00000000"
147
-        android:pathData="M39,19L39,89"
148
-        android:strokeWidth="0.8"
149
-        android:strokeColor="#33FFFFFF" />
150
-    <path
151
-        android:fillColor="#00000000"
152
-        android:pathData="M49,19L49,89"
153
-        android:strokeWidth="0.8"
154
-        android:strokeColor="#33FFFFFF" />
155
-    <path
156
-        android:fillColor="#00000000"
157
-        android:pathData="M59,19L59,89"
158
-        android:strokeWidth="0.8"
159
-        android:strokeColor="#33FFFFFF" />
160
-    <path
161
-        android:fillColor="#00000000"
162
-        android:pathData="M69,19L69,89"
163
-        android:strokeWidth="0.8"
164
-        android:strokeColor="#33FFFFFF" />
165
-    <path
166
-        android:fillColor="#00000000"
167
-        android:pathData="M79,19L79,89"
168
-        android:strokeWidth="0.8"
169
-        android:strokeColor="#33FFFFFF" />
170
-</vector>
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
3
+    android:width="108dp"
4
+    android:height="108dp"
5
+    android:viewportWidth="108"
6
+    android:viewportHeight="108">
7
+    <path
8
+        android:fillColor="#008577"
9
+        android:pathData="M0,0h108v108h-108z" />
10
+    <path
11
+        android:fillColor="#00000000"
12
+        android:pathData="M9,0L9,108"
13
+        android:strokeWidth="0.8"
14
+        android:strokeColor="#33FFFFFF" />
15
+    <path
16
+        android:fillColor="#00000000"
17
+        android:pathData="M19,0L19,108"
18
+        android:strokeWidth="0.8"
19
+        android:strokeColor="#33FFFFFF" />
20
+    <path
21
+        android:fillColor="#00000000"
22
+        android:pathData="M29,0L29,108"
23
+        android:strokeWidth="0.8"
24
+        android:strokeColor="#33FFFFFF" />
25
+    <path
26
+        android:fillColor="#00000000"
27
+        android:pathData="M39,0L39,108"
28
+        android:strokeWidth="0.8"
29
+        android:strokeColor="#33FFFFFF" />
30
+    <path
31
+        android:fillColor="#00000000"
32
+        android:pathData="M49,0L49,108"
33
+        android:strokeWidth="0.8"
34
+        android:strokeColor="#33FFFFFF" />
35
+    <path
36
+        android:fillColor="#00000000"
37
+        android:pathData="M59,0L59,108"
38
+        android:strokeWidth="0.8"
39
+        android:strokeColor="#33FFFFFF" />
40
+    <path
41
+        android:fillColor="#00000000"
42
+        android:pathData="M69,0L69,108"
43
+        android:strokeWidth="0.8"
44
+        android:strokeColor="#33FFFFFF" />
45
+    <path
46
+        android:fillColor="#00000000"
47
+        android:pathData="M79,0L79,108"
48
+        android:strokeWidth="0.8"
49
+        android:strokeColor="#33FFFFFF" />
50
+    <path
51
+        android:fillColor="#00000000"
52
+        android:pathData="M89,0L89,108"
53
+        android:strokeWidth="0.8"
54
+        android:strokeColor="#33FFFFFF" />
55
+    <path
56
+        android:fillColor="#00000000"
57
+        android:pathData="M99,0L99,108"
58
+        android:strokeWidth="0.8"
59
+        android:strokeColor="#33FFFFFF" />
60
+    <path
61
+        android:fillColor="#00000000"
62
+        android:pathData="M0,9L108,9"
63
+        android:strokeWidth="0.8"
64
+        android:strokeColor="#33FFFFFF" />
65
+    <path
66
+        android:fillColor="#00000000"
67
+        android:pathData="M0,19L108,19"
68
+        android:strokeWidth="0.8"
69
+        android:strokeColor="#33FFFFFF" />
70
+    <path
71
+        android:fillColor="#00000000"
72
+        android:pathData="M0,29L108,29"
73
+        android:strokeWidth="0.8"
74
+        android:strokeColor="#33FFFFFF" />
75
+    <path
76
+        android:fillColor="#00000000"
77
+        android:pathData="M0,39L108,39"
78
+        android:strokeWidth="0.8"
79
+        android:strokeColor="#33FFFFFF" />
80
+    <path
81
+        android:fillColor="#00000000"
82
+        android:pathData="M0,49L108,49"
83
+        android:strokeWidth="0.8"
84
+        android:strokeColor="#33FFFFFF" />
85
+    <path
86
+        android:fillColor="#00000000"
87
+        android:pathData="M0,59L108,59"
88
+        android:strokeWidth="0.8"
89
+        android:strokeColor="#33FFFFFF" />
90
+    <path
91
+        android:fillColor="#00000000"
92
+        android:pathData="M0,69L108,69"
93
+        android:strokeWidth="0.8"
94
+        android:strokeColor="#33FFFFFF" />
95
+    <path
96
+        android:fillColor="#00000000"
97
+        android:pathData="M0,79L108,79"
98
+        android:strokeWidth="0.8"
99
+        android:strokeColor="#33FFFFFF" />
100
+    <path
101
+        android:fillColor="#00000000"
102
+        android:pathData="M0,89L108,89"
103
+        android:strokeWidth="0.8"
104
+        android:strokeColor="#33FFFFFF" />
105
+    <path
106
+        android:fillColor="#00000000"
107
+        android:pathData="M0,99L108,99"
108
+        android:strokeWidth="0.8"
109
+        android:strokeColor="#33FFFFFF" />
110
+    <path
111
+        android:fillColor="#00000000"
112
+        android:pathData="M19,29L89,29"
113
+        android:strokeWidth="0.8"
114
+        android:strokeColor="#33FFFFFF" />
115
+    <path
116
+        android:fillColor="#00000000"
117
+        android:pathData="M19,39L89,39"
118
+        android:strokeWidth="0.8"
119
+        android:strokeColor="#33FFFFFF" />
120
+    <path
121
+        android:fillColor="#00000000"
122
+        android:pathData="M19,49L89,49"
123
+        android:strokeWidth="0.8"
124
+        android:strokeColor="#33FFFFFF" />
125
+    <path
126
+        android:fillColor="#00000000"
127
+        android:pathData="M19,59L89,59"
128
+        android:strokeWidth="0.8"
129
+        android:strokeColor="#33FFFFFF" />
130
+    <path
131
+        android:fillColor="#00000000"
132
+        android:pathData="M19,69L89,69"
133
+        android:strokeWidth="0.8"
134
+        android:strokeColor="#33FFFFFF" />
135
+    <path
136
+        android:fillColor="#00000000"
137
+        android:pathData="M19,79L89,79"
138
+        android:strokeWidth="0.8"
139
+        android:strokeColor="#33FFFFFF" />
140
+    <path
141
+        android:fillColor="#00000000"
142
+        android:pathData="M29,19L29,89"
143
+        android:strokeWidth="0.8"
144
+        android:strokeColor="#33FFFFFF" />
145
+    <path
146
+        android:fillColor="#00000000"
147
+        android:pathData="M39,19L39,89"
148
+        android:strokeWidth="0.8"
149
+        android:strokeColor="#33FFFFFF" />
150
+    <path
151
+        android:fillColor="#00000000"
152
+        android:pathData="M49,19L49,89"
153
+        android:strokeWidth="0.8"
154
+        android:strokeColor="#33FFFFFF" />
155
+    <path
156
+        android:fillColor="#00000000"
157
+        android:pathData="M59,19L59,89"
158
+        android:strokeWidth="0.8"
159
+        android:strokeColor="#33FFFFFF" />
160
+    <path
161
+        android:fillColor="#00000000"
162
+        android:pathData="M69,19L69,89"
163
+        android:strokeWidth="0.8"
164
+        android:strokeColor="#33FFFFFF" />
165
+    <path
166
+        android:fillColor="#00000000"
167
+        android:pathData="M79,19L79,89"
168
+        android:strokeWidth="0.8"
169
+        android:strokeColor="#33FFFFFF" />
170
+</vector>

二進制
Trolley_App/app/src/main/res/drawable/mapa_uprrp_alpha.jpg 查看文件


+ 0
- 102
Trolley_App/app/src/main/res/layout/activity_lista_de_paradas.xml 查看文件

@@ -1,102 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
-    xmlns:app="http://schemas.android.com/apk/res-auto"
4
-    xmlns:tools="http://schemas.android.com/tools"
5
-    android:layout_width="match_parent"
6
-    android:layout_height="match_parent"
7
-    tools:context=".ListaDeParadas">
8
-
9
-    <TextView
10
-        android:id="@+id/textView2"
11
-        android:layout_width="wrap_content"
12
-        android:layout_height="wrap_content"
13
-        android:layout_marginStart="179dp"
14
-        android:layout_marginLeft="179dp"
15
-        android:layout_marginTop="16dp"
16
-        android:layout_marginEnd="180dp"
17
-        android:layout_marginRight="180dp"
18
-        android:layout_marginBottom="32dp"
19
-        android:text="@string/paradas"
20
-        app:layout_constraintBottom_toTopOf="@+id/scrollView2"
21
-        app:layout_constraintEnd_toEndOf="parent"
22
-        app:layout_constraintHorizontal_bias="0.0"
23
-        app:layout_constraintStart_toStartOf="parent"
24
-        app:layout_constraintTop_toTopOf="parent"
25
-        app:layout_constraintVertical_bias="0.0" />
26
-
27
-    <ScrollView
28
-        android:id="@+id/scrollView2"
29
-        android:layout_width="390dp"
30
-        android:layout_height="511dp"
31
-        android:layout_marginStart="1dp"
32
-        android:layout_marginLeft="1dp"
33
-        android:layout_marginTop="8dp"
34
-        android:layout_marginBottom="1dp"
35
-        app:layout_constraintBottom_toBottomOf="parent"
36
-        app:layout_constraintEnd_toEndOf="parent"
37
-        app:layout_constraintStart_toStartOf="parent"
38
-        app:layout_constraintTop_toBottomOf="@+id/textView2">
39
-
40
-        <LinearLayout
41
-            android:layout_width="match_parent"
42
-            android:layout_height="wrap_content"
43
-            android:orientation="vertical">
44
-
45
-            <TextView
46
-                android:id="@+id/textView_Row_1"
47
-                android:layout_width="match_parent"
48
-                android:layout_height="57dp"
49
-                android:text="@string/parada_1" />
50
-
51
-            <TextView
52
-                android:id="@+id/textView_Row_2"
53
-                android:layout_width="match_parent"
54
-                android:layout_height="57dp"
55
-                android:text="@string/parada_2" />
56
-
57
-            <TextView
58
-                android:id="@+id/textView_Row_3"
59
-                android:layout_width="match_parent"
60
-                android:layout_height="57dp"
61
-                android:text="@string/parada_3" />
62
-
63
-            <TextView
64
-                android:id="@+id/textView_Row_4"
65
-                android:layout_width="match_parent"
66
-                android:layout_height="57dp"
67
-                android:text="@string/parada_4" />
68
-
69
-            <TextView
70
-                android:id="@+id/textView_Row_5"
71
-                android:layout_width="match_parent"
72
-                android:layout_height="57dp"
73
-                android:text="@string/parada_5" />
74
-
75
-            <TextView
76
-                android:id="@+id/textView_Row_7"
77
-                android:layout_width="match_parent"
78
-                android:layout_height="57dp"
79
-                android:text="@string/parada_7" />
80
-
81
-            <TextView
82
-                android:id="@+id/textView_Row_6"
83
-                android:layout_width="match_parent"
84
-                android:layout_height="57dp"
85
-                android:text="@string/parada_6" />
86
-
87
-            <TextView
88
-                android:id="@+id/textView_Row_8"
89
-                android:layout_width="match_parent"
90
-                android:layout_height="57dp"
91
-                android:text="@string/parada_8" />
92
-
93
-            <TextView
94
-                android:id="@+id/textView_Row_9"
95
-                android:layout_width="match_parent"
96
-                android:layout_height="57dp"
97
-                android:text="@string/parada_9" />
98
-
99
-        </LinearLayout>
100
-    </ScrollView>
101
-
102
-</androidx.constraintlayout.widget.ConstraintLayout>

+ 29
- 31
Trolley_App/app/src/main/res/layout/activity_main.xml 查看文件

@@ -1,32 +1,30 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
-    xmlns:app="http://schemas.android.com/apk/res-auto"
4
-    xmlns:tools="http://schemas.android.com/tools"
5
-    android:layout_width="match_parent"
6
-    android:layout_height="match_parent"
7
-    tools:context=".MainActivity">
8
-
9
-    <Button
10
-        android:id="@+id/button_paradas"
11
-        android:layout_width="wrap_content"
12
-        android:layout_height="wrap_content"
13
-        android:layout_marginEnd="8dp"
14
-        android:layout_marginRight="8dp"
15
-        android:layout_marginBottom="8dp"
16
-        android:contentDescription="@string/abrir_listado_de_paradas_en_una_nueva_pagina"
17
-        android:text="@string/paradas"
18
-        app:layout_constraintBottom_toBottomOf="parent"
19
-        app:layout_constraintEnd_toEndOf="parent" />
20
-
21
-    <ImageView
22
-        android:id="@+id/imageView"
23
-        android:layout_width="412dp"
24
-        android:layout_height="473dp"
25
-        android:contentDescription="@string/mapa_de_la_universidad_de_puerto_rico"
26
-        app:layout_constraintEnd_toEndOf="parent"
27
-        app:layout_constraintHorizontal_bias="1.0"
28
-        app:layout_constraintStart_toStartOf="parent"
29
-        app:layout_constraintTop_toTopOf="parent"
30
-        app:srcCompat="@drawable/mapa_uprrp_alpha" />
31
-
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
+    xmlns:app="http://schemas.android.com/apk/res-auto"
4
+    xmlns:tools="http://schemas.android.com/tools"
5
+    android:layout_width="match_parent"
6
+    android:layout_height="match_parent"
7
+    tools:context=".MainActivity">
8
+
9
+    <ToggleButton
10
+        android:id="@+id/toggle_location"
11
+        android:layout_width="wrap_content"
12
+        android:layout_height="wrap_content"
13
+        android:layout_marginEnd="16dp"
14
+        android:layout_marginBottom="50dp"
15
+        android:textOff="Start Tracking"
16
+        android:textOn="Stop Tracking"
17
+        app:layout_constraintBottom_toBottomOf="parent"
18
+        app:layout_constraintEnd_toEndOf="parent" />
19
+
20
+    <TextView
21
+        android:id="@+id/tv_result"
22
+        android:layout_width="0dp"
23
+        android:layout_height="wrap_content"
24
+        android:layout_marginTop="1dp"
25
+        android:gravity="center_horizontal"
26
+        app:layout_constraintEnd_toEndOf="parent"
27
+        app:layout_constraintStart_toStartOf="parent"
28
+        app:layout_constraintTop_toTopOf="parent" />
29
+
32 30
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 4
- 4
Trolley_App/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml 查看文件

@@ -1,5 +1,5 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3
-    <background android:drawable="@drawable/ic_launcher_background" />
4
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3
+    <background android:drawable="@drawable/ic_launcher_background" />
4
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
5 5
 </adaptive-icon>

+ 4
- 4
Trolley_App/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml 查看文件

@@ -1,5 +1,5 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3
-    <background android:drawable="@drawable/ic_launcher_background" />
4
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3
+    <background android:drawable="@drawable/ic_launcher_background" />
4
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
5 5
 </adaptive-icon>

+ 6
- 6
Trolley_App/app/src/main/res/values/colors.xml 查看文件

@@ -1,6 +1,6 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<resources>
3
-    <color name="colorPrimary">#C21313</color>
4
-    <color name="colorPrimaryDark">#00574B</color>
5
-    <color name="colorAccent">#D81B60</color>
6
-</resources>
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<resources>
3
+    <color name="colorPrimary">#008577</color>
4
+    <color name="colorPrimaryDark">#00574B</color>
5
+    <color name="colorAccent">#D81B60</color>
6
+</resources>

+ 3
- 19
Trolley_App/app/src/main/res/values/strings.xml 查看文件

@@ -1,19 +1,3 @@
1
-<resources>
2
-    <string name="app_name">Trolley IUPI</string>
3
-    <string name="abrir_listado_de_paradas_en_una_nueva_pagina">Abrir listado de paradas en una nueva pagina.</string>
4
-    <string name="paradas">Paradas</string>
5
-    <string name="parada_1">Parada 1</string>
6
-    <string name="parada_2">Parada 2</string>
7
-    <string name="parada_3">Parada 3</string>
8
-    <string name="parada_4">Parada 4</string>
9
-    <string name="parada_5">Parada 5</string>
10
-    <string name="parada_6">Parada 6</string>
11
-    <string name="parada_7">Parada 7</string>
12
-    <string name="parada_8">Parada 8</string>
13
-    <string name="parada">Parada</string>
14
-    <string name="atras">Atras</string>
15
-    <string name="parada_9">Parada 9</string>
16
-    <string name="mapa">Mapa</string>
17
-    <string name="todo">TODO</string>
18
-    <string name="mapa_de_la_universidad_de_puerto_rico">Mapa de la Universidad de Puerto Rico</string>
19
-</resources>
1
+<resources>
2
+    <string name="app_name">trolleyLocation</string>
3
+</resources>

+ 11
- 11
Trolley_App/app/src/main/res/values/styles.xml 查看文件

@@ -1,11 +1,11 @@
1
-<resources>
2
-
3
-    <!-- Base application theme. -->
4
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
5
-        <!-- Customize your theme here. -->
6
-        <item name="colorPrimary">@color/colorPrimary</item>
7
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
8
-        <item name="colorAccent">@color/colorAccent</item>
9
-    </style>
10
-
11
-</resources>
1
+<resources>
2
+
3
+    <!-- Base application theme. -->
4
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
5
+        <!-- Customize your theme here. -->
6
+        <item name="colorPrimary">@color/colorPrimary</item>
7
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
8
+        <item name="colorAccent">@color/colorAccent</item>
9
+    </style>
10
+
11
+</resources>

Trolley_App/app/src/test/java/com/example/trolley_app/ExampleUnitTest.kt → Trolley_App/app/src/test/java/com/example/trolleylocation/ExampleUnitTest.kt 查看文件

@@ -1,17 +1,17 @@
1
-package com.example.trolley_app
2
-
3
-import org.junit.Test
4
-
5
-import org.junit.Assert.*
6
-
7
-/**
8
- * Example local unit test, which will execute on the development machine (host).
9
- *
10
- * See [testing documentation](http://d.android.com/tools/testing).
11
- */
12
-class ExampleUnitTest {
13
-    @Test
14
-    fun addition_isCorrect() {
15
-        assertEquals(4, 2 + 2)
16
-    }
17
-}
1
+package com.example.trolleylocation
2
+
3
+import org.junit.Test
4
+
5
+import org.junit.Assert.*
6
+
7
+/**
8
+ * Example local unit test, which will execute on the development machine (host).
9
+ *
10
+ * See [testing documentation](http://d.android.com/tools/testing).
11
+ */
12
+class ExampleUnitTest {
13
+    @Test
14
+    fun addition_isCorrect() {
15
+        assertEquals(4, 2 + 2)
16
+    }
17
+}

+ 28
- 28
Trolley_App/build.gradle 查看文件

@@ -1,28 +1,28 @@
1
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
2
-
3
-buildscript {
4
-    ext.kotlin_version = '1.3.50'
5
-    repositories {
6
-        google()
7
-        jcenter()
8
-        
9
-    }
10
-    dependencies {
11
-        classpath 'com.android.tools.build:gradle:3.5.1'
12
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13
-        // NOTE: Do not place your application dependencies here; they belong
14
-        // in the individual module build.gradle files
15
-    }
16
-}
17
-
18
-allprojects {
19
-    repositories {
20
-        google()
21
-        jcenter()
22
-        
23
-    }
24
-}
25
-
26
-task clean(type: Delete) {
27
-    delete rootProject.buildDir
28
-}
1
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
2
+
3
+buildscript {
4
+    ext.kotlin_version = '1.3.50'
5
+    repositories {
6
+        google()
7
+        jcenter()
8
+        
9
+    }
10
+    dependencies {
11
+        classpath 'com.android.tools.build:gradle:3.5.2'
12
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13
+        // NOTE: Do not place your application dependencies here; they belong
14
+        // in the individual module build.gradle files
15
+    }
16
+}
17
+
18
+allprojects {
19
+    repositories {
20
+        google()
21
+        jcenter()
22
+        
23
+    }
24
+}
25
+
26
+task clean(type: Delete) {
27
+    delete rootProject.buildDir
28
+}

+ 21
- 21
Trolley_App/gradle.properties 查看文件

@@ -1,21 +1,21 @@
1
-# Project-wide Gradle settings.
2
-# IDE (e.g. Android Studio) users:
3
-# Gradle settings configured through the IDE *will override*
4
-# any settings specified in this file.
5
-# For more details on how to configure your build environment visit
6
-# http://www.gradle.org/docs/current/userguide/build_environment.html
7
-# Specifies the JVM arguments used for the daemon process.
8
-# The setting is particularly useful for tweaking memory settings.
9
-org.gradle.jvmargs=-Xmx1536m
10
-# When configured, Gradle will run in incubating parallel mode.
11
-# This option should only be used with decoupled projects. More details, visit
12
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
13
-# org.gradle.parallel=true
14
-# AndroidX package structure to make it clearer which packages are bundled with the
15
-# Android operating system, and which are packaged with your app's APK
16
-# https://developer.android.com/topic/libraries/support-library/androidx-rn
17
-android.useAndroidX=true
18
-# Automatically convert third-party libraries to use AndroidX
19
-android.enableJetifier=true
20
-# Kotlin code style for this project: "official" or "obsolete":
21
-kotlin.code.style=official
1
+# Project-wide Gradle settings.
2
+# IDE (e.g. Android Studio) users:
3
+# Gradle settings configured through the IDE *will override*
4
+# any settings specified in this file.
5
+# For more details on how to configure your build environment visit
6
+# http://www.gradle.org/docs/current/userguide/build_environment.html
7
+# Specifies the JVM arguments used for the daemon process.
8
+# The setting is particularly useful for tweaking memory settings.
9
+org.gradle.jvmargs=-Xmx1536m
10
+# When configured, Gradle will run in incubating parallel mode.
11
+# This option should only be used with decoupled projects. More details, visit
12
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
13
+# org.gradle.parallel=true
14
+# AndroidX package structure to make it clearer which packages are bundled with the
15
+# Android operating system, and which are packaged with your app's APK
16
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
17
+android.useAndroidX=true
18
+# Automatically convert third-party libraries to use AndroidX
19
+android.enableJetifier=true
20
+# Kotlin code style for this project: "official" or "obsolete":
21
+kotlin.code.style=official

+ 6
- 6
Trolley_App/gradle/wrapper/gradle-wrapper.properties 查看文件

@@ -1,6 +1,6 @@
1
-#Sun Oct 20 12:32:21 BOT 2019
2
-distributionBase=GRADLE_USER_HOME
3
-distributionPath=wrapper/dists
4
-zipStoreBase=GRADLE_USER_HOME
5
-zipStorePath=wrapper/dists
6
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
1
+#Mon Nov 11 05:00:36 AST 2019
2
+distributionBase=GRADLE_USER_HOME
3
+distributionPath=wrapper/dists
4
+zipStoreBase=GRADLE_USER_HOME
5
+zipStorePath=wrapper/dists
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

+ 0
- 0
Trolley_App/gradlew 查看文件


+ 2
- 2
Trolley_App/settings.gradle 查看文件

@@ -1,2 +1,2 @@
1
-include ':app'
2
-rootProject.name='Trolley_App'
1
+include ':app'
2
+rootProject.name='trolleyLocation'

+ 14
- 0
Trolley_Location_Button/.gitignore 查看文件

@@ -0,0 +1,14 @@
1
+*.iml
2
+.gradle
3
+/local.properties
4
+/.idea/caches
5
+/.idea/libraries
6
+/.idea/modules.xml
7
+/.idea/workspace.xml
8
+/.idea/navEditor.xml
9
+/.idea/assetWizardSettings.xml
10
+.DS_Store
11
+/build
12
+/captures
13
+.externalNativeBuild
14
+.cxx

+ 125
- 0
Trolley_Location_Button/.idea/codeStyles/Project.xml 查看文件

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

+ 5
- 0
Trolley_Location_Button/.idea/codeStyles/codeStyleConfig.xml 查看文件

@@ -0,0 +1,5 @@
1
+<component name="ProjectCodeStyleConfiguration">
2
+  <state>
3
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
4
+  </state>
5
+</component>

+ 19
- 0
Trolley_Location_Button/.idea/gradle.xml 查看文件

@@ -0,0 +1,19 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="GradleSettings">
4
+    <option name="linkedExternalProjectsSettings">
5
+      <GradleProjectSettings>
6
+        <option name="distributionType" value="DEFAULT_WRAPPED" />
7
+        <option name="externalProjectPath" value="$PROJECT_DIR$" />
8
+        <option name="modules">
9
+          <set>
10
+            <option value="$PROJECT_DIR$" />
11
+            <option value="$PROJECT_DIR$/app" />
12
+          </set>
13
+        </option>
14
+        <option name="resolveModulePerSourceSet" value="false" />
15
+        <option name="testRunner" value="PLATFORM" />
16
+      </GradleProjectSettings>
17
+    </option>
18
+  </component>
19
+</project>

+ 9
- 0
Trolley_Location_Button/.idea/misc.xml 查看文件

@@ -0,0 +1,9 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK">
4
+    <output url="file://$PROJECT_DIR$/build/classes" />
5
+  </component>
6
+  <component name="ProjectType">
7
+    <option name="id" value="Android" />
8
+  </component>
9
+</project>

+ 12
- 0
Trolley_Location_Button/.idea/runConfigurations.xml 查看文件

@@ -0,0 +1,12 @@
1
+<?xml version="1.0" encoding="UTF-8"?>
2
+<project version="4">
3
+  <component name="RunConfigurationProducerService">
4
+    <option name="ignoredProducers">
5
+      <set>
6
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
7
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
8
+        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
9
+      </set>
10
+    </option>
11
+  </component>
12
+</project>

+ 1
- 0
Trolley_Location_Button/app/.gitignore 查看文件

@@ -0,0 +1 @@
1
+/build

+ 35
- 0
Trolley_Location_Button/app/build.gradle 查看文件

@@ -0,0 +1,35 @@
1
+apply plugin: 'com.android.application'
2
+
3
+apply plugin: 'kotlin-android'
4
+
5
+apply plugin: 'kotlin-android-extensions'
6
+
7
+android {
8
+    compileSdkVersion 29
9
+    buildToolsVersion "29.0.2"
10
+    defaultConfig {
11
+        applicationId "com.example.trolleylocation"
12
+        minSdkVersion 23
13
+        targetSdkVersion 29
14
+        versionCode 1
15
+        versionName "1.0"
16
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
17
+    }
18
+    buildTypes {
19
+        release {
20
+            minifyEnabled false
21
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
22
+        }
23
+    }
24
+}
25
+
26
+dependencies {
27
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
28
+    implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
29
+    implementation 'androidx.appcompat:appcompat:1.1.0'
30
+    implementation 'androidx.core:core-ktx:1.1.0'
31
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
32
+    testImplementation 'junit:junit:4.12'
33
+    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
34
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
35
+}

+ 21
- 0
Trolley_Location_Button/app/proguard-rules.pro 查看文件

@@ -0,0 +1,21 @@
1
+# Add project specific ProGuard rules here.
2
+# You can control the set of applied configuration files using the
3
+# proguardFiles setting in build.gradle.
4
+#
5
+# For more details, see
6
+#   http://developer.android.com/guide/developing/tools/proguard.html
7
+
8
+# If your project uses WebView with JS, uncomment the following
9
+# and specify the fully qualified class name to the JavaScript interface
10
+# class:
11
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
12
+#   public *;
13
+#}
14
+
15
+# Uncomment this to preserve the line number information for
16
+# debugging stack traces.
17
+#-keepattributes SourceFile,LineNumberTable
18
+
19
+# If you keep the line number information, uncomment this to
20
+# hide the original source file name.
21
+#-renamesourcefileattribute SourceFile

+ 24
- 0
Trolley_Location_Button/app/src/androidTest/java/com/example/trolleylocation/ExampleInstrumentedTest.kt 查看文件

@@ -0,0 +1,24 @@
1
+package com.example.trolleylocation
2
+
3
+import androidx.test.platform.app.InstrumentationRegistry
4
+import androidx.test.ext.junit.runners.AndroidJUnit4
5
+
6
+import org.junit.Test
7
+import org.junit.runner.RunWith
8
+
9
+import org.junit.Assert.*
10
+
11
+/**
12
+ * Instrumented test, which will execute on an Android device.
13
+ *
14
+ * See [testing documentation](http://d.android.com/tools/testing).
15
+ */
16
+@RunWith(AndroidJUnit4::class)
17
+class ExampleInstrumentedTest {
18
+    @Test
19
+    fun useAppContext() {
20
+        // Context of the app under test.
21
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
22
+        assertEquals("com.example.trolleylocation", appContext.packageName)
23
+    }
24
+}

+ 24
- 0
Trolley_Location_Button/app/src/main/AndroidManifest.xml 查看文件

@@ -0,0 +1,24 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3
+    package="com.example.trolleylocation">
4
+
5
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
6
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
7
+
8
+    <application
9
+        android:allowBackup="true"
10
+        android:icon="@mipmap/ic_launcher"
11
+        android:label="@string/app_name"
12
+        android:roundIcon="@mipmap/ic_launcher_round"
13
+        android:supportsRtl="true"
14
+        android:theme="@style/AppTheme">
15
+        <activity android:name=".MainActivity">
16
+            <intent-filter>
17
+                <action android:name="android.intent.action.MAIN" />
18
+
19
+                <category android:name="android.intent.category.LAUNCHER" />
20
+            </intent-filter>
21
+        </activity>
22
+    </application>
23
+
24
+</manifest>

+ 146
- 0
Trolley_Location_Button/app/src/main/java/com/example/trolleylocation/MainActivity.kt 查看文件

@@ -0,0 +1,146 @@
1
+package com.example.trolleylocation
2
+
3
+
4
+import android.Manifest
5
+import android.annotation.SuppressLint
6
+import android.content.Context
7
+import android.content.Intent
8
+import android.content.pm.PackageManager
9
+import android.location.Location
10
+import android.location.LocationListener
11
+import android.location.LocationManager
12
+import android.os.Build
13
+import android.os.Bundle
14
+import android.provider.Settings
15
+import android.util.Log
16
+import android.widget.Toast
17
+import android.widget.ToggleButton
18
+import androidx.appcompat.app.AppCompatActivity
19
+import kotlinx.android.synthetic.main.activity_main.*
20
+
21
+private const val PERMISSION_REQUEST = 10
22
+
23
+class MainActivity : AppCompatActivity() {
24
+
25
+
26
+    lateinit var locationManager: LocationManager
27
+    private var hasGps = false
28
+    private var locationGps: Location? = null
29
+
30
+    private var permissions = arrayOf(Manifest.permission.ACCESS_FINE_LOCATION, Manifest.permission.ACCESS_COARSE_LOCATION)
31
+    override fun onCreate(savedInstanceState: Bundle?) {
32
+        super.onCreate(savedInstanceState)
33
+        setContentView(R.layout.activity_main)
34
+        disableView()
35
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
36
+            if (checkPermission(permissions)) {
37
+                enableView()
38
+            } else {
39
+                requestPermissions(permissions, PERMISSION_REQUEST)
40
+            }
41
+        } else {
42
+            enableView()
43
+        }
44
+
45
+        // Button that toggles when clicked
46
+        val toggleButton = findViewById<ToggleButton>(R.id.toggle_location)
47
+        toggleButton?.setOnCheckedChangeListener { buttonView, isChecked ->
48
+            val msg = "Tracking is " + if (isChecked) "ON" else "OFF"
49
+            Toast.makeText(this@MainActivity, msg, Toast.LENGTH_SHORT).show()
50
+            if(isChecked){
51
+                toggle_location.setOnClickListener{ getLocation() }
52
+            }
53
+        }
54
+    }
55
+
56
+    private fun disableView() {
57
+        toggle_location.isEnabled = false
58
+        toggle_location.alpha = 0.5F
59
+    }
60
+
61
+    private fun enableView() {
62
+        toggle_location.isEnabled = true
63
+        toggle_location.alpha = 1F
64
+        Toast.makeText(this, "GPS enabled", Toast.LENGTH_SHORT).show()
65
+    }
66
+
67
+    @SuppressLint("MissingPermission")
68
+    private fun getLocation() {
69
+        locationManager = getSystemService(Context.LOCATION_SERVICE) as LocationManager
70
+        hasGps = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER)
71
+        if (hasGps) {
72
+
73
+            if (hasGps) {
74
+                Log.d("CodeAndroidLocation", "hasGps")
75
+                locationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, 5000, 0F, object : LocationListener {
76
+
77
+                    override fun onLocationChanged(location: Location?) {
78
+                        if (toggle_location.isChecked == false){
79
+                            locationManager.removeUpdates(this)
80
+                        }
81
+
82
+                        if (location != null) {
83
+                            locationGps = location
84
+                            tv_result.append("\nGPS ")
85
+                            tv_result.append("\nLatitude : " + locationGps!!.latitude)
86
+                            tv_result.append("\nLongitude : " + locationGps!!.longitude)
87
+                            Log.d("CodeAndroidLocation", " GPS Latitude : " + locationGps!!.latitude)
88
+                            Log.d("CodeAndroidLocation", " GPS Longitude : " + locationGps!!.longitude)
89
+                        }
90
+
91
+                    }
92
+
93
+                    override fun onStatusChanged(provider: String?, status: Int, extras: Bundle?) {
94
+
95
+                    }
96
+
97
+                    override fun onProviderEnabled(provider: String?) {
98
+
99
+                    }
100
+
101
+                    override fun onProviderDisabled(provider: String?) {
102
+
103
+                    }
104
+
105
+                })
106
+
107
+                val localGpsLocation = locationManager.getLastKnownLocation(LocationManager.GPS_PROVIDER)
108
+                if (localGpsLocation != null)
109
+                    locationGps = localGpsLocation
110
+            }
111
+
112
+        } else {
113
+            startActivity(Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS))
114
+        }
115
+    }
116
+
117
+    private fun checkPermission(permissionArray: Array<String>): Boolean {
118
+        var allSuccess = true
119
+        for (i in permissionArray.indices) {
120
+            if (checkCallingOrSelfPermission(permissionArray[i]) == PackageManager.PERMISSION_DENIED)
121
+                allSuccess = false
122
+        }
123
+        return allSuccess
124
+    }
125
+
126
+    override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
127
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
128
+        if (requestCode == PERMISSION_REQUEST) {
129
+            var allSuccess = true
130
+            for (i in permissions.indices) {
131
+                if (grantResults[i] == PackageManager.PERMISSION_DENIED) {
132
+                    allSuccess = false
133
+                    val requestAgain = Build.VERSION.SDK_INT >= Build.VERSION_CODES.M && shouldShowRequestPermissionRationale(permissions[i])
134
+                    if (requestAgain) {
135
+                        Toast.makeText(this, "Permission denied", Toast.LENGTH_SHORT).show()
136
+                    } else {
137
+                        Toast.makeText(this, "Go to settings and enable the permission", Toast.LENGTH_SHORT).show()
138
+                    }
139
+                }
140
+            }
141
+            if (allSuccess)
142
+                enableView()
143
+
144
+        }
145
+    }
146
+}

+ 34
- 0
Trolley_Location_Button/app/src/main/res/drawable-v24/ic_launcher_foreground.xml 查看文件

@@ -0,0 +1,34 @@
1
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
2
+    xmlns:aapt="http://schemas.android.com/aapt"
3
+    android:width="108dp"
4
+    android:height="108dp"
5
+    android:viewportWidth="108"
6
+    android:viewportHeight="108">
7
+    <path
8
+        android:fillType="evenOdd"
9
+        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
10
+        android:strokeWidth="1"
11
+        android:strokeColor="#00000000">
12
+        <aapt:attr name="android:fillColor">
13
+            <gradient
14
+                android:endX="78.5885"
15
+                android:endY="90.9159"
16
+                android:startX="48.7653"
17
+                android:startY="61.0927"
18
+                android:type="linear">
19
+                <item
20
+                    android:color="#44000000"
21
+                    android:offset="0.0" />
22
+                <item
23
+                    android:color="#00000000"
24
+                    android:offset="1.0" />
25
+            </gradient>
26
+        </aapt:attr>
27
+    </path>
28
+    <path
29
+        android:fillColor="#FFFFFF"
30
+        android:fillType="nonZero"
31
+        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
32
+        android:strokeWidth="1"
33
+        android:strokeColor="#00000000" />
34
+</vector>

+ 170
- 0
Trolley_Location_Button/app/src/main/res/drawable/ic_launcher_background.xml 查看文件

@@ -0,0 +1,170 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
3
+    android:width="108dp"
4
+    android:height="108dp"
5
+    android:viewportWidth="108"
6
+    android:viewportHeight="108">
7
+    <path
8
+        android:fillColor="#008577"
9
+        android:pathData="M0,0h108v108h-108z" />
10
+    <path
11
+        android:fillColor="#00000000"
12
+        android:pathData="M9,0L9,108"
13
+        android:strokeWidth="0.8"
14
+        android:strokeColor="#33FFFFFF" />
15
+    <path
16
+        android:fillColor="#00000000"
17
+        android:pathData="M19,0L19,108"
18
+        android:strokeWidth="0.8"
19
+        android:strokeColor="#33FFFFFF" />
20
+    <path
21
+        android:fillColor="#00000000"
22
+        android:pathData="M29,0L29,108"
23
+        android:strokeWidth="0.8"
24
+        android:strokeColor="#33FFFFFF" />
25
+    <path
26
+        android:fillColor="#00000000"
27
+        android:pathData="M39,0L39,108"
28
+        android:strokeWidth="0.8"
29
+        android:strokeColor="#33FFFFFF" />
30
+    <path
31
+        android:fillColor="#00000000"
32
+        android:pathData="M49,0L49,108"
33
+        android:strokeWidth="0.8"
34
+        android:strokeColor="#33FFFFFF" />
35
+    <path
36
+        android:fillColor="#00000000"
37
+        android:pathData="M59,0L59,108"
38
+        android:strokeWidth="0.8"
39
+        android:strokeColor="#33FFFFFF" />
40
+    <path
41
+        android:fillColor="#00000000"
42
+        android:pathData="M69,0L69,108"
43
+        android:strokeWidth="0.8"
44
+        android:strokeColor="#33FFFFFF" />
45
+    <path
46
+        android:fillColor="#00000000"
47
+        android:pathData="M79,0L79,108"
48
+        android:strokeWidth="0.8"
49
+        android:strokeColor="#33FFFFFF" />
50
+    <path
51
+        android:fillColor="#00000000"
52
+        android:pathData="M89,0L89,108"
53
+        android:strokeWidth="0.8"
54
+        android:strokeColor="#33FFFFFF" />
55
+    <path
56
+        android:fillColor="#00000000"
57
+        android:pathData="M99,0L99,108"
58
+        android:strokeWidth="0.8"
59
+        android:strokeColor="#33FFFFFF" />
60
+    <path
61
+        android:fillColor="#00000000"
62
+        android:pathData="M0,9L108,9"
63
+        android:strokeWidth="0.8"
64
+        android:strokeColor="#33FFFFFF" />
65
+    <path
66
+        android:fillColor="#00000000"
67
+        android:pathData="M0,19L108,19"
68
+        android:strokeWidth="0.8"
69
+        android:strokeColor="#33FFFFFF" />
70
+    <path
71
+        android:fillColor="#00000000"
72
+        android:pathData="M0,29L108,29"
73
+        android:strokeWidth="0.8"
74
+        android:strokeColor="#33FFFFFF" />
75
+    <path
76
+        android:fillColor="#00000000"
77
+        android:pathData="M0,39L108,39"
78
+        android:strokeWidth="0.8"
79
+        android:strokeColor="#33FFFFFF" />
80
+    <path
81
+        android:fillColor="#00000000"
82
+        android:pathData="M0,49L108,49"
83
+        android:strokeWidth="0.8"
84
+        android:strokeColor="#33FFFFFF" />
85
+    <path
86
+        android:fillColor="#00000000"
87
+        android:pathData="M0,59L108,59"
88
+        android:strokeWidth="0.8"
89
+        android:strokeColor="#33FFFFFF" />
90
+    <path
91
+        android:fillColor="#00000000"
92
+        android:pathData="M0,69L108,69"
93
+        android:strokeWidth="0.8"
94
+        android:strokeColor="#33FFFFFF" />
95
+    <path
96
+        android:fillColor="#00000000"
97
+        android:pathData="M0,79L108,79"
98
+        android:strokeWidth="0.8"
99
+        android:strokeColor="#33FFFFFF" />
100
+    <path
101
+        android:fillColor="#00000000"
102
+        android:pathData="M0,89L108,89"
103
+        android:strokeWidth="0.8"
104
+        android:strokeColor="#33FFFFFF" />
105
+    <path
106
+        android:fillColor="#00000000"
107
+        android:pathData="M0,99L108,99"
108
+        android:strokeWidth="0.8"
109
+        android:strokeColor="#33FFFFFF" />
110
+    <path
111
+        android:fillColor="#00000000"
112
+        android:pathData="M19,29L89,29"
113
+        android:strokeWidth="0.8"
114
+        android:strokeColor="#33FFFFFF" />
115
+    <path
116
+        android:fillColor="#00000000"
117
+        android:pathData="M19,39L89,39"
118
+        android:strokeWidth="0.8"
119
+        android:strokeColor="#33FFFFFF" />
120
+    <path
121
+        android:fillColor="#00000000"
122
+        android:pathData="M19,49L89,49"
123
+        android:strokeWidth="0.8"
124
+        android:strokeColor="#33FFFFFF" />
125
+    <path
126
+        android:fillColor="#00000000"
127
+        android:pathData="M19,59L89,59"
128
+        android:strokeWidth="0.8"
129
+        android:strokeColor="#33FFFFFF" />
130
+    <path
131
+        android:fillColor="#00000000"
132
+        android:pathData="M19,69L89,69"
133
+        android:strokeWidth="0.8"
134
+        android:strokeColor="#33FFFFFF" />
135
+    <path
136
+        android:fillColor="#00000000"
137
+        android:pathData="M19,79L89,79"
138
+        android:strokeWidth="0.8"
139
+        android:strokeColor="#33FFFFFF" />
140
+    <path
141
+        android:fillColor="#00000000"
142
+        android:pathData="M29,19L29,89"
143
+        android:strokeWidth="0.8"
144
+        android:strokeColor="#33FFFFFF" />
145
+    <path
146
+        android:fillColor="#00000000"
147
+        android:pathData="M39,19L39,89"
148
+        android:strokeWidth="0.8"
149
+        android:strokeColor="#33FFFFFF" />
150
+    <path
151
+        android:fillColor="#00000000"
152
+        android:pathData="M49,19L49,89"
153
+        android:strokeWidth="0.8"
154
+        android:strokeColor="#33FFFFFF" />
155
+    <path
156
+        android:fillColor="#00000000"
157
+        android:pathData="M59,19L59,89"
158
+        android:strokeWidth="0.8"
159
+        android:strokeColor="#33FFFFFF" />
160
+    <path
161
+        android:fillColor="#00000000"
162
+        android:pathData="M69,19L69,89"
163
+        android:strokeWidth="0.8"
164
+        android:strokeColor="#33FFFFFF" />
165
+    <path
166
+        android:fillColor="#00000000"
167
+        android:pathData="M79,19L79,89"
168
+        android:strokeWidth="0.8"
169
+        android:strokeColor="#33FFFFFF" />
170
+</vector>

+ 30
- 0
Trolley_Location_Button/app/src/main/res/layout/activity_main.xml 查看文件

@@ -0,0 +1,30 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
+    xmlns:app="http://schemas.android.com/apk/res-auto"
4
+    xmlns:tools="http://schemas.android.com/tools"
5
+    android:layout_width="match_parent"
6
+    android:layout_height="match_parent"
7
+    tools:context=".MainActivity">
8
+
9
+    <ToggleButton
10
+        android:id="@+id/toggle_location"
11
+        android:layout_width="wrap_content"
12
+        android:layout_height="wrap_content"
13
+        android:layout_marginEnd="16dp"
14
+        android:layout_marginBottom="50dp"
15
+        android:textOff="Start Tracking"
16
+        android:textOn="Stop Tracking"
17
+        app:layout_constraintBottom_toBottomOf="parent"
18
+        app:layout_constraintEnd_toEndOf="parent" />
19
+
20
+    <TextView
21
+        android:id="@+id/tv_result"
22
+        android:layout_width="0dp"
23
+        android:layout_height="wrap_content"
24
+        android:layout_marginTop="1dp"
25
+        android:gravity="center_horizontal"
26
+        app:layout_constraintEnd_toEndOf="parent"
27
+        app:layout_constraintStart_toStartOf="parent"
28
+        app:layout_constraintTop_toTopOf="parent" />
29
+
30
+</androidx.constraintlayout.widget.ConstraintLayout>

+ 5
- 0
Trolley_Location_Button/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml 查看文件

@@ -0,0 +1,5 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3
+    <background android:drawable="@drawable/ic_launcher_background" />
4
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
5
+</adaptive-icon>

+ 5
- 0
Trolley_Location_Button/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml 查看文件

@@ -0,0 +1,5 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
3
+    <background android:drawable="@drawable/ic_launcher_background" />
4
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
5
+</adaptive-icon>

二進制
Trolley_Location_Button/app/src/main/res/mipmap-hdpi/ic_launcher.png 查看文件


二進制
Trolley_Location_Button/app/src/main/res/mipmap-hdpi/ic_launcher_round.png 查看文件


二進制
Trolley_Location_Button/app/src/main/res/mipmap-mdpi/ic_launcher.png 查看文件


二進制
Trolley_Location_Button/app/src/main/res/mipmap-mdpi/ic_launcher_round.png 查看文件


二進制
Trolley_Location_Button/app/src/main/res/mipmap-xhdpi/ic_launcher.png 查看文件


二進制
Trolley_Location_Button/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png 查看文件


二進制
Trolley_Location_Button/app/src/main/res/mipmap-xxhdpi/ic_launcher.png 查看文件


二進制
Trolley_Location_Button/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png 查看文件


二進制
Trolley_Location_Button/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png 查看文件


二進制
Trolley_Location_Button/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png 查看文件


+ 6
- 0
Trolley_Location_Button/app/src/main/res/values/colors.xml 查看文件

@@ -0,0 +1,6 @@
1
+<?xml version="1.0" encoding="utf-8"?>
2
+<resources>
3
+    <color name="colorPrimary">#008577</color>
4
+    <color name="colorPrimaryDark">#00574B</color>
5
+    <color name="colorAccent">#D81B60</color>
6
+</resources>

+ 3
- 0
Trolley_Location_Button/app/src/main/res/values/strings.xml 查看文件

@@ -0,0 +1,3 @@
1
+<resources>
2
+    <string name="app_name">trolleyLocation</string>
3
+</resources>

+ 11
- 0
Trolley_Location_Button/app/src/main/res/values/styles.xml 查看文件

@@ -0,0 +1,11 @@
1
+<resources>
2
+
3
+    <!-- Base application theme. -->
4
+    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
5
+        <!-- Customize your theme here. -->
6
+        <item name="colorPrimary">@color/colorPrimary</item>
7
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
8
+        <item name="colorAccent">@color/colorAccent</item>
9
+    </style>
10
+
11
+</resources>

+ 17
- 0
Trolley_Location_Button/app/src/test/java/com/example/trolleylocation/ExampleUnitTest.kt 查看文件

@@ -0,0 +1,17 @@
1
+package com.example.trolleylocation
2
+
3
+import org.junit.Test
4
+
5
+import org.junit.Assert.*
6
+
7
+/**
8
+ * Example local unit test, which will execute on the development machine (host).
9
+ *
10
+ * See [testing documentation](http://d.android.com/tools/testing).
11
+ */
12
+class ExampleUnitTest {
13
+    @Test
14
+    fun addition_isCorrect() {
15
+        assertEquals(4, 2 + 2)
16
+    }
17
+}

+ 28
- 0
Trolley_Location_Button/build.gradle 查看文件

@@ -0,0 +1,28 @@
1
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
2
+
3
+buildscript {
4
+    ext.kotlin_version = '1.3.50'
5
+    repositories {
6
+        google()
7
+        jcenter()
8
+        
9
+    }
10
+    dependencies {
11
+        classpath 'com.android.tools.build:gradle:3.5.2'
12
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
13
+        // NOTE: Do not place your application dependencies here; they belong
14
+        // in the individual module build.gradle files
15
+    }
16
+}
17
+
18
+allprojects {
19
+    repositories {
20
+        google()
21
+        jcenter()
22
+        
23
+    }
24
+}
25
+
26
+task clean(type: Delete) {
27
+    delete rootProject.buildDir
28
+}

+ 21
- 0
Trolley_Location_Button/gradle.properties 查看文件

@@ -0,0 +1,21 @@
1
+# Project-wide Gradle settings.
2
+# IDE (e.g. Android Studio) users:
3
+# Gradle settings configured through the IDE *will override*
4
+# any settings specified in this file.
5
+# For more details on how to configure your build environment visit
6
+# http://www.gradle.org/docs/current/userguide/build_environment.html
7
+# Specifies the JVM arguments used for the daemon process.
8
+# The setting is particularly useful for tweaking memory settings.
9
+org.gradle.jvmargs=-Xmx1536m
10
+# When configured, Gradle will run in incubating parallel mode.
11
+# This option should only be used with decoupled projects. More details, visit
12
+# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
13
+# org.gradle.parallel=true
14
+# AndroidX package structure to make it clearer which packages are bundled with the
15
+# Android operating system, and which are packaged with your app's APK
16
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
17
+android.useAndroidX=true
18
+# Automatically convert third-party libraries to use AndroidX
19
+android.enableJetifier=true
20
+# Kotlin code style for this project: "official" or "obsolete":
21
+kotlin.code.style=official

二進制
Trolley_Location_Button/gradle/wrapper/gradle-wrapper.jar 查看文件


+ 6
- 0
Trolley_Location_Button/gradle/wrapper/gradle-wrapper.properties 查看文件

@@ -0,0 +1,6 @@
1
+#Mon Nov 11 05:00:36 AST 2019
2
+distributionBase=GRADLE_USER_HOME
3
+distributionPath=wrapper/dists
4
+zipStoreBase=GRADLE_USER_HOME
5
+zipStorePath=wrapper/dists
6
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip

+ 172
- 0
Trolley_Location_Button/gradlew 查看文件

@@ -0,0 +1,172 @@
1
+#!/usr/bin/env sh
2
+
3
+##############################################################################
4
+##
5
+##  Gradle start up script for UN*X
6
+##
7
+##############################################################################
8
+
9
+# Attempt to set APP_HOME
10
+# Resolve links: $0 may be a link
11
+PRG="$0"
12
+# Need this for relative symlinks.
13
+while [ -h "$PRG" ] ; do
14
+    ls=`ls -ld "$PRG"`
15
+    link=`expr "$ls" : '.*-> \(.*\)$'`
16
+    if expr "$link" : '/.*' > /dev/null; then
17
+        PRG="$link"
18
+    else
19
+        PRG=`dirname "$PRG"`"/$link"
20
+    fi
21
+done
22
+SAVED="`pwd`"
23
+cd "`dirname \"$PRG\"`/" >/dev/null
24
+APP_HOME="`pwd -P`"
25
+cd "$SAVED" >/dev/null
26
+
27
+APP_NAME="Gradle"
28
+APP_BASE_NAME=`basename "$0"`
29
+
30
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
31
+DEFAULT_JVM_OPTS=""
32
+
33
+# Use the maximum available, or set MAX_FD != -1 to use that value.
34
+MAX_FD="maximum"
35
+
36
+warn () {
37
+    echo "$*"
38
+}
39
+
40
+die () {
41
+    echo
42
+    echo "$*"
43
+    echo
44
+    exit 1
45
+}
46
+
47
+# OS specific support (must be 'true' or 'false').
48
+cygwin=false
49
+msys=false
50
+darwin=false
51
+nonstop=false
52
+case "`uname`" in
53
+  CYGWIN* )
54
+    cygwin=true
55
+    ;;
56
+  Darwin* )
57
+    darwin=true
58
+    ;;
59
+  MINGW* )
60
+    msys=true
61
+    ;;
62
+  NONSTOP* )
63
+    nonstop=true
64
+    ;;
65
+esac
66
+
67
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
68
+
69
+# Determine the Java command to use to start the JVM.
70
+if [ -n "$JAVA_HOME" ] ; then
71
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
72
+        # IBM's JDK on AIX uses strange locations for the executables
73
+        JAVACMD="$JAVA_HOME/jre/sh/java"
74
+    else
75
+        JAVACMD="$JAVA_HOME/bin/java"
76
+    fi
77
+    if [ ! -x "$JAVACMD" ] ; then
78
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
79
+
80
+Please set the JAVA_HOME variable in your environment to match the
81
+location of your Java installation."
82
+    fi
83
+else
84
+    JAVACMD="java"
85
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
86
+
87
+Please set the JAVA_HOME variable in your environment to match the
88
+location of your Java installation."
89
+fi
90
+
91
+# Increase the maximum file descriptors if we can.
92
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
93
+    MAX_FD_LIMIT=`ulimit -H -n`
94
+    if [ $? -eq 0 ] ; then
95
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
96
+            MAX_FD="$MAX_FD_LIMIT"
97
+        fi
98
+        ulimit -n $MAX_FD
99
+        if [ $? -ne 0 ] ; then
100
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
101
+        fi
102
+    else
103
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
104
+    fi
105
+fi
106
+
107
+# For Darwin, add options to specify how the application appears in the dock
108
+if $darwin; then
109
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
110
+fi
111
+
112
+# For Cygwin, switch paths to Windows format before running java
113
+if $cygwin ; then
114
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
115
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
116
+    JAVACMD=`cygpath --unix "$JAVACMD"`
117
+
118
+    # We build the pattern for arguments to be converted via cygpath
119
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
120
+    SEP=""
121
+    for dir in $ROOTDIRSRAW ; do
122
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
123
+        SEP="|"
124
+    done
125
+    OURCYGPATTERN="(^($ROOTDIRS))"
126
+    # Add a user-defined pattern to the cygpath arguments
127
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
128
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
129
+    fi
130
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
131
+    i=0
132
+    for arg in "$@" ; do
133
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
134
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
135
+
136
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
137
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
138
+        else
139
+            eval `echo args$i`="\"$arg\""
140
+        fi
141
+        i=$((i+1))
142
+    done
143
+    case $i in
144
+        (0) set -- ;;
145
+        (1) set -- "$args0" ;;
146
+        (2) set -- "$args0" "$args1" ;;
147
+        (3) set -- "$args0" "$args1" "$args2" ;;
148
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
149
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
150
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
151
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
152
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
153
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
154
+    esac
155
+fi
156
+
157
+# Escape application args
158
+save () {
159
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
160
+    echo " "
161
+}
162
+APP_ARGS=$(save "$@")
163
+
164
+# Collect all arguments for the java command, following the shell quoting and substitution rules
165
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
166
+
167
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
168
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
169
+  cd "$(dirname "$0")"
170
+fi
171
+
172
+exec "$JAVACMD" "$@"

+ 84
- 0
Trolley_Location_Button/gradlew.bat 查看文件

@@ -0,0 +1,84 @@
1
+@if "%DEBUG%" == "" @echo off
2
+@rem ##########################################################################
3
+@rem
4
+@rem  Gradle startup script for Windows
5
+@rem
6
+@rem ##########################################################################
7
+
8
+@rem Set local scope for the variables with windows NT shell
9
+if "%OS%"=="Windows_NT" setlocal
10
+
11
+set DIRNAME=%~dp0
12
+if "%DIRNAME%" == "" set DIRNAME=.
13
+set APP_BASE_NAME=%~n0
14
+set APP_HOME=%DIRNAME%
15
+
16
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
17
+set DEFAULT_JVM_OPTS=
18
+
19
+@rem Find java.exe
20
+if defined JAVA_HOME goto findJavaFromJavaHome
21
+
22
+set JAVA_EXE=java.exe
23
+%JAVA_EXE% -version >NUL 2>&1
24
+if "%ERRORLEVEL%" == "0" goto init
25
+
26
+echo.
27
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
28
+echo.
29
+echo Please set the JAVA_HOME variable in your environment to match the
30
+echo location of your Java installation.
31
+
32
+goto fail
33
+
34
+:findJavaFromJavaHome
35
+set JAVA_HOME=%JAVA_HOME:"=%
36
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
37
+
38
+if exist "%JAVA_EXE%" goto init
39
+
40
+echo.
41
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
42
+echo.
43
+echo Please set the JAVA_HOME variable in your environment to match the
44
+echo location of your Java installation.
45
+
46
+goto fail
47
+
48
+:init
49
+@rem Get command-line arguments, handling Windows variants
50
+
51
+if not "%OS%" == "Windows_NT" goto win9xME_args
52
+
53
+:win9xME_args
54
+@rem Slurp the command line arguments.
55
+set CMD_LINE_ARGS=
56
+set _SKIP=2
57
+
58
+:win9xME_args_slurp
59
+if "x%~1" == "x" goto execute
60
+
61
+set CMD_LINE_ARGS=%*
62
+
63
+:execute
64
+@rem Setup the command line
65
+
66
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
67
+
68
+@rem Execute Gradle
69
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
70
+
71
+:end
72
+@rem End local scope for the variables with windows NT shell
73
+if "%ERRORLEVEL%"=="0" goto mainEnd
74
+
75
+:fail
76
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
77
+rem the _cmd.exe /c_ return code!
78
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
79
+exit /b 1
80
+
81
+:mainEnd
82
+if "%OS%"=="Windows_NT" endlocal
83
+
84
+:omega

+ 2
- 0
Trolley_Location_Button/settings.gradle 查看文件

@@ -0,0 +1,2 @@
1
+include ':app'
2
+rootProject.name='trolleyLocation'