Refactor: Move data models and services to appropriate packages

kariemSeiam · kariemSeiam · commit 116807598e72 · 2024-07-29T10:38:19.000+03:00
This commit reorganizes the project structure by moving data models and services to more suitable packages.

-
 Moved `SearchResult`, `Route`, and `Trip` models from `geolink` and `ui` packages to the `data.model` package.
- Relocated `GeolinkService` from `geolink` to `data.remote` package.
- Moved `Geolink
ApiService` from `geolink` to `data.remote.api` package.
- Renamed `BootCompleteReceiver` to `service.BootCompleteReceiver`.
- Renamed `LocationService` to `service.LocationService`.

This restructuring improves the organization and maintainability of the codebase.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,8 +16,7 @@ android {
         versionCode 1
         versionName "1.0"
 
-        resValue "string", "maps_api_key", (project.findProperty("MAPS_API_KEY") ?: "AIzaSyBR_YrfYBJuF44vDnMC5KnSbQcdYqUBnwI")
-        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        resValue "string", "maps_api_key", (project.hasProperty("MAPS_API_KEY") ? project.property("MAPS_API_KEY") : "")
     }
 
     buildTypes {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -37,7 +37,7 @@
             android:resource="@array/preloaded_fonts" />
 
         <receiver
-            android:name=".BootCompleteReceiver"
+            android:name=".service.BootCompleteReceiver"
             android:enabled="true"
             android:exported="false">
             <intent-filter>
@@ -47,7 +47,7 @@
         </receiver>
 
         <service
-            android:name=".LocationService"
+            android:name=".service.LocationService"
             android:exported="false"
             android:enabled="true"
             android:foregroundServiceType="location"
diff --git a/app/src/main/java/com/pigo/areo/MainActivity.kt b/app/src/main/java/com/pigo/areo/MainActivity.kt
@@ -35,6 +35,7 @@ import com.google.android.gms.maps.SupportMapFragment
 import com.google.android.gms.maps.model.LatLng
 import com.google.android.gms.maps.model.MapStyleOptions
 import com.pigo.areo.databinding.ActivityMainBinding
+import com.pigo.areo.service.LocationService
 import com.pigo.areo.shared.SharedViewModel
 import com.pigo.areo.shared.SharedViewModelFactory
 import kotlinx.coroutines.Job
diff --git a/app/src/main/java/com/pigo/areo/data/model/DirectionModels.kt b/app/src/main/java/com/pigo/areo/data/model/DirectionModels.kt
@@ -1,4 +1,4 @@
-package com.pigo.areo.geolink.models
+package com.pigo.areo.data.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/com/pigo/areo/data/model/GeocodeModels.kt b/app/src/main/java/com/pigo/areo/data/model/GeocodeModels.kt
@@ -0,0 +1 @@
+package com.pigo.areo.data.model
diff --git a/app/src/main/java/com/pigo/areo/data/model/GeolinkApiInfoModels.kt b/app/src/main/java/com/pigo/areo/data/model/GeolinkApiInfoModels.kt
@@ -0,0 +1 @@
+package com.pigo.areo.data.model
diff --git a/app/src/main/java/com/pigo/areo/data/model/ReverseGeocodeModels.kt b/app/src/main/java/com/pigo/areo/data/model/ReverseGeocodeModels.kt
@@ -1,4 +1,4 @@
-package com.pigo.areo.geolink.models
+package com.pigo.areo.data.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/com/pigo/areo/data/model/TextSearchModels.kt b/app/src/main/java/com/pigo/areo/data/model/TextSearchModels.kt
@@ -1,4 +1,4 @@
-package com.pigo.areo.geolink.models
+package com.pigo.areo.data.model
 
 import com.google.gson.annotations.SerializedName
 
diff --git a/app/src/main/java/com/pigo/areo/data/model/Trip.kt b/app/src/main/java/com/pigo/areo/data/model/Trip.kt
@@ -1,4 +1,4 @@
-package com.pigo.areo.ui.current_trip
+package com.pigo.areo.data.model
 
 import com.google.android.gms.maps.model.LatLng
 
diff --git a/app/src/main/java/com/pigo/areo/data/remote/GeolinkService.kt b/app/src/main/java/com/pigo/areo/data/remote/GeolinkService.kt
@@ -1,9 +1,8 @@
-package com.pigo.areo.geolink
+package com.pigo.areo.data.remote
 
-import com.pigo.areo.geolink.models.DirectionResponse
-import com.pigo.areo.geolink.models.ReverseGeocodeResponse
-import com.pigo.areo.geolink.models.TextSearchResponse
-import org.intellij.lang.annotations.Language
+import com.pigo.areo.data.model.DirectionResponse
+import com.pigo.areo.data.model.ReverseGeocodeResponse
+import com.pigo.areo.data.model.TextSearchResponse
 import retrofit2.Call
 import retrofit2.http.GET
 import retrofit2.http.Query
diff --git a/app/src/main/java/com/pigo/areo/data/remote/api/GeolinkApiService.kt b/app/src/main/java/com/pigo/areo/data/remote/api/GeolinkApiService.kt
@@ -1,8 +1,9 @@
-package com.pigo.areo.geolink
+package com.pigo.areo.data.remote.api
 
-import com.pigo.areo.geolink.models.DirectionResponse
-import com.pigo.areo.geolink.models.ReverseGeocodeResponse
-import com.pigo.areo.geolink.models.TextSearchResponse
+import com.pigo.areo.data.model.DirectionResponse
+import com.pigo.areo.data.model.ReverseGeocodeResponse
+import com.pigo.areo.data.model.TextSearchResponse
+import com.pigo.areo.data.remote.GeolinkService
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
diff --git a/app/src/main/java/com/pigo/areo/data/repository/GeolinkRepository.kt b/app/src/main/java/com/pigo/areo/data/repository/GeolinkRepository.kt
@@ -0,0 +1,4 @@
+package com.pigo.areo.data.repository
+
+class GeolinkRepository {
+}
diff --git a/app/src/main/java/com/pigo/areo/geolink/models/GeocodeModels.kt b/app/src/main/java/com/pigo/areo/geolink/models/GeocodeModels.kt
diff --git a/app/src/main/java/com/pigo/areo/geolink/models/GeolinkApiInfoModels.kt b/app/src/main/java/com/pigo/areo/geolink/models/GeolinkApiInfoModels.kt
diff --git a/app/src/main/java/com/pigo/areo/service/BootCompleteReceiver.kt b/app/src/main/java/com/pigo/areo/service/BootCompleteReceiver.kt
@@ -1,4 +1,4 @@
-package com.pigo.areo
+package com.pigo.areo.service
 
 import android.content.BroadcastReceiver
 import android.content.Context
diff --git a/app/src/main/java/com/pigo/areo/service/LocationService.kt b/app/src/main/java/com/pigo/areo/service/LocationService.kt
@@ -1,4 +1,4 @@
-package com.pigo.areo
+package com.pigo.areo.service
 
 import android.app.Notification
 import android.app.NotificationChannel
@@ -27,9 +27,10 @@ import com.google.android.gms.maps.model.LatLng
 import com.google.firebase.FirebaseApp
 import com.google.firebase.database.DatabaseReference
 import com.google.firebase.database.FirebaseDatabase
+import com.pigo.areo.R
 import com.pigo.areo.shared.SharedViewModel.UserRole
-import com.pigo.areo.ui.current_trip.CustomLatLng
-import com.pigo.areo.ui.current_trip.Trip
+import com.pigo.areo.data.model.CustomLatLng
+import com.pigo.areo.data.model.Trip
 import com.pigo.areo.utils.DataStoreUtil
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/pigo/areo/shared/SharedViewModel.kt b/app/src/main/java/com/pigo/areo/shared/SharedViewModel.kt
@@ -36,12 +36,12 @@ import com.google.firebase.database.DatabaseReference
 import com.google.firebase.database.FirebaseDatabase
 import com.google.firebase.database.ValueEventListener
 import com.pigo.areo.R
-import com.pigo.areo.geolink.GeolinkApiService
-import com.pigo.areo.geolink.models.DirectionResponse
-import com.pigo.areo.geolink.models.Route
-import com.pigo.areo.geolink.models.findShortestPath
-import com.pigo.areo.ui.current_trip.CustomLatLng
-import com.pigo.areo.ui.current_trip.Trip
+import com.pigo.areo.data.remote.api.GeolinkApiService
+import com.pigo.areo.data.model.DirectionResponse
+import com.pigo.areo.data.model.Route
+import com.pigo.areo.data.model.findShortestPath
+import com.pigo.areo.data.model.CustomLatLng
+import com.pigo.areo.data.model.Trip
 import com.pigo.areo.utils.CompassManager
 import com.pigo.areo.utils.DataStoreUtil
 import com.pigo.areo.utils.DataStoreUtil.dataStore
diff --git a/app/src/main/java/com/pigo/areo/ui/create/CreateTripViewModel.kt b/app/src/main/java/com/pigo/areo/ui/create/CreateTripViewModel.kt
@@ -7,9 +7,9 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.google.android.gms.maps.model.LatLng
-import com.pigo.areo.geolink.GeolinkApiService
-import com.pigo.areo.geolink.models.ReverseGeocodeResponse
-import com.pigo.areo.geolink.models.SearchResult
+import com.pigo.areo.data.model.ReverseGeocodeResponse
+import com.pigo.areo.data.model.SearchResult
+import com.pigo.areo.data.remote.api.GeolinkApiService
 import com.pigo.areo.shared.SharedViewModel
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
diff --git a/app/src/main/java/com/pigo/areo/ui/create/SearchResultAdapter.kt b/app/src/main/java/com/pigo/areo/ui/create/SearchResultAdapter.kt
@@ -3,8 +3,8 @@ package com.pigo.areo.ui.create
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.pigo.areo.data.model.SearchResult
 import com.pigo.areo.databinding.ItemSearchResultBinding
-import com.pigo.areo.geolink.models.SearchResult
 
 class SearchResultAdapter(
     private val onItemClick: (SearchResult) -> Unit
diff --git a/app/src/main/java/com/pigo/areo/ui/current_trip/CurrentTripFragment.kt b/app/src/main/java/com/pigo/areo/ui/current_trip/CurrentTripFragment.kt
@@ -9,8 +9,8 @@ import androidx.fragment.app.activityViewModels
 import androidx.fragment.app.viewModels
 import com.google.android.gms.maps.GoogleMap
 import com.pigo.areo.R
+import com.pigo.areo.data.model.Route
 import com.pigo.areo.databinding.FragmentCurrentTripBinding
-import com.pigo.areo.geolink.models.Route
 import com.pigo.areo.shared.SharedViewModel
 import com.pigo.areo.shared.SharedViewModelFactory
 import com.pigo.areo.ui.create.CreateTripViewModel
diff --git a/app/src/main/java/com/pigo/areo/ui/history/TripHistoryAdapter.kt b/app/src/main/java/com/pigo/areo/ui/history/TripHistoryAdapter.kt
@@ -14,8 +14,8 @@ import com.google.android.gms.maps.model.MapStyleOptions
 import com.google.android.gms.maps.model.MarkerOptions
 import com.google.android.gms.maps.model.PolylineOptions
 import com.pigo.areo.R
-import com.pigo.areo.ui.current_trip.CustomLatLng
-import com.pigo.areo.ui.current_trip.Trip
+import com.pigo.areo.data.model.CustomLatLng
+import com.pigo.areo.data.model.Trip
 import java.text.SimpleDateFormat
 import java.util.Date
 import java.util.Locale
diff --git a/app/src/main/java/com/pigo/areo/utils/DataStoreUtil.kt b/app/src/main/java/com/pigo/areo/utils/DataStoreUtil.kt
@@ -5,8 +5,8 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.preferencesDataStore
 import com.google.android.gms.maps.model.LatLng
 import com.google.gson.Gson
+import com.pigo.areo.data.model.Trip
 import com.pigo.areo.shared.SharedViewModel.UserRole
-import com.pigo.areo.ui.current_trip.Trip
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 
diff --git a/app/src/main/res/layout/item_search_result.xml b/app/src/main/res/layout/item_search_result.xml
@@ -6,7 +6,7 @@
 
         <variable
             name="searchResult"
-            type="com.pigo.areo.geolink.models.SearchResult" />
+            type="com.pigo.areo.data.model.SearchResult" />
     </data>
 
     <com.google.android.material.card.MaterialCardView

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,7 @@ android {`
`16`	`16`	`versionCode 1`
`17`	`17`	`versionName "1.0"`
`18`	`18`
`19`		`- resValue "string", "maps_api_key", (project.findProperty("MAPS_API_KEY") ?: "AIzaSyBR_YrfYBJuF44vDnMC5KnSbQcdYqUBnwI")`
`20`		`- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"`
	`19`	`+ resValue "string", "maps_api_key", (project.hasProperty("MAPS_API_KEY") ? project.property("MAPS_API_KEY") : "")`
`21`	`20`	`}`
`22`	`21`
`23`	`22`	`buildTypes {`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.pigo.areo.geolink.models`
	`1`	`+package com.pigo.areo.data.model`
`2`	`2`
`3`	`3`	`import com.google.gson.annotations.SerializedName`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.pigo.areo.ui.current_trip`
	`1`	`+package com.pigo.areo.data.model`
`2`	`2`
`3`	`3`	`import com.google.android.gms.maps.model.LatLng`
`4`	`4`