mirror of
https://github.com/hmalik144/Weather-apps.git
synced 2025-12-10 02:05:20 +00:00
hmalik144
ea2199e9de
# Conflicts: # .idea/androidTestResultsUserPreferences.xml # app/src/androidTest/java/com/appttude/h_mal/atlas_weather/application/TestAppClass.kt # app/src/androidTest/java/com/appttude/h_mal/atlas_weather/data/location/MockLocationProvider.kt # app/src/androidTest/java/com/appttude/h_mal/atlas_weather/data/network/interceptors/MockingNetworkInterceptor.kt # app/src/androidTest/java/com/appttude/h_mal/atlas_weather/helpers/BaseMatcher.kt # app/src/androidTestAtlasWeather/java/com/appttude/h_mal/atlas_weather/robot/HomeScreenRobot.kt # app/src/androidTestMonoWeather/java/com/appttude/h_mal/monoWeather/robot/HomeScreenRobot.kt # app/src/androidTestMonoWeather/java/com/appttude/h_mal/monoWeather/tests/HomePageUITest.kt # app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/home/adapter/EmptyViewHolder.kt # app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/home/adapter/WeatherRecyclerAdapter.kt # app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/world/AddLocationFragment.kt # app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/world/WorldFragment.kt # app/src/atlasWeather/res/layout/activity_add_forecast.xml # app/src/atlasWeather/res/layout/activity_main.xml # app/src/atlasWeather/res/layout/fragment_add_location.xml # app/src/main/java/com/appttude/h_mal/atlas_weather/data/repository/RepositoryImpl.kt # app/src/main/java/com/appttude/h_mal/atlas_weather/ui/BaseFragment.kt # app/src/main/java/com/appttude/h_mal/atlas_weather/viewmodel/MainViewModel.kt # app/src/main/java/com/appttude/h_mal/atlas_weather/viewmodel/WorldViewModel.kt # app/src/main/java/com/appttude/h_mal/atlas_weather/viewmodel/baseViewModels/WeatherViewModel.kt # app/src/main/res/layout/activity_add_forecast.xml # app/src/main/res/layout/db_list_item.xml # app/src/main/res/layout/fragment_home.xml # app/src/main/res/values/strings.xml # app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/EmptyViewHolder.kt # app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/WorldItemFragment.kt # app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/home/HomeFragment.kt # app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/world/AddLocationFragment.kt # app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/world/WorldFragment.kt # app/src/monoWeather/res/layout/fragment__two.xml # app/src/monoWeather/res/layout/mono_item_two.xml # app/src/test/java/com/appttude/h_mal/atlas_weather/data/repository/RepositoryImplTest.kt # app/src/test/java/com/appttude/h_mal/atlas_weather/helper/ServicesHelperTest.kt # app/src/test/java/com/appttude/h_mal/atlas_weather/viewmodel/WorldViewModelTest.kt