Finish merging all the codes, most function is working. Haven't run t…

…hrough a detail test.
HiIamNew2002 · Mar 19, 2024 · bd95bbb · bd95bbb
1 parent 337e3da
commit bd95bbb
Show file tree

Hide file tree

Showing 16 changed files with 83 additions and 351 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/Safetify203V/.idea/deploymentTargetDropDown.xml b/Safetify203V/.idea/deploymentTargetDropDown.xml
diff --git a/Safetify203V/app/src/main/AndroidManifest.xml b/Safetify203V/app/src/main/AndroidManifest.xml
@@ -22,7 +22,6 @@
 
 
     <application
-        android:name=".LocationApp"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -33,19 +32,16 @@
         android:theme="@style/Theme.Safetify203V"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
-        <activity
+        <!-- <activity
             android:name=".LocationActivity"
             android:exported="false" />
-        <service android:name=".LocationService" android:foregroundServiceType="location" />
+        <service android:name=".LocationService" android:foregroundServiceType="location" /> -->
 
         <receiver
             android:name=".GeofenceBroadcastReceiver"
             android:enabled="true"
             android:exported="true" />
 
-        <activity
-            android:name=".MapsActivity"
-            android:exported="false" />
         <!--
              TODO: Before you run your application, you need a Google Maps API key.
 

diff --git a/Safetify203V/app/src/main/java/com/example/safetify203v/DefaultLocationClient.kt b/Safetify203V/app/src/main/java/com/example/safetify203v/DefaultLocationClient.kt
diff --git a/Safetify203V/app/src/main/java/com/example/safetify203v/LocationActivity.kt b/Safetify203V/app/src/main/java/com/example/safetify203v/LocationActivity.kt
diff --git a/Safetify203V/app/src/main/java/com/example/safetify203v/LocationApp.kt b/Safetify203V/app/src/main/java/com/example/safetify203v/LocationApp.kt
diff --git a/Safetify203V/app/src/main/java/com/example/safetify203v/LocationClient.kt b/Safetify203V/app/src/main/java/com/example/safetify203v/LocationClient.kt
diff --git a/Safetify203V/app/src/main/java/com/example/safetify203v/LocationService.kt b/Safetify203V/app/src/main/java/com/example/safetify203v/LocationService.kt
diff --git a/Safetify203V/app/src/main/java/com/example/safetify203v/SecondActivity.kt b/Safetify203V/app/src/main/java/com/example/safetify203v/SecondActivity.kt
@@ -38,7 +38,7 @@ class SecondActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelec
             when(item.itemId){
                 R.id.bottom_call -> openFragment(CallFragment())
                 R.id.bottom_alarm -> openFragment(AlarmFragment())
-                //R.id.bottom_home -> openFragment(HomeFragment())
+                R.id.bottom_home -> openFragment(RoutesFragment())
                 R.id.bottom_guides -> openFragment(GuidesFragment())
                 R.id.bottom_report -> openFragment(ReportFragment())
             }