Merge pull request #84 from odaridavid/move-to-shared

move core models to `commonMain`
odaridavid · Mar 21, 2024 · 9d170ee · 9d170ee
2 parents 03a89ea + 3a1898e
commit 9d170ee
Show file tree

Hide file tree

Showing 31 changed files with 106 additions and 107 deletions.
diff --git a/app/src/androidTest/kotlin/com/github/odaridavid/weatherapp/SettingsRepositoryTest.kt b/app/src/androidTest/kotlin/com/github/odaridavid/weatherapp/SettingsRepositoryTest.kt
@@ -5,12 +5,12 @@ import androidx.test.core.app.ApplicationProvider
 import androidx.test.filters.SmallTest
 import app.cash.turbine.test
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
 import com.github.odaridavid.weatherapp.data.settings.DefaultSettingsRepository
+import com.github.odaridavid.weatherapp.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.ExcludedData
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
 import kotlinx.coroutines.test.runTest
 import org.junit.Before
 import org.junit.Test

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/MainViewModel.kt b/app/src/main/java/com/github/odaridavid/weatherapp/MainViewModel.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.github.odaridavid.weatherapp.core.api.Logger
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.DefaultLocation
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/core/api/SettingsRepository.kt b/app/src/main/java/com/github/odaridavid/weatherapp/core/api/SettingsRepository.kt
@@ -1,10 +1,10 @@
 package com.github.odaridavid.weatherapp.core.api
 
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
+import com.github.odaridavid.weatherapp.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.ExcludedData
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
 import kotlinx.coroutines.flow.Flow
 
 interface SettingsRepository {

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/core/api/WeatherRepository.kt b/app/src/main/java/com/github/odaridavid/weatherapp/core/api/WeatherRepository.kt
@@ -1,9 +1,8 @@
 package com.github.odaridavid.weatherapp.core.api
 
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.Weather
-import com.github.odaridavid.weatherapp.core.Result
-import kotlinx.coroutines.flow.Flow
+import com.github.odaridavid.weatherapp.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.Result
+import com.github.odaridavid.weatherapp.model.Weather
 
 interface WeatherRepository {
 

diff --git a/...src/main/java/com/github/odaridavid/weatherapp/data/settings/DefaultSettingsRepository.kt b/...src/main/java/com/github/odaridavid/weatherapp/data/settings/DefaultSettingsRepository.kt
@@ -6,12 +6,12 @@ import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.stringPreferencesKey
 import com.github.odaridavid.weatherapp.BuildConfig
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
 import com.github.odaridavid.weatherapp.data.dataStore
+import com.github.odaridavid.weatherapp.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.ExcludedData
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
 import dagger.hilt.android.qualifiers.ApplicationContext
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/data/weather/DefaultWeatherRepository.kt b/app/src/main/java/com/github/odaridavid/weatherapp/data/weather/DefaultWeatherRepository.kt
@@ -1,15 +1,15 @@
 package com.github.odaridavid.weatherapp.data.weather
 
-import com.github.odaridavid.weatherapp.core.Result
-import com.github.odaridavid.weatherapp.core.Result.Error
 import com.github.odaridavid.weatherapp.core.api.Logger
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
 import com.github.odaridavid.weatherapp.core.api.WeatherRepository
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
-import com.github.odaridavid.weatherapp.core.model.Weather
 import com.github.odaridavid.weatherapp.data.weather.remote.RemoteWeatherDataSource
 import com.github.odaridavid.weatherapp.data.weather.remote.mapThrowableToErrorType
+import com.github.odaridavid.weatherapp.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.ExcludedData
+import com.github.odaridavid.weatherapp.model.Result
+import com.github.odaridavid.weatherapp.model.Result.Error
+import com.github.odaridavid.weatherapp.model.Weather
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
 

diff --git a/...va/com/github/odaridavid/weatherapp/data/weather/remote/DefaultRemoteWeatherDataSource.kt b/...va/com/github/odaridavid/weatherapp/data/weather/remote/DefaultRemoteWeatherDataSource.kt
@@ -1,9 +1,9 @@
 package com.github.odaridavid.weatherapp.data.weather.remote
 
 import com.github.odaridavid.weatherapp.BuildConfig
-import com.github.odaridavid.weatherapp.core.Result
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.Weather
+import com.github.odaridavid.weatherapp.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.Result
+import com.github.odaridavid.weatherapp.model.Weather
 import javax.inject.Inject
 
 class DefaultRemoteWeatherDataSource @Inject constructor(

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/data/weather/remote/Mappers.kt b/app/src/main/java/com/github/odaridavid/weatherapp/data/weather/remote/Mappers.kt
@@ -1,18 +1,18 @@
 package com.github.odaridavid.weatherapp.data.weather.remote
 
 import com.github.odaridavid.weatherapp.BuildConfig
-import com.github.odaridavid.weatherapp.core.ErrorType
-import com.github.odaridavid.weatherapp.core.model.ClientException
-import com.github.odaridavid.weatherapp.core.model.CurrentWeather
-import com.github.odaridavid.weatherapp.core.model.DailyWeather
-import com.github.odaridavid.weatherapp.core.model.GenericException
-import com.github.odaridavid.weatherapp.core.model.HourlyWeather
-import com.github.odaridavid.weatherapp.core.model.ServerException
-import com.github.odaridavid.weatherapp.core.model.Temperature
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
-import com.github.odaridavid.weatherapp.core.model.Weather
-import com.github.odaridavid.weatherapp.core.model.WeatherInfo
+import com.github.odaridavid.weatherapp.model.ClientException
+import com.github.odaridavid.weatherapp.model.CurrentWeather
+import com.github.odaridavid.weatherapp.model.DailyWeather
+import com.github.odaridavid.weatherapp.model.ErrorType
+import com.github.odaridavid.weatherapp.model.GenericException
+import com.github.odaridavid.weatherapp.model.HourlyWeather
+import com.github.odaridavid.weatherapp.model.ServerException
+import com.github.odaridavid.weatherapp.model.Temperature
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
+import com.github.odaridavid.weatherapp.model.Weather
+import com.github.odaridavid.weatherapp.model.WeatherInfo
 import java.io.IOException
 import java.net.HttpURLConnection
 import java.text.SimpleDateFormat

diff --git a/...main/java/com/github/odaridavid/weatherapp/data/weather/remote/RemoteWeatherDataSource.kt b/...main/java/com/github/odaridavid/weatherapp/data/weather/remote/RemoteWeatherDataSource.kt
@@ -1,8 +1,8 @@
 package com.github.odaridavid.weatherapp.data.weather.remote
 
-import com.github.odaridavid.weatherapp.core.Result
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.Weather
+import com.github.odaridavid.weatherapp.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.Result
+import com.github.odaridavid.weatherapp.model.Weather
 
 interface RemoteWeatherDataSource {
 

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/ui/home/HomeScreen.kt b/app/src/main/java/com/github/odaridavid/weatherapp/ui/home/HomeScreen.kt
@@ -19,9 +19,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import com.github.odaridavid.weatherapp.R
 import com.github.odaridavid.weatherapp.common.getCityName
-import com.github.odaridavid.weatherapp.core.model.CurrentWeather
-import com.github.odaridavid.weatherapp.core.model.DailyWeather
-import com.github.odaridavid.weatherapp.core.model.HourlyWeather
 import com.github.odaridavid.weatherapp.designsystem.WeatherAppTheme
 import com.github.odaridavid.weatherapp.designsystem.molecule.LargeLabel
 import com.github.odaridavid.weatherapp.designsystem.molecule.MediumBody
@@ -32,6 +29,9 @@ import com.github.odaridavid.weatherapp.designsystem.organism.Temperature
 import com.github.odaridavid.weatherapp.designsystem.organism.TemperatureHeadline
 import com.github.odaridavid.weatherapp.designsystem.templates.ErrorScreen
 import com.github.odaridavid.weatherapp.designsystem.templates.LoadingScreen
+import com.github.odaridavid.weatherapp.model.CurrentWeather
+import com.github.odaridavid.weatherapp.model.DailyWeather
+import com.github.odaridavid.weatherapp.model.HourlyWeather
 
 @Composable
 fun HomeScreen(

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/ui/home/HomeViewModel.kt b/app/src/main/java/com/github/odaridavid/weatherapp/ui/home/HomeViewModel.kt
@@ -3,13 +3,13 @@ package com.github.odaridavid.weatherapp.ui.home
 import androidx.annotation.StringRes
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.github.odaridavid.weatherapp.core.Result
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
 import com.github.odaridavid.weatherapp.core.api.WeatherRepository
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.Units
-import com.github.odaridavid.weatherapp.core.model.Weather
+import com.github.odaridavid.weatherapp.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.Result
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.Units
+import com.github.odaridavid.weatherapp.model.Weather
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/ui/home/Mappers.kt b/app/src/main/java/com/github/odaridavid/weatherapp/ui/home/Mappers.kt
@@ -2,7 +2,7 @@ package com.github.odaridavid.weatherapp.ui.home
 
 import androidx.annotation.StringRes
 import com.github.odaridavid.weatherapp.R
-import com.github.odaridavid.weatherapp.core.ErrorType
+import com.github.odaridavid.weatherapp.model.ErrorType
 
 @StringRes
 fun ErrorType.toResourceId(): Int = when (this) {

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/ui/settings/SettingsScreen.kt b/app/src/main/java/com/github/odaridavid/weatherapp/ui/settings/SettingsScreen.kt
@@ -11,16 +11,16 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import com.github.odaridavid.weatherapp.R
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
 import com.github.odaridavid.weatherapp.designsystem.WeatherAppTheme
 import com.github.odaridavid.weatherapp.designsystem.organism.MultiSelectBottomSheet
 import com.github.odaridavid.weatherapp.designsystem.organism.SettingOptionRow
 import com.github.odaridavid.weatherapp.designsystem.organism.SingleSelectBottomSheet
 import com.github.odaridavid.weatherapp.designsystem.organism.TopNavigationBar
 import com.github.odaridavid.weatherapp.designsystem.organism.VersionInfoText
+import com.github.odaridavid.weatherapp.model.ExcludedData
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/ui/settings/SettingsScreenIntent.kt b/app/src/main/java/com/github/odaridavid/weatherapp/ui/settings/SettingsScreenIntent.kt
@@ -1,9 +1,9 @@
 package com.github.odaridavid.weatherapp.ui.settings
 
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
+import com.github.odaridavid.weatherapp.model.ExcludedData
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
 
 sealed class SettingsScreenIntent {
 

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/ui/settings/SettingsViewModel.kt b/app/src/main/java/com/github/odaridavid/weatherapp/ui/settings/SettingsViewModel.kt
@@ -4,10 +4,10 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.github.odaridavid.weatherapp.core.api.Logger
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
+import com.github.odaridavid.weatherapp.model.ExcludedData
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

diff --git a/app/src/main/java/com/github/odaridavid/weatherapp/ui/settings/UIMapper.kt b/app/src/main/java/com/github/odaridavid/weatherapp/ui/settings/UIMapper.kt
@@ -1,10 +1,10 @@
 package com.github.odaridavid.weatherapp.ui.settings
 
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
 import com.github.odaridavid.weatherapp.designsystem.organism.BottomSheetItem
+import com.github.odaridavid.weatherapp.model.ExcludedData
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
 
 // TODO Fix repetition of mapping
 fun ExcludedData.toBottomSheetModel(isSelected: Boolean = false): BottomSheetItem {

diff --git a/app/src/test/java/com/github/odaridavid/weatherapp/HomeViewModelTest.kt b/app/src/test/java/com/github/odaridavid/weatherapp/HomeViewModelTest.kt
@@ -4,17 +4,17 @@ import app.cash.turbine.test
 import com.github.odaridavid.weatherapp.core.api.Logger
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
 import com.github.odaridavid.weatherapp.core.api.WeatherRepository
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
 import com.github.odaridavid.weatherapp.data.weather.DefaultWeatherRepository
 import com.github.odaridavid.weatherapp.data.weather.remote.DefaultRemoteWeatherDataSource
 import com.github.odaridavid.weatherapp.data.weather.remote.OpenWeatherService
 import com.github.odaridavid.weatherapp.data.weather.remote.WeatherResponse
 import com.github.odaridavid.weatherapp.fakes.FakeSettingsRepository
 import com.github.odaridavid.weatherapp.fakes.fakeSuccessMappedWeatherResponse
 import com.github.odaridavid.weatherapp.fakes.fakeSuccessWeatherResponse
+import com.github.odaridavid.weatherapp.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
 import com.github.odaridavid.weatherapp.rules.MainCoroutineRule
 import com.github.odaridavid.weatherapp.ui.home.HomeScreenIntent
 import com.github.odaridavid.weatherapp.ui.home.HomeScreenViewState

diff --git a/app/src/test/java/com/github/odaridavid/weatherapp/SettingsRepositoryTest.kt b/app/src/test/java/com/github/odaridavid/weatherapp/SettingsRepositoryTest.kt
@@ -1,13 +1,13 @@
 package com.github.odaridavid.weatherapp
 
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
 import com.github.odaridavid.weatherapp.data.settings.DefaultSettingsRepository
 import com.github.odaridavid.weatherapp.fakes.FakeSettingsRepository
+import com.github.odaridavid.weatherapp.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.ExcludedData
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
 import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.runBlocking
 import org.junit.Test

diff --git a/app/src/test/java/com/github/odaridavid/weatherapp/SettingsViewModelTest.kt b/app/src/test/java/com/github/odaridavid/weatherapp/SettingsViewModelTest.kt
@@ -3,11 +3,11 @@ package com.github.odaridavid.weatherapp
 import app.cash.turbine.test
 import com.github.odaridavid.weatherapp.core.api.Logger
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
 import com.github.odaridavid.weatherapp.fakes.FakeSettingsRepository
+import com.github.odaridavid.weatherapp.model.ExcludedData
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
 import com.github.odaridavid.weatherapp.rules.MainCoroutineRule
 import com.github.odaridavid.weatherapp.ui.settings.SettingsScreenIntent
 import com.github.odaridavid.weatherapp.ui.settings.SettingsScreenViewState

diff --git a/app/src/test/java/com/github/odaridavid/weatherapp/UIMapperTest.kt b/app/src/test/java/com/github/odaridavid/weatherapp/UIMapperTest.kt
@@ -1,10 +1,10 @@
 package com.github.odaridavid.weatherapp
 
-import com.github.odaridavid.weatherapp.core.model.ExcludedData
-import com.github.odaridavid.weatherapp.core.model.SupportedLanguage
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
-import com.github.odaridavid.weatherapp.core.model.Units
 import com.github.odaridavid.weatherapp.designsystem.organism.BottomSheetItem
+import com.github.odaridavid.weatherapp.model.ExcludedData
+import com.github.odaridavid.weatherapp.model.SupportedLanguage
+import com.github.odaridavid.weatherapp.model.TimeFormat
+import com.github.odaridavid.weatherapp.model.Units
 import com.github.odaridavid.weatherapp.ui.settings.toBottomSheetModel
 import com.github.odaridavid.weatherapp.ui.settings.toExcludedData
 import com.github.odaridavid.weatherapp.ui.settings.toSupportedLanguage

diff --git a/app/src/test/java/com/github/odaridavid/weatherapp/WeatherRepositoryTest.kt b/app/src/test/java/com/github/odaridavid/weatherapp/WeatherRepositoryTest.kt
@@ -1,12 +1,8 @@
 package com.github.odaridavid.weatherapp
 
-import com.github.odaridavid.weatherapp.core.ErrorType
-import com.github.odaridavid.weatherapp.core.Result
 import com.github.odaridavid.weatherapp.core.api.Logger
 import com.github.odaridavid.weatherapp.core.api.SettingsRepository
 import com.github.odaridavid.weatherapp.core.api.WeatherRepository
-import com.github.odaridavid.weatherapp.core.model.DefaultLocation
-import com.github.odaridavid.weatherapp.core.model.TimeFormat
 import com.github.odaridavid.weatherapp.data.weather.DefaultWeatherRepository
 import com.github.odaridavid.weatherapp.data.weather.remote.DefaultRemoteWeatherDataSource
 import com.github.odaridavid.weatherapp.data.weather.remote.OpenWeatherService
@@ -15,6 +11,10 @@ import com.github.odaridavid.weatherapp.data.weather.remote.WeatherResponse
 import com.github.odaridavid.weatherapp.fakes.FakeSettingsRepository
 import com.github.odaridavid.weatherapp.fakes.fakeSuccessMappedWeatherResponse
 import com.github.odaridavid.weatherapp.fakes.fakeSuccessWeatherResponse
+import com.github.odaridavid.weatherapp.model.DefaultLocation
+import com.github.odaridavid.weatherapp.model.ErrorType
+import com.github.odaridavid.weatherapp.model.Result
+import com.github.odaridavid.weatherapp.model.TimeFormat
 import com.google.common.truth.Truth
 import io.mockk.coEvery
 import io.mockk.impl.annotations.MockK