Move astronomy code to tools package

kylecorry31 · Jan 27, 2024 · 91c7d27 · 91c7d27
1 parent 06c0b62
commit 91c7d27
Show file tree

Hide file tree

Showing 48 changed files with 85 additions and 85 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -262,7 +262,7 @@
             </intent-filter>
         </receiver>
         <receiver
-            android:name="com.kylecorry.trail_sense.astronomy.infrastructure.receivers.SunsetAlarmReceiver"
+            android:name="com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers.SunsetAlarmReceiver"
             android:enabled="true"
             android:exported="false" />
         <receiver

diff --git a/app/src/main/java/com/kylecorry/trail_sense/NotificationChannels.kt b/app/src/main/java/com/kylecorry/trail_sense/NotificationChannels.kt
@@ -2,7 +2,7 @@ package com.kylecorry.trail_sense
 
 import android.content.Context
 import com.kylecorry.andromeda.notify.Notify
-import com.kylecorry.trail_sense.astronomy.infrastructure.commands.SunsetAlarmCommand
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands.SunsetAlarmCommand
 import com.kylecorry.trail_sense.navigation.paths.infrastructure.services.BacktrackService
 import com.kylecorry.trail_sense.tools.clock.infrastructure.NextMinuteBroadcastReceiver
 import com.kylecorry.trail_sense.tools.flashlight.infrastructure.FlashlightService

diff --git a/app/src/main/java/com/kylecorry/trail_sense/diagnostics/DiagnosticAlertService.kt b/app/src/main/java/com/kylecorry/trail_sense/diagnostics/DiagnosticAlertService.kt
@@ -12,7 +12,7 @@ import com.kylecorry.andromeda.markdown.MarkdownService
 import com.kylecorry.andromeda.permissions.Permissions
 import com.kylecorry.andromeda.permissions.SpecialPermission
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.infrastructure.commands.SunsetAlarmCommand
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands.SunsetAlarmCommand
 import com.kylecorry.trail_sense.shared.alerts.MissingSensorAlert
 import com.kylecorry.trail_sense.shared.commands.Command
 import com.kylecorry.trail_sense.shared.navigation.IAppNavigation

diff --git a/app/src/main/java/com/kylecorry/trail_sense/diagnostics/NotificationDiagnostic.kt b/app/src/main/java/com/kylecorry/trail_sense/diagnostics/NotificationDiagnostic.kt
@@ -6,7 +6,7 @@ import android.hardware.Sensor
 import android.os.Build
 import androidx.core.content.getSystemService
 import com.kylecorry.andromeda.sense.Sensors
-import com.kylecorry.trail_sense.astronomy.infrastructure.commands.SunsetAlarmCommand
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands.SunsetAlarmCommand
 import com.kylecorry.trail_sense.tools.flashlight.infrastructure.FlashlightService
 import com.kylecorry.trail_sense.tools.pedometer.infrastructure.StepCounterService
 import com.kylecorry.trail_sense.weather.infrastructure.alerts.CurrentWeatherAlerter

diff --git a/app/src/main/java/com/kylecorry/trail_sense/main/MainActivity.kt b/app/src/main/java/com/kylecorry/trail_sense/main/MainActivity.kt
@@ -24,7 +24,7 @@ import com.kylecorry.andromeda.sense.Sensors
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.ColorFilterConstraintLayout
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.backup.BackupService
 import com.kylecorry.trail_sense.onboarding.OnboardingActivity
 import com.kylecorry.trail_sense.receivers.RestartServicesCommand

diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/BeaconDetailsFragment.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/beacons/ui/BeaconDetailsFragment.kt
@@ -15,7 +15,7 @@ import com.kylecorry.andromeda.fragments.observe
 import com.kylecorry.andromeda.pickers.Pickers
 import com.kylecorry.sol.units.Distance
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.databinding.FragmentBeaconDetailsBinding
 import com.kylecorry.trail_sense.navigation.beacons.domain.Beacon
 import com.kylecorry.trail_sense.navigation.beacons.infrastructure.persistence.BeaconEntity

diff --git a/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/data/NavAstronomyDataCommand.kt b/app/src/main/java/com/kylecorry/trail_sense/navigation/ui/data/NavAstronomyDataCommand.kt
@@ -2,7 +2,7 @@ package com.kylecorry.trail_sense.navigation.ui.data
 
 import com.kylecorry.andromeda.core.coroutines.onDefault
 import com.kylecorry.andromeda.sense.location.IGPS
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.shared.commands.CoroutineValueCommand
 import java.time.LocalDate
 

diff --git a/...src/main/java/com/kylecorry/trail_sense/navigation/ui/data/UpdateAstronomyLayerCommand.kt b/...src/main/java/com/kylecorry/trail_sense/navigation/ui/data/UpdateAstronomyLayerCommand.kt
@@ -4,7 +4,7 @@ import com.kylecorry.andromeda.core.coroutines.onDefault
 import com.kylecorry.andromeda.sense.location.IGPS
 import com.kylecorry.sol.units.Bearing
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.ui.MoonPhaseImageMapper
+import com.kylecorry.trail_sense.tools.astronomy.ui.MoonPhaseImageMapper
 import com.kylecorry.trail_sense.navigation.ui.IMappableReferencePoint
 import com.kylecorry.trail_sense.navigation.ui.MappableReferencePoint
 import com.kylecorry.trail_sense.navigation.ui.layers.compass.MarkerCompassLayer

diff --git a/app/src/main/java/com/kylecorry/trail_sense/receivers/TrailSenseServiceUtils.kt b/app/src/main/java/com/kylecorry/trail_sense/receivers/TrailSenseServiceUtils.kt
@@ -2,8 +2,8 @@ package com.kylecorry.trail_sense.receivers
 
 import android.content.Context
 import android.os.Build
-import com.kylecorry.trail_sense.astronomy.infrastructure.AstronomyDailyWorker
-import com.kylecorry.trail_sense.astronomy.infrastructure.receivers.SunsetAlarmReceiver
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.AstronomyDailyWorker
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers.SunsetAlarmReceiver
 import com.kylecorry.trail_sense.navigation.paths.infrastructure.services.BacktrackService
 import com.kylecorry.trail_sense.navigation.paths.infrastructure.subsystem.BacktrackSubsystem
 import com.kylecorry.trail_sense.shared.FeatureState

diff --git a/app/src/main/java/com/kylecorry/trail_sense/settings/migrations/PreferenceMigrator.kt b/app/src/main/java/com/kylecorry/trail_sense/settings/migrations/PreferenceMigrator.kt
@@ -3,7 +3,7 @@ package com.kylecorry.trail_sense.settings.migrations
 import android.content.Context
 import com.kylecorry.andromeda.core.system.Screen
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.infrastructure.AstronomyDailyWorker
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.AstronomyDailyWorker
 import com.kylecorry.trail_sense.main.AppState
 import com.kylecorry.trail_sense.shared.UserPreferences
 import com.kylecorry.trail_sense.shared.preferences.PreferencesSubsystem

diff --git a/app/src/main/java/com/kylecorry/trail_sense/settings/ui/AstronomySettingsFragment.kt b/app/src/main/java/com/kylecorry/trail_sense/settings/ui/AstronomySettingsFragment.kt
@@ -6,7 +6,7 @@ import androidx.preference.ListPreference
 import com.kylecorry.andromeda.core.topics.generic.asLiveData
 import com.kylecorry.andromeda.fragments.AndromedaPreferenceFragment
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.infrastructure.receivers.SunsetAlarmReceiver
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers.SunsetAlarmReceiver
 import com.kylecorry.trail_sense.shared.UserPreferences
 import com.kylecorry.trail_sense.shared.preferences.PreferencesSubsystem
 import com.kylecorry.trail_sense.tools.tools.ui.Tools

diff --git a/app/src/main/java/com/kylecorry/trail_sense/shared/UserPreferences.kt b/app/src/main/java/com/kylecorry/trail_sense/shared/UserPreferences.kt
@@ -14,7 +14,7 @@ import com.kylecorry.sol.units.PressureUnits
 import com.kylecorry.sol.units.TemperatureUnits
 import com.kylecorry.sol.units.WeightUnits
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.infrastructure.AstronomyPreferences
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.AstronomyPreferences
 import com.kylecorry.trail_sense.navigation.infrastructure.NavigationPreferences
 import com.kylecorry.trail_sense.settings.infrastructure.AltimeterPreferences
 import com.kylecorry.trail_sense.settings.infrastructure.AugmentedRealityPreferences

diff --git a/..._sense/astronomy/domain/AstroPositions.kt → .../tools/astronomy/domain/AstroPositions.kt b/..._sense/astronomy/domain/AstroPositions.kt → .../tools/astronomy/domain/AstroPositions.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.domain
+package com.kylecorry.trail_sense.tools.astronomy.domain
 
 data class AstroPositions(
     val moonAltitude: Float,

diff --git a/..._sense/astronomy/domain/AstronomyEvent.kt → .../tools/astronomy/domain/AstronomyEvent.kt b/..._sense/astronomy/domain/AstronomyEvent.kt → .../tools/astronomy/domain/AstronomyEvent.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.domain
+package com.kylecorry.trail_sense.tools.astronomy.domain
 
 enum class AstronomyEvent {
     FullMoon,

diff --git a/...ense/astronomy/domain/AstronomyService.kt → ...ools/astronomy/domain/AstronomyService.kt b/...ense/astronomy/domain/AstronomyService.kt → ...ools/astronomy/domain/AstronomyService.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.domain
+package com.kylecorry.trail_sense.tools.astronomy.domain
 
 import com.kylecorry.sol.science.astronomy.Astronomy
 import com.kylecorry.sol.science.astronomy.RiseSetTransitTimes

diff --git a/...y/trail_sense/astronomy/domain/Eclipse.kt → ...l_sense/tools/astronomy/domain/Eclipse.kt b/...y/trail_sense/astronomy/domain/Eclipse.kt → ...l_sense/tools/astronomy/domain/Eclipse.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.domain
+package com.kylecorry.trail_sense.tools.astronomy.domain
 
 import com.kylecorry.sol.math.SolMath.roundPlaces
 import com.kylecorry.sol.units.Bearing

diff --git a/...my/infrastructure/AstronomyDailyWorker.kt → ...my/infrastructure/AstronomyDailyWorker.kt b/...my/infrastructure/AstronomyDailyWorker.kt → ...my/infrastructure/AstronomyDailyWorker.kt
@@ -1,11 +1,11 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure
 
 import android.content.Context
 import androidx.work.WorkerParameters
 import com.kylecorry.andromeda.background.DailyWorker
 import com.kylecorry.andromeda.background.IOneTimeTaskScheduler
 import com.kylecorry.andromeda.background.OneTimeTaskSchedulerFactory
-import com.kylecorry.trail_sense.astronomy.infrastructure.commands.AstronomyAlertCommand
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands.AstronomyAlertCommand
 import com.kylecorry.trail_sense.shared.UserPreferences
 import com.kylecorry.trail_sense.shared.preferences.PreferencesSubsystem
 import java.time.Duration

diff --git a/...my/infrastructure/AstronomyPreferences.kt → ...my/infrastructure/AstronomyPreferences.kt b/...my/infrastructure/AstronomyPreferences.kt → ...my/infrastructure/AstronomyPreferences.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure
 
 import android.content.Context
 import com.kylecorry.andromeda.core.toIntCompat

diff --git a/...ructure/commands/AstronomyAlertCommand.kt → ...ructure/commands/AstronomyAlertCommand.kt b/...ructure/commands/AstronomyAlertCommand.kt → ...ructure/commands/AstronomyAlertCommand.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.commands
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands
 
 import android.content.Context
 import com.kylecorry.andromeda.core.coroutines.onDefault

diff --git a/...ture/commands/LunarEclipseAlertCommand.kt → ...ture/commands/LunarEclipseAlertCommand.kt b/...ture/commands/LunarEclipseAlertCommand.kt → ...ture/commands/LunarEclipseAlertCommand.kt
@@ -1,14 +1,14 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.commands
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands
 
 import android.content.Context
 import android.util.Log
 import com.kylecorry.andromeda.notify.Notify
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.NotificationChannels
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
-import com.kylecorry.trail_sense.astronomy.domain.Eclipse
-import com.kylecorry.trail_sense.astronomy.ui.format.EclipseFormatter
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.Eclipse
+import com.kylecorry.trail_sense.tools.astronomy.ui.format.EclipseFormatter
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.NavigationUtils
 import com.kylecorry.trail_sense.shared.UserPreferences

diff --git a/...ture/commands/MeteorShowerAlertCommand.kt → ...ture/commands/MeteorShowerAlertCommand.kt b/...ture/commands/MeteorShowerAlertCommand.kt → ...ture/commands/MeteorShowerAlertCommand.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.commands
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands
 
 import android.content.Context
 import android.util.Log
@@ -7,7 +7,7 @@ import com.kylecorry.sol.science.astronomy.meteors.MeteorShowerPeak
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.NotificationChannels
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.NavigationUtils
 import com.kylecorry.trail_sense.shared.UserPreferences

diff --git a/...ture/commands/SolarEclipseAlertCommand.kt → ...ture/commands/SolarEclipseAlertCommand.kt b/...ture/commands/SolarEclipseAlertCommand.kt → ...ture/commands/SolarEclipseAlertCommand.kt
@@ -1,14 +1,14 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.commands
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands
 
 import android.content.Context
 import android.util.Log
 import com.kylecorry.andromeda.notify.Notify
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.NotificationChannels
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
-import com.kylecorry.trail_sense.astronomy.domain.Eclipse
-import com.kylecorry.trail_sense.astronomy.ui.format.EclipseFormatter
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.Eclipse
+import com.kylecorry.trail_sense.tools.astronomy.ui.format.EclipseFormatter
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.NavigationUtils
 import com.kylecorry.trail_sense.shared.UserPreferences

diff --git a/...astructure/commands/SunsetAlarmCommand.kt → ...astructure/commands/SunsetAlarmCommand.kt b/...astructure/commands/SunsetAlarmCommand.kt → ...astructure/commands/SunsetAlarmCommand.kt
@@ -1,13 +1,13 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.commands
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands
 
 import android.content.Context
 import android.util.Log
 import com.kylecorry.andromeda.notify.Notify
 import com.kylecorry.sol.math.Range
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
-import com.kylecorry.trail_sense.astronomy.infrastructure.receivers.SunsetAlarmReceiver
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers.SunsetAlarmReceiver
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.NavigationUtils
 import com.kylecorry.trail_sense.shared.UserPreferences

diff --git a/...tructure/receivers/SunsetAlarmReceiver.kt → ...tructure/receivers/SunsetAlarmReceiver.kt b/...tructure/receivers/SunsetAlarmReceiver.kt → ...tructure/receivers/SunsetAlarmReceiver.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.infrastructure.receivers
+package com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers
 
 import android.content.BroadcastReceiver
 import android.content.Context
@@ -7,7 +7,7 @@ import androidx.fragment.app.Fragment
 import com.kylecorry.andromeda.background.IOneTimeTaskScheduler
 import com.kylecorry.andromeda.background.OneTimeTaskSchedulerFactory
 import com.kylecorry.andromeda.fragments.IPermissionRequester
-import com.kylecorry.trail_sense.astronomy.infrastructure.commands.SunsetAlarmCommand
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.commands.SunsetAlarmCommand
 import com.kylecorry.trail_sense.shared.UserPreferences
 import com.kylecorry.trail_sense.shared.permissions.RequestBackgroundLocationCommand
 import com.kylecorry.trail_sense.shared.permissions.requestScheduleExactAlarms

diff --git a/...uickactions/AstronomyQuickActionBinder.kt → ...uickactions/AstronomyQuickActionBinder.kt b/...uickactions/AstronomyQuickActionBinder.kt → ...uickactions/AstronomyQuickActionBinder.kt
@@ -1,7 +1,7 @@
-package com.kylecorry.trail_sense.astronomy.quickactions
+package com.kylecorry.trail_sense.tools.astronomy.quickactions
 
-import com.kylecorry.trail_sense.astronomy.infrastructure.AstronomyPreferences
-import com.kylecorry.trail_sense.astronomy.ui.AstronomyFragment
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.AstronomyPreferences
+import com.kylecorry.trail_sense.tools.astronomy.ui.AstronomyFragment
 import com.kylecorry.trail_sense.databinding.ActivityAstronomyBinding
 import com.kylecorry.trail_sense.shared.quickactions.IQuickActionBinder
 import com.kylecorry.trail_sense.shared.quickactions.QuickActionFactory

diff --git a/...nomy/quickactions/QuickActionNightMode.kt → ...nomy/quickactions/QuickActionNightMode.kt b/...nomy/quickactions/QuickActionNightMode.kt → ...nomy/quickactions/QuickActionNightMode.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.quickactions
+package com.kylecorry.trail_sense.tools.astronomy.quickactions
 
 import android.widget.ImageButton
 import androidx.fragment.app.Fragment

diff --git a/...my/quickactions/QuickActionSunsetAlert.kt → ...my/quickactions/QuickActionSunsetAlert.kt b/...my/quickactions/QuickActionSunsetAlert.kt → ...my/quickactions/QuickActionSunsetAlert.kt
@@ -1,11 +1,11 @@
-package com.kylecorry.trail_sense.astronomy.quickactions
+package com.kylecorry.trail_sense.tools.astronomy.quickactions
 
 import android.widget.ImageButton
 import androidx.fragment.app.Fragment
 import com.kylecorry.andromeda.alerts.toast
 import com.kylecorry.andromeda.fragments.IPermissionRequester
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.infrastructure.receivers.SunsetAlarmReceiver
+import com.kylecorry.trail_sense.tools.astronomy.infrastructure.receivers.SunsetAlarmReceiver
 import com.kylecorry.trail_sense.shared.CustomUiUtils
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.QuickActionButton

diff --git a/...ry/trail_sense/astronomy/ui/AstroChart.kt → ...il_sense/tools/astronomy/ui/AstroChart.kt b/...ry/trail_sense/astronomy/ui/AstroChart.kt → ...il_sense/tools/astronomy/ui/AstroChart.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui
+package com.kylecorry.trail_sense.tools.astronomy.ui
 
 import android.graphics.Color
 import androidx.annotation.DrawableRes

diff --git a/...l_sense/astronomy/ui/AstronomyFragment.kt → ...e/tools/astronomy/ui/AstronomyFragment.kt b/...l_sense/astronomy/ui/AstronomyFragment.kt → ...e/tools/astronomy/ui/AstronomyFragment.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui
+package com.kylecorry.trail_sense.tools.astronomy.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -23,20 +23,19 @@ import com.kylecorry.sol.time.Time.toZonedDateTime
 import com.kylecorry.sol.units.Coordinate
 import com.kylecorry.sol.units.Reading
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.AstroPositions
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyEvent
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
-import com.kylecorry.trail_sense.astronomy.ui.commands.AstroChartData
-import com.kylecorry.trail_sense.astronomy.ui.commands.CenteredAstroChartDataProvider
-import com.kylecorry.trail_sense.astronomy.ui.commands.DailyAstroChartDataProvider
-import com.kylecorry.trail_sense.astronomy.ui.items.LunarEclipseListItemProducer
-import com.kylecorry.trail_sense.astronomy.ui.items.MeteorShowerListItemProducer
-import com.kylecorry.trail_sense.astronomy.ui.items.MoonListItemProducer
-import com.kylecorry.trail_sense.astronomy.ui.items.SolarEclipseListItemProducer
-import com.kylecorry.trail_sense.astronomy.ui.items.SunListItemProducer
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyEvent
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.ui.commands.AstroChartData
+import com.kylecorry.trail_sense.tools.astronomy.ui.commands.CenteredAstroChartDataProvider
+import com.kylecorry.trail_sense.tools.astronomy.ui.commands.DailyAstroChartDataProvider
+import com.kylecorry.trail_sense.tools.astronomy.ui.items.LunarEclipseListItemProducer
+import com.kylecorry.trail_sense.tools.astronomy.ui.items.MeteorShowerListItemProducer
+import com.kylecorry.trail_sense.tools.astronomy.ui.items.MoonListItemProducer
+import com.kylecorry.trail_sense.tools.astronomy.ui.items.SolarEclipseListItemProducer
+import com.kylecorry.trail_sense.tools.astronomy.ui.items.SunListItemProducer
 import com.kylecorry.trail_sense.databinding.ActivityAstronomyBinding
 import com.kylecorry.trail_sense.main.MainActivity
-import com.kylecorry.trail_sense.astronomy.quickactions.AstronomyQuickActionBinder
+import com.kylecorry.trail_sense.tools.astronomy.quickactions.AstronomyQuickActionBinder
 import com.kylecorry.trail_sense.shared.ErrorBannerReason
 import com.kylecorry.trail_sense.shared.FormatService
 import com.kylecorry.trail_sense.shared.UserPreferences
@@ -48,6 +47,7 @@ import com.kylecorry.trail_sense.shared.sensors.SensorService
 import com.kylecorry.trail_sense.shared.sensors.overrides.CachedGPS
 import com.kylecorry.trail_sense.shared.sensors.overrides.OverrideGPS
 import com.kylecorry.trail_sense.shared.views.UserError
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstroPositions
 import com.kylecorry.trail_sense.tools.augmented_reality.ARMode
 import com.kylecorry.trail_sense.tools.augmented_reality.AugmentedRealityFragment
 import kotlinx.coroutines.Dispatchers

diff --git a/...ense/astronomy/ui/MoonPhaseImageMapper.kt → ...ools/astronomy/ui/MoonPhaseImageMapper.kt b/...ense/astronomy/ui/MoonPhaseImageMapper.kt → ...ools/astronomy/ui/MoonPhaseImageMapper.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui
+package com.kylecorry.trail_sense.tools.astronomy.ui
 
 import androidx.annotation.DrawableRes
 import com.kylecorry.sol.science.astronomy.moon.MoonTruePhase

diff --git a/...e/astronomy/ui/commands/AstroChartData.kt → ...s/astronomy/ui/commands/AstroChartData.kt b/...e/astronomy/ui/commands/AstroChartData.kt → ...s/astronomy/ui/commands/AstroChartData.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.commands
+package com.kylecorry.trail_sense.tools.astronomy.ui.commands
 
 import com.kylecorry.sol.units.Reading
 

diff --git a/...ommands/CenteredAstroChartDataProvider.kt → ...ommands/CenteredAstroChartDataProvider.kt b/...ommands/CenteredAstroChartDataProvider.kt → ...ommands/CenteredAstroChartDataProvider.kt
@@ -1,8 +1,8 @@
-package com.kylecorry.trail_sense.astronomy.ui.commands
+package com.kylecorry.trail_sense.tools.astronomy.ui.commands
 
 import com.kylecorry.andromeda.core.specifications.Specification
 import com.kylecorry.sol.units.Coordinate
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import com.kylecorry.trail_sense.tools.pedometer.infrastructure.IsTodaySpecification
 import java.time.Instant
 import java.time.ZonedDateTime

diff --git a/...i/commands/DailyAstroChartDataProvider.kt → ...i/commands/DailyAstroChartDataProvider.kt b/...i/commands/DailyAstroChartDataProvider.kt → ...i/commands/DailyAstroChartDataProvider.kt
@@ -1,7 +1,7 @@
-package com.kylecorry.trail_sense.astronomy.ui.commands
+package com.kylecorry.trail_sense.tools.astronomy.ui.commands
 
 import com.kylecorry.sol.units.Coordinate
-import com.kylecorry.trail_sense.astronomy.domain.AstronomyService
+import com.kylecorry.trail_sense.tools.astronomy.domain.AstronomyService
 import java.time.ZonedDateTime
 
 class DailyAstroChartDataProvider(private val astronomy: AstronomyService = AstronomyService()) :

diff --git a/...my/ui/commands/IAstroChartDataProvider.kt → ...my/ui/commands/IAstroChartDataProvider.kt b/...my/ui/commands/IAstroChartDataProvider.kt → ...my/ui/commands/IAstroChartDataProvider.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.commands
+package com.kylecorry.trail_sense.tools.astronomy.ui.commands
 
 import com.kylecorry.sol.units.Coordinate
 import java.time.ZonedDateTime

diff --git a/...e/astronomy/ui/format/EclipseFormatter.kt → ...s/astronomy/ui/format/EclipseFormatter.kt b/...e/astronomy/ui/format/EclipseFormatter.kt → ...s/astronomy/ui/format/EclipseFormatter.kt
@@ -1,8 +1,8 @@
-package com.kylecorry.trail_sense.astronomy.ui.format
+package com.kylecorry.trail_sense.tools.astronomy.ui.format
 
 import android.content.Context
 import com.kylecorry.trail_sense.R
-import com.kylecorry.trail_sense.astronomy.domain.Eclipse
+import com.kylecorry.trail_sense.tools.astronomy.domain.Eclipse
 import com.kylecorry.trail_sense.shared.FormatService
 
 object EclipseFormatter {

diff --git a/...omy/ui/items/AstronomyListItemProducer.kt → ...omy/ui/items/AstronomyListItemProducer.kt b/...omy/ui/items/AstronomyListItemProducer.kt → ...omy/ui/items/AstronomyListItemProducer.kt
@@ -1,4 +1,4 @@
-package com.kylecorry.trail_sense.astronomy.ui.items
+package com.kylecorry.trail_sense.tools.astronomy.ui.items
 
 import com.kylecorry.andromeda.views.list.ListItem
 import com.kylecorry.sol.units.Coordinate