Commit Graph

143 Commits (e98bd62be9e4c70f128565394c5e9dc079514662)

Author SHA1 Message Date
zaid_daoud affb486fbd Calendar API done 2 years ago
Sikander Saleem 29d83101af statuses & date added. 2 years ago
nextwo 204305f705 dark / ligth dark 2 years ago
nextwo 4d07ddc7e8 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 66034a6424 improvements 2 years ago
nextwo 8b0d9a6ca6 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 2c8af84814 dashboard progress view improvements 2 years ago
Sikander Saleem 89bcb20314 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/new_views/pages/land_page/dashboard_fragments/progress_fragment.dart
2 years ago
Sikander Saleem 17e62a1671 dashboard progress view added. 2 years ago
nextwo 1083aa6a8b Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
nextwo 746691c164 dark / ligth dark 2 years ago
zaid_daoud 7fcf49df5c Improvements 2 years ago
Sikander Saleem ff80897a3c dashboard apis added. 2 years ago
Sikander Saleem 8a097a1ed6 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
nextwo 7666364083 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
2 years ago
nextwo 4ec0b27afa loclization 2 years ago
Sikander Saleem 67a7fcfe54 improvements. 2 years ago
zaid_daoud d908fe1c9d Weekly Calendar Design 2 years ago
zaid_daoud 3af18cb884 Working On Calendar 2 years ago
Sikander Saleem c93e249519 improvement. 2 years ago
Sikander Saleem ba1b0ded40 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
#	lib/new_views/common_widgets/app_bottom_nav_bar.dart
#	lib/new_views/pages/land_page/land_page.dart
#	pubspec.yaml
2 years ago
zaid_daoud 9f0de18ea6 Working On Calendar 2 years ago
zaid_daoud 1091af7f23 Working On Calendar 2 years ago
Sikander Saleem 49377d2418 calender cont. 2 years ago
zaid_daoud 456dc4bd77 Testing Dashboard Chart 2 years ago
Sikander Saleem 63cbbe48d1 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem e3fbcae6d3 recent activities added. 2 years ago
Sikander Saleem fe624596a1 request fragment added on dashboard. 2 years ago
zaid_daoud ce143947d1 Survey Screen Needs APIs to be DONE 2 years ago
zaid_daoud 1ccb8cdcb4 Help Center Screen 2 years ago
zaid_daoud 675572be40 Profile Screen DONE 2 years ago
zaid_daoud 8226cd3702 Settings Screen DONE 2 years ago
Sikander Saleem 2c9f2dce08 notifications api added. 2 years ago
Sikander Saleem 258fb2c333 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/views/widgets/pentry/pentry_ppm_check_list_form.dart
2 years ago
zaid_daoud 932841cbef PPM Done 2 years ago
Sikander Saleem fd18e5d39c dashboard cont 2 years ago
zaid_daoud 402f7513bd First Action Bottom Sheet Done 2 years ago
zaid_daoud 6258035a88 add room field to asset transfer 2 years ago
nextwo 985ab01bf0 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 5cf84e6988 Change device class name to asset 2 years ago
nextwo e21bde0153 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_ar.arb
#	lib/l10n/app_en.arb
#	lib/new_views/common_widgets/single_item_drop_down_menu.dart
2 years ago
nextwo 4cc12691ac gas refill 2 years ago
zaid_daoud 957e3d9e6f Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/l10n/app_en.arb
2 years ago
zaid_daoud 3959068858 Asset Transfer Done + Multiple Image Picker + Enhancements 2 years ago
nextwo d6de203ba0 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
Sikander Saleem 487b04514a Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/views/widgets/equipment/single_device_picker.dart
2 years ago
Sikander Saleem 4ffe899ff9 asset list & detail screens, models, added. 2 years ago
nextwo 2604d8b253 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	pubspec.yaml
2 years ago
zaid_daoud 5b1e067a93 Pick asset screen design 2 years ago
zaid_daoud e419b17bd1 Service request design done 2 years ago
Sikander Saleem 2d553b56e0 service request detail ui changed. 2 years ago
nextwo 8f11ef577e gas refill 2 years ago
nextwo 64b249a0cd gas refill 2 years ago
Sikander Saleem 47b863c479 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0
# Conflicts:
#	lib/main.dart
#	lib/new_views/common_widgets/app_floating_action_button.dart
#	lib/new_views/common_widgets/app_text_form_field.dart
#	lib/new_views/pages/new_gas_refill_request_page.dart
#	lib/new_views/pages/new_service_request_page.dart
#	lib/views/pages/device_transfer/device_transfer_details.dart
#	lib/views/pages/device_transfer/update_device_transfer.dart
#	lib/views/pages/user/requests/create_request.dart
#	lib/views/pages/user/requests/request_details.dart
#	lib/views/widgets/device_trancfer/device_transfer_info_section.dart
#	lib/views/widgets/device_trancfer/device_transfer_item.dart
#	lib/views/widgets/device_trancfer/device_transfer_list.dart
#	lib/views/widgets/equipment/auto_complete_devices_field.dart
#	lib/views/widgets/equipment/auto_complete_models_field.dart
#	lib/views/widgets/equipment/device_button.dart
#	lib/views/widgets/equipment/device_item.dart
#	lib/views/widgets/equipment/single_device_picker.dart
#	lib/views/widgets/pentry/auto_complete_fields/auto_complete_devices_field.dart
#	lib/views/widgets/requests/service_request_item.dart
#	lib/views/widgets/search/asset_transfer_search_dialog.dart
2 years ago
Sikander Saleem 7e17bd2558 localization i18 implementation 2 years ago
zaid_daoud c7d6b68fd2 Change Asset & Asset Transfer models 2 years ago
Sikander Saleem c8e3f2df48 Merge remote-tracking branch 'origin/main_design2.0' into main_design2.0 2 years ago
zaid_daoud 4bffab9c9b Request Gas refill screen Done 2 years ago
Sikander Saleem 150ad60de6 track service request 2 years ago
zaid_daoud b77a36ac50 Gas refill screen 2 years ago
zaid_daoud b1e93abf4d Gas refill design without submit button 2 years ago
zaid_daoud ed759f5dcf Still working on gas refill request 2 years ago
zaid_daoud a8e7d26355 Back to the old dashboard 2 years ago
zaid_daoud decd48cdd2 Improvements 2 years ago
Sikander Saleem 3df1bf70ca improvements 2 years ago
zaid_daoud 683ff899c2 Improvements on login_page.dart 2 years ago
zaid_daoud e49399de45 Improvements on login_page.dart 2 years ago
zaid_daoud 1db543710e Working on gas request screen 2 years ago
zaid_daoud 3bdae42769 1- change text form field code
2- app bar design
3- working on request gas refill screen
2 years ago
zaid_daoud 5ded8e4386 Enhancements 2 years ago
zaid_daoud 9c25b6d2e0 Add Submit Button To the new requests screens 2 years ago
zaid_daoud 8e315d54d0 Default App Bar 2 years ago
zaid_daoud 42deeeb104 new service request page 2 years ago
zaid_daoud 1f4fbee83b floating button animation 2 years ago
zaid_daoud 5bfd6924e1 text form field alignment 2 years ago
zaid_daoud 83980f9b0c Add Language Switch to the drawer 2 years ago
zaid_daoud 22e3067d05 Floating button theme 2 years ago
zaid_daoud 95eac4b196 Call Us bottomsheet 2 years ago
zaid_daoud ebb7c114a2 Dashboard Name 2 years ago
zaid_daoud a0373de566 Fix Home App Bar 2 years ago
zaid_daoud 0513fe1bc0 Fix Home App Bar 2 years ago
zaid_daoud 905e430549 Enhancements 2 years ago
zaid_daoud 06152bee2f Fix Bottom Nav Bar Style 2 years ago
zaid_daoud c10cb10fe0 Merged with Majd 2 years ago
nextwo b0992da201 app bar
nav bar
2 years ago
zaid_daoud dd524bcbd1 Merged with Majd 2 years ago
nextwo e20f3b5433 app bar
nav bar
2 years ago
zaid_daoud 05398a9f76 Enhancement 2 years ago
zaid_daoud a8a7b5a613 Activate light and dark theme 2 years ago
zaid_daoud 5a645f13c0 class renaming 2 years ago
zaid_daoud ca673787f1 1 -> New Way of Localizations
2 -> Implementing Login Page
3 -> New way to achieve responsive design
2 years ago
zaid_daoud 3b3de831f0 Preparing new style (theme & colors) 2 years ago
zaid_daoud 6ef281d604 Add New Views Folder 2 years ago