diff --git a/assets/fonts/DoctorApp.ttf b/assets/fonts/DoctorApp.ttf index 718a3afc..86289098 100644 Binary files a/assets/fonts/DoctorApp.ttf and b/assets/fonts/DoctorApp.ttf differ diff --git a/assets/images/dashboard/1.png b/assets/images/dashboard/1.png new file mode 100644 index 00000000..d917360b Binary files /dev/null and b/assets/images/dashboard/1.png differ diff --git a/assets/images/dashboard/2.png b/assets/images/dashboard/2.png new file mode 100644 index 00000000..3789ddd6 Binary files /dev/null and b/assets/images/dashboard/2.png differ diff --git a/assets/images/dashboard/3.png b/assets/images/dashboard/3.png new file mode 100644 index 00000000..38585ec8 Binary files /dev/null and b/assets/images/dashboard/3.png differ diff --git a/assets/images/dashboard/4.png b/assets/images/dashboard/4.png new file mode 100644 index 00000000..46958ede Binary files /dev/null and b/assets/images/dashboard/4.png differ diff --git a/assets/images/dashboard/5.png b/assets/images/dashboard/5.png new file mode 100644 index 00000000..2a64c27a Binary files /dev/null and b/assets/images/dashboard/5.png differ diff --git a/lib/config/localized_values.dart b/lib/config/localized_values.dart index aa25697e..93f4a6b8 100644 --- a/lib/config/localized_values.dart +++ b/lib/config/localized_values.dart @@ -9,7 +9,7 @@ const Map> localizedValues = { 'fileNo': {'en': 'File No:', 'ar': 'رقم الملف:'}, 'mobileNo': {'en': 'Mobile No', 'ar': 'رقم الموبايل'}, 'messagesScreenToolbarTitle': {'en': 'Messages', 'ar': 'الرسائل'}, - 'mySchedule': {'en': 'My Schedule', 'ar': 'جدولي'}, + 'mySchedule': {'en': 'Schedule', 'ar': 'جدولي'}, 'errorNoSchedule': { 'en': 'You don\'t have any Schedule', 'ar': 'ليس لديك أي جدول زمني' diff --git a/lib/icons_app/config.json b/lib/icons_app/config.json index 0e33e54a..f5a6bca1 100644 --- a/lib/icons_app/config.json +++ b/lib/icons_app/config.json @@ -272,6 +272,160 @@ "search_patient" ] }, + { + "uid": "5a324eddf382f5a1167d7d40325f82c8", + "css": "reject_icon", + "code": 59394, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M681 626.7L554.3 500 681 373.3A38.5 38.5 0 0 0 626.7 318.9L500 445.7 373.3 319A38.5 38.5 0 1 0 318.9 373.3L445.7 500 318.9 626.8A37.2 37.2 0 0 0 318.9 681.1 38.2 38.2 0 0 0 373.3 681.1L500 554.4 626.7 681.1A38.5 38.5 0 0 0 681.1 681.1 38.2 38.2 0 0 0 681 626.7ZM500 67.3A432.5 432.5 0 1 1 194 194 429.8 429.8 0 0 1 500 67.3M500 0A500 500 0 1 0 1000 500 500 500 0 0 0 500 0Z", + "width": 1000 + }, + "search": [ + "reject_icon" + ] + }, + { + "uid": "2742f64b5e69cc4f39a2dcc5a081ad03", + "css": "approved_icon", + "code": 59403, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M756.3 348.3L714 304.8A9.1 9.1 0 0 0 707.2 302H707.2A8.7 8.7 0 0 0 700.5 304.8L407.2 600.3 300.5 493.5A9.3 9.3 0 0 0 287.1 493.5L244.2 536.3A9.6 9.6 0 0 0 244.2 550L378.8 684.5A42.6 42.6 0 0 0 406.9 698.2 44.6 44.6 0 0 0 434.8 685H435L756.5 362A10.3 10.3 0 0 0 756.3 348.3ZM500 67.3A432.5 432.5 0 1 1 194 194 429.8 429.8 0 0 1 500 67.3M500 0A499.9 499.9 0 1 0 999.9 500 499.9 499.9 0 0 0 500 0Z", + "width": 1000 + }, + "search": [ + "approved_icon" + ] + }, + { + "uid": "148de09f7fd22c378cdfdbaacaa8e205", + "css": "pending_icon", + "code": 59404, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M809.8 932H797.3C781.5 932 768.2 929.8 766.5 914V913.7C731 583.9 523.3 577.6 523.3 499.9S731.1 415.9 766.5 86V85.9C768.2 70.1 781.5 68 797.3 68H809.8A34.8 34.8 0 0 0 844.7 35.7 34 34 0 0 0 810.7 0H35A34.8 34.8 0 0 0 0 32.3 34 34 0 0 0 34 68H47.2C63 68 76.3 70.2 78.1 85.9V86.2C113.7 416 321.5 422.3 321.5 500S113.7 584 78.3 913.8V914C76.6 929.8 63.3 932 47.5 932H35A34.8 34.8 0 0 0 0.1 964.3 34 34 0 0 0 34.1 1000H810.7A33.9 33.9 0 0 0 844.7 964.3 34.8 34.8 0 0 0 809.8 932ZM197.4 848.9C267 655.2 390.6 678.7 390.6 602.3V467.5C390.6 420.4 301.2 387.6 245.4 311.1A19 19 0 0 1 261.2 281H583.8A18.9 18.9 0 0 1 600 310.6C545.2 387.3 454.2 420.4 454.2 467.4V602.4C454.2 678.1 572.9 657.5 647.8 849 654.7 866.3 649.5 887.8 631.2 887.8H214.1C195.4 887.8 191.1 866.5 197.4 849Z", + "width": 845 + }, + "search": [ + "pending_icon" + ] + }, + { + "uid": "0bbb324cc39e62b3a4e05639a4f4008f", + "css": "home_icon", + "code": 59407, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M973.1 435L973.1 435 565 27A92 92 0 0 0 434.9 27L27.2 434.7 26.8 435.1A92 92 0 0 0 88 591.9C88.9 591.9 89.9 591.9 90.8 591.9H107.1V892.1A107.9 107.9 0 0 0 214.8 999.9H374.4A29.3 29.3 0 0 0 403.7 970.6V735.3A49.2 49.2 0 0 1 452.9 686.2H547A49.2 49.2 0 0 1 596.2 735.3V970.7A29.3 29.3 0 0 0 625.5 1000H785.1A107.9 107.9 0 0 0 892.8 892.3V592H907.8A92.1 92.1 0 0 0 973 434.9ZM931.6 523.7A33.4 33.4 0 0 1 907.9 533.5H863.5A29.3 29.3 0 0 0 834.2 562.8V892.3A49.2 49.2 0 0 1 785.1 941.4H654.9V735.3A107.9 107.9 0 0 0 547 627.5H452.9A107.9 107.9 0 0 0 345.1 735.2V941.3H215A49.2 49.2 0 0 1 165.8 892.1V562.8A29.3 29.3 0 0 0 136.5 533.5H92.8L91.4 533.5A33.4 33.4 0 0 1 68.4 476.4H68.4L476.3 68.4A33.4 33.4 0 0 1 523.6 68.4L931.4 476.2 931.6 476.4A33.4 33.4 0 0 1 931.6 523.7ZM931.6 523.7", + "width": 1000 + }, + "search": [ + "home_icon" + ] + }, + { + "uid": "d8fc8a6e9f001147307d87b3b620b86f", + "css": "mail", + "code": 59422, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M1055.6 667.9V111.1A111.2 111.2 0 0 0 944.4 0H111.1A111.2 111.2 0 0 0 0 111.1V666.7A111.2 111.2 0 0 0 111.1 777.8H777.8A46 46 0 0 0 789.7 810C819.2 841 869.8 889 914.5 931.2 936.9 952.3 957.3 971.7 972.1 986A48.3 48.3 0 0 0 1006 1000 50.2 50.2 0 0 0 1055.5 949.3V889.4C1198.9 894.6 1277.9 940.2 1277.9 972.2A27.8 27.8 0 1 0 1333.4 972.2 306 306 0 0 0 1055.6 667.9ZM111.1 55.7H944.4C945.6 55.7 946.6 56.2 947.7 56.3L551.3 381.8A46.3 46.3 0 0 1 506.8 383.6L107.9 56.2C109 56.1 110 55.6 111.1 55.6ZM111.1 722.3A55.6 55.6 0 0 1 55.6 666.8V111.1A55 55 0 0 1 60.3 89L474 428.4A98.2 98.2 0 0 0 527.8 444.5 100.7 100.7 0 0 0 584.2 426.5L995.3 89A55 55 0 0 1 1000 111.1V556.8A48.1 48.1 0 0 0 972.1 569.7C957.4 584.1 936.9 603.4 914.6 624.5 879.9 657.3 841.9 693.2 812.7 722.3H111.1ZM1027.9 833.3A27.8 27.8 0 0 0 1000.2 861.1V935.7C986.8 922.8 970.4 907.3 952.9 890.8 911.6 851.7 865 807.8 836 777.8 865 747.8 911.6 703.8 952.9 664.7 971.6 647.1 989 630.6 1000.2 618.2V694.4A27.8 27.8 0 0 0 1027.9 722.2 250.3 250.3 0 0 1 1259.3 877.5 525.9 525.9 0 0 0 1027.9 833.3Z", + "width": 1333 + }, + "search": [ + "mail" + ] + }, + { + "uid": "afe3a55435e46aeeeeae8f60731d4706", + "css": "medicinesearch", + "code": 59423, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M986 125.2A171.6 171.6 0 1 0 1157.6 296.8 171.8 171.8 0 0 0 986 125.2ZM986 449.3A152.6 152.6 0 1 1 1138.6 296.8 152.7 152.7 0 0 1 986 449.3ZM862.1 306.4H881.1A114.6 114.6 0 0 1 995.5 192V173A133.5 133.5 0 0 0 862.1 306.4ZM1332.6 589.6L1346.1 576.2 1209.6 439.6 1196.2 453 1172.3 429.1A228.3 228.3 0 1 0 1118.4 483.3L1142.3 507.2 1128.8 520.6 1265.1 657 1278.6 643.5 1155.7 520.6 1209.6 466.7ZM985.9 506.6A209.7 209.7 0 1 1 1195.6 296.9 210 210 0 0 1 985.9 506.6ZM1155.7 493.5L1133.6 471.4A228.6 228.6 0 0 0 1160.6 444.5L1182.7 466.6ZM416.7 700V733.3H100A16.7 16.7 0 0 1 83.3 716.6V566.6A16.7 16.7 0 0 1 100 550H416.7V583.2H116.6V699.9ZM33.3 866.7H416.7V900H33.3A66.7 66.7 0 0 0 99.9 966.5H466.6A67.2 67.2 0 0 0 479.9 965.2L486.6 997.9A100.5 100.5 0 0 1 466.6 999.9H99.9A100.1 100.1 0 0 1-0.1 899.9V583.3H33.2ZM79.2 316.7H83.3V266.7H70.9A37.5 37.5 0 0 1 33.3 229.2V58.3A58.4 58.4 0 0 1 91.7 0H400V33.3H91.7A25 25 0 0 0 66.7 58.3V229.2A4.2 4.2 0 0 0 70.9 233.3H495.9A4.2 4.2 0 0 0 500.1 229.2V58.3A25 25 0 0 0 475.1 33.3H433.4V0H475.1A58.4 58.4 0 0 1 533.4 58.3V229.2A37.5 37.5 0 0 1 495.9 266.7H483.4V316.7H487.6A79.4 79.4 0 0 1 566.8 395.9V400H533.5V395.9A45.9 45.9 0 0 0 487.6 350H79.2A45.9 45.9 0 0 0 33.3 395.9V466.7H450V500H33.3V550H0V395.8A79.4 79.4 0 0 1 79.2 316.7ZM450 316.7V266.7H116.7V316.7ZM466.6 66.7H433.3V200H466.6ZM400 66.7H366.7V200H400ZM333.3 66.7H300V200H333.3ZM266.6 66.7H233.3V200H266.6ZM200 66.7H166.7V200H200ZM133.3 66.7H100V200H133.3ZM416.7 783.3H316.7V816.6H416.7ZM283.3 783.3H83.3V816.6H283.3ZM450 595.8A162.7 162.7 0 0 1 612.5 433.3H620.8A163 163 0 0 1 780 563.3L747.4 570A129.5 129.5 0 0 0 620.8 466.7H612.5A129.3 129.3 0 0 0 483.3 595.8V683.3H583.3V716.6H483.3V749.9H566.7V783.2H483.3V837.3A129.3 129.3 0 0 0 612.5 966.5H620.8A129.1 129.1 0 0 0 661.4 960L671.9 991.6A162.3 162.3 0 0 1 620.8 999.8H612.5A162.7 162.7 0 0 1 450 837.3ZM600 800A200 200 0 1 1 800 1000 200 200 0 0 1 600 800ZM633.3 800A165.6 165.6 0 0 0 652.2 877L877 652.2A166.6 166.6 0 0 0 633.3 800ZM694.5 929L838.2 785.3 861.7 808.9 722.9 947.8A166.6 166.6 0 0 0 947.7 722.9L892.2 778.5 868.6 754.9 928.9 694.6A168.3 168.3 0 0 0 905.4 671L670.9 905.4A168.1 168.1 0 0 0 694.5 929Z", + "width": 1346 + }, + "search": [ + "medicinesearch" + ] + }, + { + "uid": "c129853724095c9f90addf42325e14bc", + "css": "qr-code-1", + "code": 59424, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M970.7 746.1A29.3 29.3 0 0 0 941.4 775.4V941.4H775.4A29.3 29.3 0 1 0 775.4 1000H970.7A29.3 29.3 0 0 0 1000 970.7V775.4A29.3 29.3 0 0 0 970.7 746.1ZM224.6 941.4H58.6V775.4A29.3 29.3 0 1 0 0 775.4V970.7A29.3 29.3 0 0 0 29.3 1000H224.6A29.3 29.3 0 1 0 224.6 941.4ZM970.7 0H775.4A29.3 29.3 0 1 0 775.4 58.6H941.4V224.6A29.3 29.3 0 1 0 1000 224.6V29.3A29.3 29.3 0 0 0 970.7 0ZM29.3 253.9A29.3 29.3 0 0 0 58.6 224.6V58.6H224.6A29.3 29.3 0 1 0 224.6 0H29.3A29.3 29.3 0 0 0 0 29.3V224.6A29.3 29.3 0 0 0 29.3 253.9ZM617.2 412.1H851.6A29.3 29.3 0 0 0 880.8 382.8V148.4A29.3 29.3 0 0 0 851.6 119.2H617.2A29.3 29.3 0 0 0 587.9 148.4V382.8A29.3 29.3 0 0 0 617.2 412.1ZM646.5 177.8H822.2V353.5H646.5ZM382.8 587.9H148.4A29.3 29.3 0 0 0 119.2 617.2V851.6A29.3 29.3 0 0 0 148.4 880.8H382.8A29.3 29.3 0 0 0 412.1 851.6V617.2A29.3 29.3 0 0 0 382.8 587.9ZM353.5 822.3H177.8V646.5H353.5ZM880.9 851.6V734.4A29.3 29.3 0 0 0 822.3 734.4V822.3H734.4A29.3 29.3 0 1 0 734.4 880.9H851.6A29.3 29.3 0 0 0 880.9 851.6ZM617.2 529.3H822.2V617.2A29.3 29.3 0 1 0 880.8 617.2V500A29.3 29.3 0 0 0 851.6 470.7H617.2A29.3 29.3 0 0 0 617.2 529.3ZM617.2 822.3H529.3V734.4A29.3 29.3 0 1 0 470.7 734.4V851.6A29.3 29.3 0 0 0 500 880.8H617.2A29.3 29.3 0 0 0 617.2 822.2ZM382.8 119.2H148.4A29.3 29.3 0 0 0 119.2 148.4V382.8A29.3 29.3 0 0 0 148.4 412.1H382.8A29.3 29.3 0 0 0 412.1 382.8V148.4A29.3 29.3 0 0 0 382.8 119.2ZM353.5 353.5H177.8V177.8H353.5ZM734.4 705.1H617.2A29.3 29.3 0 0 0 617.2 763.7H734.4A29.3 29.3 0 0 0 734.4 705.1ZM500 646.5H734.4A29.3 29.3 0 0 0 734.4 587.9H529.3V500A29.3 29.3 0 0 0 470.7 500V617.2A29.3 29.3 0 0 0 500 646.5ZM148.4 529.3H226.6A29.3 29.3 0 1 0 226.6 470.7H148.4A29.3 29.3 0 1 0 148.4 529.3ZM382.8 470.7H343.8A29.3 29.3 0 1 0 343.8 529.3H382.8A29.3 29.3 0 0 0 382.8 470.7ZM500 412.1A29.3 29.3 0 0 0 529.3 382.8V265.6A29.3 29.3 0 1 0 470.7 265.6V382.8A29.3 29.3 0 0 0 500 412.1Z", + "width": 1000 + }, + "search": [ + "qr-code" + ] + }, + { + "uid": "6df6856cee070f6f2f1be832aff1920e", + "css": "referral-1", + "code": 59425, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M111.9 752A107.4 107.4 0 0 1 55.5 658.2 110.6 110.6 0 0 1 276.6 658.2 107.4 107.4 0 0 1 220.1 752.1 166.2 166.2 0 0 1 332 908.9V983.4A16.7 16.7 0 0 1 315.3 1000.1H16.7A16.7 16.7 0 0 1 0 983.4V908.8A166.2 166.2 0 0 1 111.9 752ZM243.3 658.2A77.3 77.3 0 1 0 166 732.7 76 76 0 0 0 243.3 658.2ZM33.3 966.6H298.8V908.8A132.6 132.6 0 0 0 33.4 908.8ZM111.8 201.7A107.4 107.4 0 0 1 55.5 107.8 110.6 110.6 0 0 1 276.6 107.8 107.4 107.4 0 0 1 220.3 201.7 166.2 166.2 0 0 1 332.1 358.5V433A16.7 16.7 0 0 1 315.4 449.7H16.7A16.7 16.7 0 0 1 0 433V358.4A166.2 166.2 0 0 1 111.8 201.7ZM243.3 107.8A77.3 77.3 0 0 0 88.9 107.8 77.3 77.3 0 0 0 243.3 107.8ZM33.3 416.3H298.8V358.4A132.6 132.6 0 0 0 33.4 358.4ZM462.6 492.6L368.8 411.8A16.7 16.7 0 0 1 390.6 386.5L494.7 476.2H612.1A16.7 16.7 0 1 1 612.1 509.6H494.5L390.3 595A18.6 18.6 0 0 1 366.8 592.7 16.3 16.3 0 0 1 369.2 569.2ZM707.4 452.7A126.1 126.1 0 0 1 676.3 369.9 128.7 128.7 0 0 1 933.8 369.9 126 126 0 0 1 902.7 452.7 184 184 0 0 1 1000 613.3V711.4A16.7 16.7 0 0 1 983.3 728.1H626.8A16.7 16.7 0 0 1 610.1 711.4V613.3A184 184 0 0 1 707.4 452.7ZM805.1 275.8A94.1 94.1 0 1 0 900.5 369.9 94.8 94.8 0 0 0 805.1 275.8ZM823.1 495.9A130.7 130.7 0 0 1 805.1 497.3 128.3 128.3 0 0 1 787.1 495.9V573.8L805.1 596.8 823.1 573.8ZM643.5 694.7H695.9V613A16.7 16.7 0 0 1 729.3 613V694.7H880.8V613A16.7 16.7 0 0 1 914.2 613V694.7H966.7V613.3A150.6 150.6 0 0 0 875.1 476.6 129 129 0 0 1 856.4 486.7V585.4L818.2 634.3A16.7 16.7 0 0 1 791.9 634.3L753.6 585.4V486.7A129.8 129.8 0 0 1 734.9 476.6 150.6 150.6 0 0 0 643.4 613.3V694.7Z", + "width": 1000 + }, + "search": [ + "referral" + ] + }, + { + "uid": "609e74ef20b926b8e212d28a24bf0f36", + "css": "referred", + "code": 59426, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M887.8 751.4A107.7 107.7 0 0 0 944.3 657.2 110.9 110.9 0 0 0 722.6 657.2 107.7 107.7 0 0 0 779.1 751.4 166.6 166.6 0 0 0 666.9 908.6V983.2A16.7 16.7 0 0 0 683.7 999.9H983.3A16.7 16.7 0 0 0 1000 983.2V908.6A166.6 166.6 0 0 0 887.8 751.4ZM756.1 657.2A77.5 77.5 0 1 1 833.5 731.9 76.1 76.1 0 0 1 756.1 657.2ZM966.6 966.5H700.5V908.6A133 133 0 0 1 966.6 908.6ZM887.9 202.2A107.7 107.7 0 0 0 944.4 108.1 110.9 110.9 0 0 0 722.7 108.1 107.7 107.7 0 0 0 779.2 202.2 166.6 166.6 0 0 0 667.1 359.3V434.1A16.7 16.7 0 0 0 683.8 450.8H983.3A16.7 16.7 0 0 0 1000 434.1V359.3A166.6 166.6 0 0 0 887.9 202.2ZM756.2 108.1A77.5 77.5 0 0 1 911 108.1 77.5 77.5 0 0 1 756.2 108.1ZM966.6 417.4H700.5V359.3A133 133 0 0 1 966.6 359.3ZM537.5 492.7L631.5 411.6A16.7 16.7 0 0 0 609.7 386.3L505.4 476.3H387.6A16.7 16.7 0 1 0 387.6 509.7H505.5L610 595.4A18.7 18.7 0 0 0 633.5 593 16.3 16.3 0 0 0 631.1 569.5ZM293.3 452.6A126.3 126.3 0 0 0 324.5 369.6 129.1 129.1 0 0 0 66.4 369.6 126.3 126.3 0 0 0 97.5 452.6 184.4 184.4 0 0 0 0 613.7V712A16.7 16.7 0 0 0 16.7 728.7H374.1A16.7 16.7 0 0 0 390.8 712V613.7A184.4 184.4 0 0 0 293.3 452.6ZM195.5 275.3A94.3 94.3 0 1 1 99.9 369.6 95.1 95.1 0 0 1 195.4 275.3ZM177.5 496A131.1 131.1 0 0 0 195.5 497.4 128.5 128.5 0 0 0 213.6 496V574.2L195.4 597.2 177.4 574.1ZM357.5 695.3H304.8V613.3A16.7 16.7 0 0 0 271.4 613.3V695.3H119.4V613.3A16.7 16.7 0 0 0 86 613.3V695.3H33.4V613.7A151 151 0 0 1 125.2 476.7 129.3 129.3 0 0 0 144 486.7V585.8L182.3 634.8A16.7 16.7 0 0 0 208.6 634.8L246.9 585.7V486.7A130.2 130.2 0 0 0 265.7 476.7 151 151 0 0 1 357.4 613.6V695.2Z", + "width": 1000 + }, + "search": [ + "referred" + ] + }, + { + "uid": "dea3e85838e83dcd8818ec36186eae5e", + "css": "searchpatient", + "code": 59427, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M1142.7 436.8A165.2 165.2 0 1 0 1307.8 601.9 165.4 165.4 0 0 0 1142.7 436.8ZM1142.7 748.8A146.9 146.9 0 1 1 1289.5 601.9 147 147 0 0 1 1142.7 748.8ZM1023.4 611.1H1041.7A110.3 110.3 0 0 1 1151.8 500.9V482.7A128.5 128.5 0 0 0 1023.4 611.1ZM1476.4 883.8L1489.3 870.9 1357.9 739.4 1345 752.4 1322 729.4A219.8 219.8 0 1 0 1270.1 781.5L1293.1 804.5 1280.2 817.4 1411.4 948.7 1424.4 935.7 1306 817.3 1357.9 765.4ZM1142.6 803.9A201.9 201.9 0 1 1 1344.4 602 202.2 202.2 0 0 1 1142.6 803.9ZM1306 791.3L1284.7 770.1A220.1 220.1 0 0 0 1310.7 744.1L1332.1 765.5ZM48.4 483.9H301.4A96.4 96.4 0 0 1 276.7 346.5 305.1 305.1 0 0 1 257.9 242V201.9A201.8 201.8 0 0 1 564.5 29.2 201.8 201.8 0 0 1 871 201.8V205.4L887 177.2 957.1 299.9A80.6 80.6 0 0 1 869.7 417.5 96.9 96.9 0 0 1 785.1 499.2 226.4 226.4 0 0 1 645.1 662.2V696.2L780.4 720.8A267.4 267.4 0 0 1 999.9 983.9V999.9H129V983.9A267.4 267.4 0 0 1 348.6 720.8L483.9 696.2V662.3A224.6 224.6 0 0 1 396.8 602.3C396 602.6 395.1 602.8 394.3 603.1A92.8 92.8 0 0 1 352.9 612.9H48.4A48.4 48.4 0 0 1 0 564.5V532.3A48.4 48.4 0 0 1 48.4 483.9ZM339.5 465.8C339.3 461.1 338.7 456.4 338.7 451.7V341A64.2 64.2 0 0 0 339.5 465.7ZM838.7 242V201.9A169.6 169.6 0 0 0 575.1 60.8L564.5 67.8 554 60.8A169.6 169.6 0 0 0 290.3 201.9V242A273.2 273.2 0 0 0 302.3 322.2 96.2 96.2 0 0 1 338.7 308.1V282.4L403.2 234V193.5A32.3 32.3 0 0 1 435.5 161.3H693.5A32.3 32.3 0 0 1 725.8 193.5V233.9L790.3 282.3V307.8A95.4 95.4 0 0 1 810.8 313.9 78.8 78.8 0 0 1 817 299.9L837.7 263.6C838.3 256.4 838.7 249.2 838.7 242ZM435.5 290.4H693.6V193.5H435.5ZM887.9 387.2A47.6 47.6 0 0 0 929.3 316L887.1 242.2 844.9 315.9A47.6 47.6 0 0 0 887.6 387.1ZM838.8 403.2A79.4 79.4 0 0 1 807.4 348.1 63.2 63.2 0 0 0 790.4 340.9V451.6C790.4 456.4 790 461 789.7 465.7A64.5 64.5 0 0 0 838.7 403.2ZM758.1 451.6V298.4L725.9 274.3V290.4A32.3 32.3 0 0 1 693.6 322.6H435.5A32.3 32.3 0 0 1 403.2 290.4V274.3L370.9 298.4V451.6A195.2 195.2 0 0 0 374.4 486.4 92.8 92.8 0 0 1 394.3 493.6 60.6 60.6 0 0 0 421.2 500H532.2A48.4 48.4 0 1 1 532.2 596.7H436.9A193.2 193.2 0 0 0 758.1 451.6ZM532.3 564.5A16 16 0 1 0 532.3 532.2H516.3V564.5ZM637.4 727.6A80.7 80.7 0 0 1 583.6 771.6 64.5 64.5 0 0 0 645.1 806.4C680.7 806.4 709.6 784.7 709.6 758A36.4 36.4 0 0 0 704.4 739.7ZM161.8 967.8H967.2A235 235 0 0 0 774.7 752.6L740.8 746.5A64.8 64.8 0 0 1 742 758.2C742 802.6 698.6 838.8 645.2 838.8A102.9 102.9 0 0 1 564.6 802.6 102.9 102.9 0 0 1 483.9 838.7C430.4 838.7 387.1 802.5 387.1 758.1A65.9 65.9 0 0 1 388.2 746.4L354.4 752.6A235 235 0 0 0 161.8 967.8ZM424.5 739.9A36.4 36.4 0 0 0 419.4 758.2C419.4 784.9 448.3 806.6 483.9 806.6A64.5 64.5 0 0 0 545.4 771.8 80.6 80.6 0 0 1 491.6 727.7ZM516 677.4V693.4A48.4 48.4 0 1 0 612.8 693.4V672.1A222.6 222.6 0 0 1 516 672.1ZM379.6 574.3A92.9 92.9 0 0 1 421 564.5H483.9V532.3H421.2A93.1 93.1 0 0 1 379.9 522.5 60.6 60.6 0 0 0 352.9 516H129V580.5H352.9A60.6 60.6 0 0 0 379.9 574.3ZM32.1 564.5A16 16 0 0 0 48.1 580.5H96.8V516H48.4A16 16 0 0 0 32.4 532ZM524.9 368.4L507 341.5 410.3 406.1 428.2 432.9ZM718.5 405.8L621.8 341.3 603.9 368.1 700.6 432.7Z", + "width": 1489 + }, + "search": [ + "searchpatient" + ] + }, + { + "uid": "5af6e4cb377acd0ad97c464f6813ab1a", + "css": "sync", + "code": 59428, + "src": "custom_icons", + "selected": true, + "svg": { + "path": "M1000 168.7V346.9A62.5 62.5 0 0 1 937.5 409.4H759.3A62.5 62.5 0 0 1 759.3 284.4H807.1A375.4 375.4 0 0 0 150.8 363.4 62.5 62.5 0 0 1 34.3 317.9 500.4 500.4 0 0 1 875 169.1V169.1A62.5 62.5 0 0 1 1000 169.1ZM930.4 601.1A62.5 62.5 0 0 0 849.4 636.5 375.4 375.4 0 0 1 197.4 721.8H240.7A62.5 62.5 0 1 0 240.7 596.8H62.5A62.5 62.5 0 0 0 0 659.3V837.5A62.5 62.5 0 0 0 125 837.5V830.9A503 503 0 0 0 215.2 910.8 500.4 500.4 0 0 0 966 682.2 62.5 62.5 0 0 0 930.3 601.2Z", + "width": 1000 + }, + "search": [ + "sync" + ] + }, { "uid": "740f78c2b53c8cc100a8b0d283bbd34f", "css": "home_icon-1", @@ -369,62 +523,6 @@ "search": [ "scdedule_icon_active" ] - }, - { - "uid": "5a324eddf382f5a1167d7d40325f82c8", - "css": "reject_icon", - "code": 59402, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M681 626.7L554.3 500 681 373.3A38.5 38.5 0 0 0 626.7 318.9L500 445.7 373.3 319A38.5 38.5 0 1 0 318.9 373.3L445.7 500 318.9 626.8A37.2 37.2 0 0 0 318.9 681.1 38.2 38.2 0 0 0 373.3 681.1L500 554.4 626.7 681.1A38.5 38.5 0 0 0 681.1 681.1 38.2 38.2 0 0 0 681 626.7ZM500 67.3A432.5 432.5 0 1 1 194 194 429.8 429.8 0 0 1 500 67.3M500 0A500 500 0 1 0 1000 500 500 500 0 0 0 500 0Z", - "width": 1000 - }, - "search": [ - "reject_icon" - ] - }, - { - "uid": "2742f64b5e69cc4f39a2dcc5a081ad03", - "css": "approved_icon", - "code": 59403, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M756.3 348.3L714 304.8A9.1 9.1 0 0 0 707.2 302H707.2A8.7 8.7 0 0 0 700.5 304.8L407.2 600.3 300.5 493.5A9.3 9.3 0 0 0 287.1 493.5L244.2 536.3A9.6 9.6 0 0 0 244.2 550L378.8 684.5A42.6 42.6 0 0 0 406.9 698.2 44.6 44.6 0 0 0 434.8 685H435L756.5 362A10.3 10.3 0 0 0 756.3 348.3ZM500 67.3A432.5 432.5 0 1 1 194 194 429.8 429.8 0 0 1 500 67.3M500 0A499.9 499.9 0 1 0 999.9 500 499.9 499.9 0 0 0 500 0Z", - "width": 1000 - }, - "search": [ - "approved_icon" - ] - }, - { - "uid": "148de09f7fd22c378cdfdbaacaa8e205", - "css": "pending_icon", - "code": 59404, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M809.8 932H797.3C781.5 932 768.2 929.8 766.5 914V913.7C731 583.9 523.3 577.6 523.3 499.9S731.1 415.9 766.5 86V85.9C768.2 70.1 781.5 68 797.3 68H809.8A34.8 34.8 0 0 0 844.7 35.7 34 34 0 0 0 810.7 0H35A34.8 34.8 0 0 0 0 32.3 34 34 0 0 0 34 68H47.2C63 68 76.3 70.2 78.1 85.9V86.2C113.7 416 321.5 422.3 321.5 500S113.7 584 78.3 913.8V914C76.6 929.8 63.3 932 47.5 932H35A34.8 34.8 0 0 0 0.1 964.3 34 34 0 0 0 34.1 1000H810.7A33.9 33.9 0 0 0 844.7 964.3 34.8 34.8 0 0 0 809.8 932ZM197.4 848.9C267 655.2 390.6 678.7 390.6 602.3V467.5C390.6 420.4 301.2 387.6 245.4 311.1A19 19 0 0 1 261.2 281H583.8A18.9 18.9 0 0 1 600 310.6C545.2 387.3 454.2 420.4 454.2 467.4V602.4C454.2 678.1 572.9 657.5 647.8 849 654.7 866.3 649.5 887.8 631.2 887.8H214.1C195.4 887.8 191.1 866.5 197.4 849Z", - "width": 845 - }, - "search": [ - "pending_icon" - ] - }, - { - "uid": "0bbb324cc39e62b3a4e05639a4f4008f", - "css": "home_icon", - "code": 59394, - "src": "custom_icons", - "selected": true, - "svg": { - "path": "M973.1 435L973.1 435 565 27A92 92 0 0 0 434.9 27L27.2 434.7 26.8 435.1A92 92 0 0 0 88 591.9C88.9 591.9 89.9 591.9 90.8 591.9H107.1V892.1A107.9 107.9 0 0 0 214.8 999.9H374.4A29.3 29.3 0 0 0 403.7 970.6V735.3A49.2 49.2 0 0 1 452.9 686.2H547A49.2 49.2 0 0 1 596.2 735.3V970.7A29.3 29.3 0 0 0 625.5 1000H785.1A107.9 107.9 0 0 0 892.8 892.3V592H907.8A92.1 92.1 0 0 0 973 434.9ZM931.6 523.7A33.4 33.4 0 0 1 907.9 533.5H863.5A29.3 29.3 0 0 0 834.2 562.8V892.3A49.2 49.2 0 0 1 785.1 941.4H654.9V735.3A107.9 107.9 0 0 0 547 627.5H452.9A107.9 107.9 0 0 0 345.1 735.2V941.3H215A49.2 49.2 0 0 1 165.8 892.1V562.8A29.3 29.3 0 0 0 136.5 533.5H92.8L91.4 533.5A33.4 33.4 0 0 1 68.4 476.4H68.4L476.3 68.4A33.4 33.4 0 0 1 523.6 68.4L931.4 476.2 931.6 476.4A33.4 33.4 0 0 1 931.6 523.7ZM931.6 523.7", - "width": 1000 - }, - "search": [ - "home_icon" - ] } ] } \ No newline at end of file diff --git a/lib/icons_app/doctor_app_icons.dart b/lib/icons_app/doctor_app_icons.dart index 272f3539..9180c929 100644 --- a/lib/icons_app/doctor_app_icons.dart +++ b/lib/icons_app/doctor_app_icons.dart @@ -11,7 +11,7 @@ /// fonts: /// - asset: fonts/DoctorApp.ttf /// -/// +/// /// import 'package:flutter/widgets.dart'; @@ -21,50 +21,31 @@ class DoctorApp { static const _kFontFam = 'DoctorApp'; static const _kFontPkg = null; - static const IconData femaleicon = - IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData male = - IconData(0xe801, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home_icon = - IconData(0xe802, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData home_icon_active = - IconData(0xe803, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData menu_icon = - IconData(0xe804, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData menu_icon_active = - IconData(0xe805, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData message_icon = - IconData(0xe806, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData message_icon_active = - IconData(0xe807, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData scdedule_icon_active = - IconData(0xe808, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData schedule_icon = - IconData(0xe809, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData discharge_patient = - IconData(0xe80a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData in_patient_white = - IconData(0xe80d, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData lab_results = - IconData(0xe80e, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData operations = - IconData(0xe813, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData out_patient = - IconData(0xe814, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData patient = - IconData(0xe815, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData qr_code = - IconData(0xe816, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData radiology = - IconData(0xe817, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData referral = - IconData(0xe818, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData search_patient = - IconData(0xe81a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData reject_icon = - IconData(0xe80a, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData approved_icon = - IconData(0xe80b, fontFamily: _kFontFam, fontPackage: _kFontPkg); - static const IconData pending_icon = - IconData(0xe80c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData femaleicon = IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData male = IconData(0xe801, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData reject_icon = IconData(0xe802, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home_icon_active = IconData(0xe803, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData menu_icon = IconData(0xe804, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData menu_icon_active = IconData(0xe805, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData message_icon = IconData(0xe806, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData message_icon_active = IconData(0xe807, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData scdedule_icon_active = IconData(0xe808, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData schedule_icon = IconData(0xe809, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData discharge_patient = IconData(0xe80a, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData approved_icon = IconData(0xe80b, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData pending_icon = IconData(0xe80c, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData in_patient_white = IconData(0xe80d, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData lab_results = IconData(0xe80e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData home_icon = IconData(0xe80f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData operations = IconData(0xe813, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData out_patient = IconData(0xe814, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData patient = IconData(0xe815, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData radiology = IconData(0xe817, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData mail = IconData(0xe81e, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData medicinesearch = IconData(0xe81f, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData qr_code = IconData(0xe820, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData referral = IconData(0xe821, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData referred = IconData(0xe822, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData search_patient = IconData(0xe823, fontFamily: _kFontFam, fontPackage: _kFontPkg); + static const IconData sync_icon = IconData(0xe824, fontFamily: _kFontFam, fontPackage: _kFontPkg); } diff --git a/lib/screens/dashboard_screen.dart b/lib/screens/dashboard_screen.dart index 8743e6cb..4e2dbfc6 100644 --- a/lib/screens/dashboard_screen.dart +++ b/lib/screens/dashboard_screen.dart @@ -1,12 +1,9 @@ -import 'dart:convert'; - import 'package:doctor_app_flutter/config/shared_pref_kay.dart'; import 'package:doctor_app_flutter/config/size_config.dart'; import 'package:doctor_app_flutter/icons_app/doctor_app_icons.dart'; import 'package:doctor_app_flutter/models/doctor/clinic_model.dart'; import 'package:doctor_app_flutter/models/doctor/doctor_profile_model.dart'; import 'package:doctor_app_flutter/models/doctor/profile_req_Model.dart'; -import 'package:doctor_app_flutter/models/livecare/session_status_model.dart'; import 'package:doctor_app_flutter/providers/auth_provider.dart'; import 'package:doctor_app_flutter/providers/doctor_reply_provider.dart'; import 'package:doctor_app_flutter/providers/hospital_provider.dart'; @@ -14,27 +11,22 @@ import 'package:doctor_app_flutter/providers/medicine_provider.dart'; import 'package:doctor_app_flutter/providers/project_provider.dart'; import 'package:doctor_app_flutter/providers/referral_patient_provider.dart'; import 'package:doctor_app_flutter/providers/referred_patient_provider.dart'; -import 'package:doctor_app_flutter/screens/medicine/medicine_search_screen.dart'; -import 'package:doctor_app_flutter/util/VideoChannel.dart'; import 'package:doctor_app_flutter/util/dr_app_shared_pref.dart'; import 'package:doctor_app_flutter/util/helpers.dart'; import 'package:doctor_app_flutter/util/translations_delegate_base.dart'; import 'package:doctor_app_flutter/widgets/shared/app_scaffold_widget.dart'; -import 'package:doctor_app_flutter/widgets/shared/user-guid/app_showcase.dart'; -import 'package:doctor_app_flutter/widgets/shared/user-guid/app_showcase_widget.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:hexcolor/hexcolor.dart'; import 'package:percent_indicator/circular_percent_indicator.dart'; import 'package:provider/provider.dart'; import '../routes.dart'; -import '../widgets/dashboard/dashboard_item_icons_texts.dart'; -import '../widgets/dashboard/dashboard_item_texts_widget.dart'; import '../widgets/shared/app_texts_widget.dart'; -import '../widgets/shared/rounded_container_widget.dart'; import 'doctor/doctor_reply_screen.dart'; import 'doctor/my_referral_patient_screen.dart'; import 'doctor/my_referred_patient_screen.dart'; +import 'medicine/medicine_search_screen.dart'; DrAppSharedPreferances sharedPref = new DrAppSharedPreferances(); Helpers helpers = Helpers(); @@ -86,444 +78,759 @@ class _DashboardScreenState extends State { child: AppScaffold( isShowAppBar: false, isLoading: isLoading, - body: SingleChildScrollView( - child: SizedBox( - height: MediaQuery.of(context).size.height * 1.3, - child: Column( - children: [ - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Expanded( - flex: 1, - child: Container( - margin: EdgeInsets.only(left: 10, top: 10), - child: AppText( - authProvider.selectedClinicName != null - ? authProvider.selectedClinicName - : authProvider.doctorProfile.clinicDescription, - fontWeight: FontWeight.bold, - fontSize: SizeConfig.textMultiplier * 2.5, - ), - alignment: projectsProvider.isArabic - ? Alignment.topRight - : Alignment.topLeft, - ), - ), - Row( - mainAxisAlignment: MainAxisAlignment.start, - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.end, - children: [ - InkWell( - onTap: () async { - showCupertinoPicker( - decKey: '',context: context, - actionList: projectsProvider.doctorClinicsList); - }, - child: Container( - margin: - EdgeInsets.only(left: 5, top: 10, right: 5), - child: Icon( - Icons.settings, - size: SizeConfig.textMultiplier * 2.5, - )), - ), - ], - ), - InkWell( - onTap: () { - ShowCaseWidget.of(context).startShowCase([_one]); - }, - child: Container( - margin: EdgeInsets.only(left: 5, top: 10, right: 5), - child: Icon( - Icons.info, - size: SizeConfig.textMultiplier * 2.5, - )), - ) - ]), - Container( - margin: EdgeInsets.only(left: 10, top: 5), - child: AppText( - TranslationBase.of(context).todayStatistics, - fontWeight: FontWeight.bold, - ), - alignment: projectsProvider.isArabic - ? Alignment.topRight - : Alignment.topLeft, - ), - Expanded( - flex: 3, - child: Row( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Expanded( - flex: 2, - child: AppShowcase( - key: _one, - description: "Test User Guid", - onSkipClick: () { - ShowCaseWidget.of(context).dismiss(); - }, - child: RoundedContainer( - child: CircularPercentIndicator( - radius: 100, - animation: true, - animationDuration: 1200, - lineWidth: 7.0, - percent: .75, - center: Column( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - AppText("38", + body: ListView(children: [ + Column( + children: [ + Stack(children: [ + Column( + children: [ + Container( + height: 150, + color: Hexcolor('#515B5D'), + width: double.infinity, + child: FractionallySizedBox( + widthFactor: 0.9, + child: Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Column( + crossAxisAlignment: CrossAxisAlignment.start, + mainAxisAlignment: MainAxisAlignment.start, + children: [ + Row( + children: [ + AppText( + "Welcome", + fontSize: SizeConfig.textMultiplier * 2, + color: Colors.white, + ) + ], + ), + Row( + mainAxisAlignment: MainAxisAlignment.start, + children: [ + AppText( + 'Dr. ${authProvider.doctorProfile + .doctorName}', fontWeight: FontWeight.bold, - fontSize: SizeConfig.textMultiplier * 4), - AppText( - TranslationBase.of(context).outPatients, - fontWeight: FontWeight.normal, - fontSize: SizeConfig.textMultiplier * 1.1, - color: Colors.grey[800]), + fontSize: SizeConfig.textMultiplier * 2.5, + color: Colors.white, + ) + ], + ), + Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Container( + child: AppText( + authProvider.selectedClinicName != + null + ? authProvider.selectedClinicName + : authProvider.doctorProfile + .clinicDescription, + fontSize: + SizeConfig.textMultiplier * 2, + color: Colors.white, + ), + alignment: projectsProvider.isArabic + ? Alignment.topRight + : Alignment.topLeft, + ), + Row( + mainAxisAlignment: + MainAxisAlignment.start, + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + InkWell( + onTap: () async { + showCupertinoPicker( + decKey: '', + context: context, + actionList: projectsProvider + .doctorClinicsList); + }, + child: Container( + margin: EdgeInsets.only( + left: 5, top: 5, right: 10), + child: Icon( + DoctorApp.sync_icon, + + color: Colors.white, + size: SizeConfig + .textMultiplier * + 1.8, + )), + ), + ], + ), + ]) + ], + ), + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.end, + + children: [ + Container( + decoration: BoxDecoration( + color: Theme + .of(context) + .backgroundColor, + borderRadius: BorderRadius.all( + Radius.circular(10.0), + ), + ), + height: 50, + width: 60, + child: Image.network( + authProvider.doctorProfile + .doctorImageURL, +// fit: BoxFit.fill, + ), + ), ], ), - circularStrokeCap: CircularStrokeCap.butt, - backgroundColor: Colors.blueGrey[100], - progressColor: Colors.red, ), - ), + ], ), ), - Expanded( - flex: 2, - child: Padding( - padding: EdgeInsets.all(8), - child: Row( - crossAxisAlignment: CrossAxisAlignment.start, + ), + Container( + color: Colors.white, + height: 150, + ), + ], + ), + Positioned( + right: 0.0, + left: 0, + bottom: 40, + child: Container( + decoration: BoxDecoration( + color: Hexcolor("#DED8CF"), + borderRadius: BorderRadius.all( + Radius.circular(10.0), + ), + ), + margin: EdgeInsets.only(left: 10, right: 10), + height: 140, + width: double.infinity, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Divider(), + Padding( + padding: const EdgeInsets.only( + top: 8.0, bottom: 8, right: 40, left: 8), + child: CircularPercentIndicator( + radius: 100, + animation: true, + animationDuration: 1200, + lineWidth: 7.0, + percent: .75, + center: Column( + mainAxisAlignment: MainAxisAlignment.center, children: [ - Expanded( - flex: 1, - child: Column( - crossAxisAlignment: - CrossAxisAlignment.stretch, - children: [ - Expanded( - child: DashboardItemTexts( + AppText("38", + fontSize: + SizeConfig.textMultiplier * 3.7, + color: Hexcolor('#5D4C35'), + fontWeight: FontWeight.bold,), + AppText(TranslationBase + .of(context) + .outPatients, + fontWeight: FontWeight.normal, + fontSize: SizeConfig.textMultiplier * 1.4, + color: Hexcolor('#5D4C35'), + ), + ], + ), + circularStrokeCap: CircularStrokeCap.butt, + backgroundColor: Colors.blueGrey[100], + progressColor: Hexcolor('#B8382C'), + ), + ), + Container( + child: Table( + defaultColumnWidth: FixedColumnWidth( + MediaQuery.of(context).size.width / 5), +// border: TableBorder.all( +// color: Colors.black26, +// width: 1, +// style: BorderStyle.solid), + border: TableBorder.symmetric( + inside: BorderSide( + width: 0.5, + color: Hexcolor('#5D4C35'), + ), + ), + children: [ + TableRow( + children: [ + TableCell( + child: Center( + child: Column( + children: [ + AppText( TranslationBase.of(context).arrived, - "23", + fontSize: + SizeConfig.textMultiplier * 1.5, + color: Hexcolor('#5D4C35'), ), - ), - Expanded( - child: DashboardItemTexts( - TranslationBase.of(context) - .notArrived, + AppText( "23", + fontSize: + SizeConfig.textMultiplier * 2.7, + color: Hexcolor('#5D4C35'), + fontWeight: FontWeight.bold, + ), + SizedBox( + height: 6, + ), + ], + ), + )), + TableCell( + child: Column( + children: [ + AppText( + TranslationBase.of(context).er, + fontSize: + SizeConfig.textMultiplier * 1.5, + color: Hexcolor('#5D4C35'), ), + AppText( + "03", + fontSize: + SizeConfig.textMultiplier * 2.7, + color: Hexcolor('#5D4C35'), + fontWeight: FontWeight.bold, + ), + SizedBox( + height: 6, + ), + ], + ), + ), + ], +// + ), + TableRow(children: [ + TableCell( + child: Column( + children: [ + SizedBox( + height: 6, + ), + AppText( + TranslationBase.of(context).notArrived, + fontSize: + SizeConfig.textMultiplier * 1.5, + color: Hexcolor('#5D4C35'), + ), + AppText( + "15", + fontSize: + SizeConfig.textMultiplier * 2.7, + color: Hexcolor('#5D4C35'), + fontWeight: FontWeight.bold, ), ], ), ), - Expanded( - child: Column( - crossAxisAlignment: - CrossAxisAlignment.stretch, - children: [ - Expanded( - child: DashboardItemTexts( - TranslationBase.of(context).er, - "23", - )), - Expanded( - child: DashboardItemTexts( - TranslationBase.of(context).walkIn, - "23", - )), - ], - )), - ], - ), - )) - ], - ), - ), - Expanded( - flex: 2, - child: Row( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Expanded( - flex: 2, - child: new DashboardItemIconText( - DoctorApp.lab_results, - "08", - TranslationBase.of(context).labResult, - backgroundColor: Colors.black45, + TableCell( + child: Column( + children: [ + SizedBox( + height: 6, + ), + AppText( + TranslationBase.of(context).walkIn, + fontSize: + SizeConfig.textMultiplier * 1.5, + color: Hexcolor('#5D4C35'), + ), + AppText( + "04", + fontSize: + SizeConfig.textMultiplier * 2.7, + color: Hexcolor('#5D4C35'), + fontWeight: FontWeight.bold, + ), + ], + ), + ), + ]), + ], + ), ), - ), - Expanded( - flex: 2, - child: new DashboardItemIconText( - DoctorApp.radiology, - "10", - TranslationBase.of(context).radiology, - backgroundColor: Colors.black45, - )), - Expanded( - flex: 2, - child: new DashboardItemIconText( - DoctorApp.referral, - "05", - TranslationBase.of(context).referral, - backgroundColor: Colors.black45, - )), - ], - ), - ), - Expanded( - flex: 2, - child: Row( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Expanded( - flex: 2, - child: InkWell( - onTap: () {}, - child: new DashboardItemIconText( - DoctorApp.in_patient_white, - "23", - TranslationBase.of(context).outPatients, - showBorder: true, - backgroundColor: Colors.red[900], - iconColor: Colors.white), - )), - Expanded( - flex: 2, - child: new DashboardItemIconText( - //widget.iconURL + 'operations.svg', - DoctorApp.operations, - "23", - TranslationBase.of(context).inPatient, - showBorder: true, - backgroundColor: Colors.red[900], - )), - ], - ), - ), - Expanded( - flex: 1, - child: Container( - margin: EdgeInsets.all(10), - child: AppText( - TranslationBase.of(context).patientServices, - fontWeight: FontWeight.bold, + Divider(), + ], ), - alignment: projectsProvider.isArabic - ? Alignment.topRight - : Alignment.topLeft, ), - ), - Expanded( - flex: 2, - child: Row( + ) + ]), + FractionallySizedBox( + widthFactor: 0.95, + child: Container( + color: Colors.white, + child: Column( children: [ - Expanded( - flex: 2, - child: InkWell( - child: DashboardItemIconText( - DoctorApp.search_patient, - "", - TranslationBase.of(context).searchPatient, - showBorder: true, - backgroundColor: Colors.white, - valueFontColor: Colors.black, - titleFontColor: Colors.black, - iconColor: Colors.black, - titleFontSize: SizeConfig.textMultiplier * 2, + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + DashboardItem( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Container( + margin: EdgeInsets.only(top: 10), + child: Icon( + DoctorApp.lab_results, + size: 40, + color: Colors.white, + ), + ), + Container( + margin: EdgeInsets.only(bottom: 10), + child: Column( + children: [ + AppText( + "08", + fontSize: SizeConfig.textMultiplier * 6, + color: Colors.white, + ), + AppText( + TranslationBase + .of(context) + .labResult, + color: Colors.white, + ) + ], + ), + ), + + ], + ), + imageName: '1.png', + opacity: 0.82, ), - onTap: () { - Navigator.of(context).pushNamed(PATIENT_SEARCH); - }, - ), - ), - Expanded( - flex: 2, - child: InkWell( - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => ChangeNotifierProvider( - create: (_) => DoctorReplyProvider(), - child: DoctorReplyScreen(), + DashboardItem( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Container( + child: Icon( + DoctorApp.radiology, + size: 40, + color: Colors.white, + ), ), - ), - ); - }, - child: DashboardItemIconText( - DoctorApp.message_icon, - "", - TranslationBase.of(context).doctorReply, - showBorder: true, - backgroundColor: Colors.white, - valueFontColor: Colors.black, - titleFontColor: Colors.black, - iconColor: Colors.black, - titleFontSize: SizeConfig.textMultiplier * 2, + Container( + child: Column( + children: [ + AppText( + "10", + fontSize: SizeConfig.textMultiplier * 6, + color: Colors.white, + ), + AppText( + TranslationBase + .of(context) + .radiology, + color: Colors.white, + ) + ], + ), + ), + + ], + ), + imageName: '2.png', + opacity: 0.9, ), - ), + DashboardItem( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Container( + margin: EdgeInsets.only(top: 10), + child: Icon( + DoctorApp.referral, + size: 40, + color: Colors.white, + ), + ), + + Container( + margin: EdgeInsets.only(bottom: 10), + + child: Column( + children: [ + AppText( + "05", + fontSize: SizeConfig.textMultiplier * 6, + color: Colors.white, + ), + AppText( + TranslationBase + .of(context) + .referral, + color: Colors.white, + ) + ], + ), + ), + + ], + ), + imageName: '3.png', + opacity: 0.9, + + ), + ], ), - ], - ), - ), - Expanded( - flex: 2, - child: Row( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Expanded( - flex: 1, - child: InkWell( - child: DashboardItemIconText( - DoctorApp.search_patient, - "", - TranslationBase.of(context).searchMedicine, - showBorder: true, - backgroundColor: Colors.white, - valueFontColor: Colors.black, - titleFontColor: Colors.black, - iconColor: Colors.black, - titleFontSize: SizeConfig.textMultiplier * 2, + SizedBox( + height: 15, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + DashboardItem( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Column( + children: [ + Icon( + DoctorApp.in_patient_white, + size: 40, + color: Colors.white, + ), + ], + ), + Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + AppText( + "14", + fontSize: SizeConfig.textMultiplier * 6, + color: Colors.white, + ), + AppText( + TranslationBase + .of(context) + .inPatient, + color: Colors.white, + ) + ], + ) + ], + ), + ), + imageName: '4.png', + color: Hexcolor('#B8382C'), + hasBorder: false, + width: MediaQuery + .of(context) + .size + .width * 0.45, + height: MediaQuery + .of(context) + .orientation == Orientation.portrait + ? MediaQuery + .of(context) + .size + .height * 0.13: + MediaQuery + .of(context) + .size + .height * 0.25, ), - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => ChangeNotifierProvider( - create: (_) => MedicineProvider(), - child: MedicineSearchScreen(), - ), + DashboardItem( + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Column( + children: [ + Icon( + DoctorApp.operations, + size: 40, + color: Colors.white, + ), + ], + ), + Column( + mainAxisAlignment: MainAxisAlignment.end, + children: [ + AppText( + "07", + fontSize: SizeConfig.textMultiplier * 6, + color: Colors.white, + ), + AppText( + TranslationBase + .of(context) + .operations, + color: Colors.white, + ) + ], + ) + ], ), - ); - }, - ), + ), + imageName: '5.png', + color: Hexcolor('#B8382C'), + hasBorder: false, + width: MediaQuery + .of(context) + .size + .width * 0.45, + height: MediaQuery + .of(context) + .orientation == Orientation.portrait + ? MediaQuery + .of(context) + .size + .height * 0.13: + MediaQuery + .of(context) + .size + .height * 0.25, + ), + ], ), - Expanded( - flex: 1, - child: InkWell( - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => ChangeNotifierProvider( - create: (_) => MyReferralPatientProvider(), - child: MyReferralPatient(), - ), - ), - ); - }, - child: DashboardItemIconText( - DoctorApp.referral, - "", - TranslationBase.of(context).myReferralPatient, - showBorder: true, - backgroundColor: Colors.white, - valueFontColor: Colors.black, - titleFontColor: Colors.black, - iconColor: Colors.black, - titleFontSize: SizeConfig.textMultiplier * 2, + SizedBox( + height: 15, + ), + Row( + children: [ + AppText( + TranslationBase + .of(context) + .patientServices, + fontSize: SizeConfig.textMultiplier * 3, ), - ), + ], ), - ], - ), - ), - Expanded( - flex: 2, - child: Row( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Expanded( - flex: 1, - child: InkWell( + SizedBox( + height: 10, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + DashboardItem( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Center( + child: Icon( + DoctorApp.search_patient, + size: 50, + color: Colors.black, + ), + ), + AppText( + TranslationBase + .of(context) + .searchPatient, + color: Colors.black, + ) + ], + ), + hasBorder: true, + onTap: () { + Navigator.of(context).pushNamed(PATIENT_SEARCH); + }, + ), + DashboardItem( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Icon( + DoctorApp.mail, + size: 50, + color: Colors.black, + ), + AppText( + TranslationBase + .of(context) + .doctorReply, + color: Colors.black, + ) + ], + ), + hasBorder: true, onTap: () { Navigator.push( context, MaterialPageRoute( - builder: (context) => ChangeNotifierProvider( - create: (_) => MyReferredPatientProvider(), - child: MyReferredPatient(), - ), + builder: (context) => + ChangeNotifierProvider( + create: (_) => DoctorReplyProvider(), + child: DoctorReplyScreen(), + ), ), ); }, - child: DashboardItemIconText( - DoctorApp.referral, - "", - TranslationBase.of(context).myReferredPatient, - showBorder: true, - backgroundColor: Colors.white, - valueFontColor: Colors.black, - titleFontColor: Colors.black, - iconColor: Colors.black, - titleFontSize: SizeConfig.textMultiplier * 2, + ), + DashboardItem( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Icon( + DoctorApp.medicinesearch, + size: 50, + color: Colors.black, + ), + AppText( + TranslationBase + .of(context) + .searchMedicine, + color: Colors.black, + textAlign: TextAlign.center, + ) + ], ), + hasBorder: true, + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => + ChangeNotifierProvider( + create: (_) => MedicineProvider(), + child: MedicineSearchScreen(), + ), + ), + ); + }, ), - ), - Expanded( - flex: 1, - child: InkWell( + ], + ), + SizedBox( + height: 10, + ), + Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + DashboardItem( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Icon( + DoctorApp.qr_code, + size: 50, + color: Colors.black, + ), + AppText( + TranslationBase + .of(context) + .qrReader, + color: Colors.black, + textAlign: TextAlign.center, + ) + ], + ), +// imageName: '1.png', + hasBorder: true, onTap: () { Navigator.of(context).pushNamed(QR_READER); }, - child: DashboardItemIconText( - DoctorApp.qr_code, - "", - TranslationBase.of(context).qrReader, - showBorder: true, - backgroundColor: Colors.white, - valueFontColor: Colors.black, - titleFontColor: Colors.black, - iconColor: Colors.black, - titleFontSize: SizeConfig.textMultiplier * 2, - ), ), - ), - ], - )), - Expanded( - flex: 2, - child: Row( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Expanded( - flex: 1, - child: InkWell( + DashboardItem( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Icon( + DoctorApp.referral, + size: 50, + color: Colors.black, + ), + AppText( + TranslationBase + .of(context) + .myReferralPatient, + textAlign: TextAlign.center, + color: Colors.black, + ) + ], + ), + hasBorder: true, onTap: () { - // Navigator.of(context).pushNamed(VIDEO_CALL); - Navigator.of(context) - .pushNamed(LIVECARE_PENDING_LIST); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => + ChangeNotifierProvider( + create: (_) => + MyReferralPatientProvider(), + child: MyReferralPatient(), + ), + ), + ); }, - child: DashboardItemIconText( - DoctorApp.referral, - "", - TranslationBase.of(context).livecare, - showBorder: true, - backgroundColor: Colors.white, - valueFontColor: Colors.black, - titleFontColor: Colors.black, - iconColor: Colors.black, - titleFontSize: SizeConfig.textMultiplier * 2, + ), + DashboardItem( + child: Column( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Icon( + DoctorApp.referred, + size: 50, + color: Colors.black, + ), + AppText( + TranslationBase + .of(context) + .myReferredPatient, + color: Colors.black, + textAlign: TextAlign.center, + ) + ], ), + hasBorder: true, + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => + ChangeNotifierProvider( + create: (_) => + MyReferredPatientProvider(), + child: MyReferredPatient(), + ), + ), + ); + }, ), - ), - Expanded(flex: 1, child: Container()) - ], - )) - ], - ), + ], + ), + SizedBox( + height: 20, + ), + ], + ), + ), + ), + ], ), - ), + ]), ), ); } @@ -548,17 +855,21 @@ class _DashboardScreenState extends State { mainAxisAlignment: MainAxisAlignment.end, children: [ CupertinoButton( - child: Text(TranslationBase.of(context).cancel - // style: TextStyle(context) - ), + child: AppText(TranslationBase + .of(context) + .cancel + // style: TextStyle(context) + ), onPressed: () { Navigator.pop(context); }, ), CupertinoButton( - child: Text(TranslationBase.of(context).done - // style: textStyle(context), - ), + child: AppText(TranslationBase + .of(context) + .done + // style: textStyle(context), + ), onPressed: () { Navigator.pop(context); // onSelectFun(cupertinoPickerIndex); @@ -577,12 +888,13 @@ class _DashboardScreenState extends State { child: InkWell( onTap: () => changeClinic(e.clinicID, context), - child: Text( + child: AppText( e.clinicName, - style: TextStyle( - fontSize: - SizeConfig.textMultiplier * - 1.9), + fontSize: + SizeConfig.textMultiplier * + 1.9, + + )), ), )) @@ -623,3 +935,66 @@ class _DashboardScreenState extends State { }); } } +// TODO Move to it file +class DashboardItem extends StatelessWidget { + const DashboardItem({ + this.hasBorder = false, + this.imageName, + @required this.child, + this.onTap, + Key key, + this.width, + this.height, + this.color, + this.opacity = 0.4 + }) : super(key: key); + final bool hasBorder; + final String imageName; + final Widget child; + final Function onTap; + final double width; + final double height; + final Color color; + final double opacity; + + @override + Widget build(BuildContext context) { + return InkWell( + onTap: onTap, + child: Container( + width: width != null ? width : MediaQuery + .of(context) + .size + .width * 0.29, + height: height != null ? height : MediaQuery + .of(context) + .orientation == Orientation.portrait ? MediaQuery + .of(context) + .size + .height * 0.19 : MediaQuery + .of(context) + .size + .height * 0.35, + + decoration: BoxDecoration( + color: !hasBorder ? color != null ? color : Hexcolor('#050705') + .withOpacity(opacity) : Colors + .white, + borderRadius: BorderRadius.circular(6.0), + border: hasBorder ? Border.all( + width: 1.0, color: const Color(0xffcccccc)) : Border.all( + width: 0.0, color: Colors.transparent), + image: imageName != null ? DecorationImage( + image: AssetImage('assets/images/dashboard/${imageName}'), + fit: BoxFit.cover, + colorFilter: new ColorFilter.mode( + Colors.black.withOpacity(0.2), BlendMode.dstIn), + + ) : null, + + ), + child: Center(child: child,), + ), + ); + } +} diff --git a/lib/widgets/shared/bottom_navigation_item.dart b/lib/widgets/shared/bottom_navigation_item.dart index d35d66c3..501a354d 100644 --- a/lib/widgets/shared/bottom_navigation_item.dart +++ b/lib/widgets/shared/bottom_navigation_item.dart @@ -50,12 +50,14 @@ class BottomNavigationItem extends StatelessWidget { size: 22.0), ), SizedBox(height: 5,), - Text( - name, - style: TextStyle( - color: currentIndex == index - ? Theme.of(context).primaryColor - : Theme.of(context).dividerColor, + Expanded( + child: Text( + name, + style: TextStyle( + color: currentIndex == index + ? Theme.of(context).primaryColor + : Theme.of(context).dividerColor, + ), ), ), ], diff --git a/pubspec.yaml b/pubspec.yaml index 15ea2dca..a061ba4a 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -75,6 +75,7 @@ flutter: # To add assets to your application, add an assets section, like this: assets: - assets/images/ + - assets/images/dashboard/ # - images/a_dot_ham.jpeg # An image asset can refer to one or more resolution-specific "variants", see