Commit Graph

34 Commits

Author SHA1 Message Date
ea2199e9de Merge remote-tracking branch 'origin/master' into test_suite_expansion
# 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
2023-08-12 18:20:55 +01:00
02808ef165 - Testsuite expansion 2023-08-12 17:26:56 +01:00
3d7997f623 - mid commit 2023-08-12 13:21:23 +01:00
9aaf98a655 - mid commit 2023-08-10 23:12:37 +01:00
ce1d13e630 Lint fixes (#19)
- Code inspection
 - Redundant resources removed
 - Resources moved the corresponding flavours
 - Deprecated dependencies upgraded
 - lint changes
 - circleci updated to capture screenshot
2023-08-09 00:21:15 +01:00
ffa7edf25d - circleci updated 2023-08-09 00:07:36 +01:00
fb9f74fd5f - circleci updated 2023-08-08 23:56:06 +01:00
99128adda1 - circleci updated 2023-08-08 23:27:01 +01:00
a9e0012cec - circleci updated 2023-08-08 22:59:19 +01:00
2181cb70b1 - Failing test fixed
- circleci updated to capture screenshot
2023-08-08 22:44:24 +01:00
9a0189c8ec - Code inspection
- Redundant resources removed
 - Resources moved the corresponding flavours
 - Deprecated dependencies upgraded
 - lint changes
2023-08-08 22:20:39 +01:00
9189a4412d Merge branch 'master' into lint_fixes 2023-08-07 21:01:40 +01:00
e3e53d9076 - circleci update 2023-08-07 21:01:22 +01:00
baabebd40d Refactor flavours (#17)
- Fastlane completed
 - Circleci config completed
 - Flavours build completed
2023-08-07 20:17:08 +01:00
4a37b724a6 Ci integration upgrade (#14)
- Circleci setup
 - gradle version updated
 - snapshots added
 - separated test files by flavour
2023-07-26 22:54:08 +01:00
3d5cb4e9fe removed api keys from gradle.properties files (#13)
* removed api keys from gradle.properties files
(cherry picked from commit e54dc864905eb5f8ef9374b9550d7def33fbfd1a)
* patched app.gradle
* fix to permissions dialog
2022-06-10 01:16:16 +01:00
f7244ee015 Playstore permissions declaration (#12)
* Declaration builder created

Took 2 hours 34 minutes


Took 2 minutes

* - Fixed android S issues
 - Dialog box completed
 - Widget creation activity UI test added

Took 1 hour 53 minutes

* - Popup for google playstore permissions added
- UI tests with stubbing added
- linting clean ups
- changes to fragments and base fragment

Took 3 hours 57 minutes
2022-06-09 23:35:57 +01:00
d7534d585e Upgraded android api (#11) 2022-04-06 23:16:00 +01:00
a96b976e86 - Espresso mock network interceptor added (#9)
- Ability to stub end points in UI tests
2022-04-03 14:50:30 +01:00
a1a32e4ceb Wake screen widget (#8)
* - Update widget validation
* - Cleaned widget folder and code
2022-02-15 00:57:52 +00:00
ed78d40cc0 Circleci project setup completed
- Add .circleci/config.yml
 - Errors resolved in atlas weather flavour
 - continue with Lint errors enabled
 - update to config.yml
2022-02-06 20:48:13 +00:00
d2bffab2e1 - Commit latest to main
Took 14 minutes
2022-02-06 17:56:36 +00:00
e4c8c45e5c Delete app/release directory 2021-05-08 20:59:42 +01:00
ffa68a78b6 - All committed to main 2021-05-08 20:58:34 +01:00
4812a523b0 - All committed to main 2021-04-20 20:30:55 +01:00
2cb2400156 Merge remote-tracking branch 'origin/master' 2021-04-20 20:09:54 +01:00
b41ba10abb - weathered 2021-04-20 20:09:32 +01:00
cd07aaeb52 Update .gitignore
Updated
2020-12-16 22:01:59 +00:00
9d053bfb60 - new flavours added 2020-12-01 19:22:52 +00:00
f6e9bf8bcb Merge pull request #1 from hmalik144/Kotlin-flavoured
Kotlin flavoured
2020-11-28 22:31:28 +00:00
a84a8bcb40 - Changed package layout
- added black background feature to Widget
 - Update to MyWidgetRemoteViewsFactory.kt
2020-11-28 22:09:05 +00:00
4db91cd3c1 Widget class revamped
- new layout
 - with new data
 - Services class amended
 - removal of all legacy code
2020-11-28 02:40:21 +00:00
7719d76f3f Completion of weather app with new api
- MVVM
 - SOLID
 - Atlas Weather Views ported to kotlin
2020-11-27 16:11:47 +00:00
5561585dca Initial Commit 2018-12-30 13:51:25 +11:00