82 Commits

Author SHA1 Message Date
e541a3729c Merge pull request #46 from hmalik144/ui_test_fix_failing_tests_1508
UI test fix failing tests 1508
2023-09-15 17:11:19 +01:00
ea63845552 - config.yml updated 2023-09-15 17:02:08 +01:00
06b51d3081 - config.yml updated 2023-09-15 16:49:00 +01:00
3d4639403f - config.yml updated 2023-09-15 16:33:30 +01:00
ebb4102121 - config.yml updated 2023-09-15 16:20:40 +01:00
4bc02ae705 - UI tests fix try 2023-09-15 16:11:28 +01:00
1c1ae5c4d2 Merge pull request #45 from hmalik144/change_ci_android_avd
- UI tests updated
2023-09-15 14:00:32 +01:00
db68d71709 - UI tests updated 2023-09-15 13:59:27 +01:00
255defade3 Merge pull request #43 from hmalik144/calender_page_feature
Calender page feature
2023-09-15 13:39:51 +01:00
31a45fdbb5 - UI tests updated 2023-09-15 13:34:42 +01:00
7366fba0ad - UI tests updated 2023-09-15 13:34:06 +01:00
5c0ddcae5d - Calender view page added
- migrated to tabbed bottom bar
 - update and clear filters fixed
 - Title set for child fragments
2023-09-14 11:43:09 +01:00
6e41d78d60 - Calender view page added
- migrated to tabbed bottom bar
 - update and clear filters fixed
2023-09-14 11:26:53 +01:00
c9b4190a93 - change list item view
- added pop menu to list item
 - fixed update/add shift bug
2023-09-13 15:45:58 +01:00
e5d1ef3a75 Merge pull request #41 from hmalik144/version_bump
ui update
2023-09-10 23:23:49 +01:00
5b5d301ceb - version bumped 2023-09-10 23:23:15 +01:00
f3bd37244a Merge pull request #40 from hmalik144/rounding_bug_fix
Rounding bug fix
2023-09-10 23:20:44 +01:00
ebab691fb7 - Fragment navigation library added
- on back pressed fixed
2023-09-10 23:19:57 +01:00
395e4583bf Merge branch 'master' into rounding_bug_fix 2023-09-10 23:19:47 +01:00
d2b4dd12f9 Merge pull request #37 from hmalik144/navigation_implementation
Navigation implementation
2023-09-10 18:24:03 +01:00
3a3a14e95f - Fragment navigation library added
- on back pressed fixed
2023-09-10 18:19:26 +01:00
cb3cf4014d Merge branch 'master' into navigation_implementation
# Conflicts:
#	app/src/main/java/com/appttude/h_mal/farmr/ui/FragmentAddItem.kt
#	app/src/main/java/com/appttude/h_mal/farmr/ui/MainActivity.kt
#	app/src/main/java/com/appttude/h_mal/farmr/ui/ShiftListAdapter.kt
#	app/src/main/java/com/appttude/h_mal/farmr/utils/Formatting.kt
2023-09-10 17:02:13 +01:00
7d21dcf048 Merge pull request #36 from hmalik144/ui_clean_up
minor ui fixes
2023-09-08 21:08:27 +01:00
688cea6a29 - Dialog on exit when add/edit shift
- menu buttons only on main fragment
 - title of fragment correct
2023-09-08 21:05:19 +01:00
9025b15ef9 Merge pull request #35 from hmalik144/master
ci release update
2023-09-08 15:41:52 +01:00
d7f818c5fb Merge pull request #34 from hmalik144/release_ci_update
- ci update for release
2023-09-08 15:41:13 +01:00
104c75765a - ci update for release
- bump version code
2023-09-08 15:40:55 +01:00
321a965f11 Merge pull request #33 from hmalik144/master
apk to bundle
2023-09-08 15:39:01 +01:00
e76e39cb56 Merge pull request #32 from hmalik144/apk_to_bundle
- migrate from apk to bundle
2023-09-08 15:37:45 +01:00
306dfa30c8 - migrate from apk to bundle 2023-09-08 15:35:02 +01:00
74d85a3fe3 Merge pull request #31 from hmalik144/master
Android 33 version update
2023-09-08 15:20:02 +01:00
145fc9dcfb Merge branch 'release' into master 2023-09-08 15:11:32 +01:00
b6d885c084 Merge pull request #30 from hmalik144/android_33_version_update
- android version updated to 33
2023-09-08 15:10:23 +01:00
f01def1b69 - android version updated to 33 2023-09-08 15:05:15 +01:00
1258afc4d0 Merge pull request #28 from hmalik144/show_empty_view
Empty view displayed
2023-09-05 12:30:55 +01:00
34764266db - 2 dp formatting changed 2023-09-05 00:38:26 +01:00
66949f761a - empty list implemented for recycler view 2023-09-05 00:23:40 +01:00
85e0edb1e8 - Show dialog on back press broken 2023-09-04 23:05:05 +01:00
21816430f5 - mid commit 2023-08-31 20:03:39 +01:00
1d0498fe47 - mid commit 2023-08-31 19:57:37 +01:00
7be038ef24 - mid commit 2023-08-31 13:09:31 +01:00
ee5738be8c Merge pull request #26 from hmalik144/version_bump
- bumped version
2023-08-31 10:45:40 +01:00
d6ffa34d0f - bumped version 2023-08-31 10:45:01 +01:00
bb0eb03925 Merge pull request #25 from hmalik144/master
Internal storage only
2023-08-31 10:30:40 +01:00
2a4a13c7b2 Merge pull request #24 from hmalik144/permissions_dispatcher
Permissions dispatcher
2023-08-31 09:48:30 +01:00
92bdc98f27 - local test fix 2023-08-31 09:45:40 +01:00
104f90993c - Gradle dependencies cleaned up 2023-08-31 09:22:04 +01:00
38b69c12b6 - Gradle dependencies cleaned up 2023-08-30 17:05:23 +01:00
bafc9c8a7e - Permissions removed (Not required - app only uses internal storage) 2023-08-30 15:29:07 +01:00
7080bf3913 Merge pull request #23 from hmalik144/circle_ci_fix
- circleci fix
2023-08-30 10:07:24 +01:00