Commit Graph

35 Commits (4e9fdfd103652a7b3f3d644ca1c273033d10e5bc)

Author SHA1 Message Date
hussam al-habibeh c5987bcbdf delivery information design update 5 years ago
Elham Rababah e3610b0804 Merge branch 'fix_auth_issue' of https://gitlab.com/Cloud_Solution/driver-app into merge_auth_fixes_into_dev
 Conflicts:
	lib/pages/authentication/login_page.dart
	lib/pages/delivery/information_page.dart
5 years ago
enadhilal 4096288fc6 Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed
# Conflicts:
#	lib/pages/delivery/delivery_confirmed_page.dart
#	lib/pages/delivery/information_page.dart
5 years ago
enadhilal 1f6acfcb5d update the item ID and change the icon , icon label, remove description and fix the stack issue in delivery_confirmed. 5 years ago
Elham Rababah 41c66fc8ff fix auth issue 5 years ago
Elham Rababah b5cd2bd791 Merge branch 'next_order_service' of https://gitlab.com/Cloud_Solution/driver-app into merge_next_order_service_into_dev
 Conflicts:
	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah f02af06ac3 finish next orders service 5 years ago
Elham Rababah 384710e9b6 finish next orders service 5 years ago
Elham Rababah aa1332676a First step form next orders service 5 years ago
enadhilal df3e4b0bfd Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed
# Conflicts:
#	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah 1ae437507a Fix landscape issues 5 years ago
enadhilal 5c9417ca6d Merge branch 'master' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed
# Conflicts:
#	lib/pages/delivery/information_page.dart
5 years ago
enadhilal c8d1c48b9b Merge branch 'delivery_confirmed' of gitlab.com:Cloud_Solution/driver-app into delivery_confirmed
# Conflicts:
#	lib/pages/delivery/information_page.dart
5 years ago
Elham Rababah e27093311f Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_dashboard_into_dev
 Conflicts:
	lib/config/localized_values.dart
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/delivery/information_page.dart
	lib/uitl/translations_delegate_base.dart
5 years ago
hussam al-habibeh 27a070f778 dashboard updates 5 years ago
Elham Rababah 7f15522f67 Improvement on the Ui 5 years ago
Elham Rababah 836e9709d9 fix package content style .... please use it 5 years ago
Elham Rababah 526e8e0f33 fix issue from merge 5 years ago
Elham Rababah ec5af29492 Merge branch 'delivery_confirmed' of https://gitlab.com/Cloud_Solution/driver-app into merge_delivery_into_dev
 Conflicts:
	lib/pages/delivery/information_page.dart
5 years ago
enadhilal 6876e1da77 change class and file name 5 years ago
enadhilal 778fd5374d change class and file name 5 years ago
enadhilal 9d9f411bd0 change base on comment in gitlab 5 years ago
Elham Rababah c9461bfef8 finish update order status function 5 years ago
enadhilal ed27e27244 change base on comment in gitlab 5 years ago
Elham Rababah 621f594ad9 bottom sheet almost done 5 years ago
enadhilal 46abb059b6 complete fixing design still the icons in delivery info page not change 5 years ago
Elham Rababah 6b228e6048 First step from add action sheet 5 years ago
enadhilal 9892976526 improve design implementation in delivery_confirmed branch. 5 years ago
enadhilal df0049cd35 add MediaQuery into the design and make Package Content appear dynamic. 5 years ago
Elham Rababah d4b1476d74 Merge branch 'dashboard_landscape' of https://gitlab.com/Cloud_Solution/driver-app into merge_landscape_into_dev
 Conflicts:
	lib/core/service/orders_service.dart
	lib/core/viewModels/orders_view_model.dart
	lib/pages/dashboard/dashboard_screen.dart
	lib/pages/orders/pending_orders_page.dart
5 years ago
hussam al-habibeh 5d53500e66 add pending orders response model 5 years ago
enadhilal 4d5b10e90b add translate to delivery branch. 5 years ago
enadhilal de394ec807 add changes based on the comment. 5 years ago
enadhilal fac6230205 add route from dashboard and delivery info with item data step 2 5 years ago
enadhilal 89fe5dfbdc add delivery pages and widget 5 years ago