Merge branch 'medicine_desgin' into 'development'

change doctor app icons and optimization

See merge request Cloud_Solution/doctor_app_flutter!161
pull/163/head
Elham 4 years ago
commit f4351abc10

Binary file not shown.

@ -8,7 +8,7 @@
"glyphs": [
{
"uid": "9caed7b74de0f5a625ccb960f00d9c8d",
"css": "femaleicon",
"css": "female_icon",
"code": 59392,
"src": "custom_icons",
"selected": true,
@ -17,7 +17,7 @@
"width": 986
},
"search": [
"femaleicon"
"female_icon"
]
},
{
@ -344,7 +344,7 @@
},
{
"uid": "afe3a55435e46aeeeeae8f60731d4706",
"css": "medicinesearch",
"css": "medicine_search",
"code": 59423,
"src": "custom_icons",
"selected": true,
@ -353,35 +353,7 @@
"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"
"medicine_search"
]
},
{
@ -398,20 +370,6 @@
"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",
@ -523,6 +481,19 @@
"search": [
"scdedule_icon_active"
]
}, {
"uid": "a0f7dbb184f90f285a9cba8cf09a9b6a",
"css": "drawer_icon",
"code": 59429,
"src": "custom_icons",
"selected": true,
"svg": {
"path": "M1564.7 1000H68C30.6 1000 0 958.7 0 908.2H0C0 857.6 30.6 816.3 68 816.3H1564.7C1602 816.3 1632.7 857.6 1632.7 908.2H1632.7C1632.7 958.7 1602 1000 1564.7 1000ZM911.6 591.8H68C30.6 591.8 0 550.5 0 500H0C0 449.5 30.6 408.2 68 408.2H911.6C949 408.2 979.6 449.5 979.6 500H979.6C979.6 550.5 949 591.8 911.6 591.8ZM1238.1 183.7H68C30.6 183.7 0 142.4 0 91.8H0C0 41.3 30.6 0 68 0H1238.1C1275.5 0 1306.1 41.3 1306.1 91.8H1306.1C1306.1 142.4 1275.5 183.7 1238.1 183.7Z",
"width": 1633
},
"search": [
"drawer_icon"
]
}
]
}

@ -21,7 +21,7 @@ class DoctorApp {
static const _kFontFam = 'DoctorApp';
static const _kFontPkg = null;
static const IconData femaleicon = IconData(0xe800, fontFamily: _kFontFam, fontPackage: _kFontPkg);
static const IconData female_icon = 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);
@ -42,10 +42,12 @@ class DoctorApp {
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 medicine_search = 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);
static const IconData drawer_icon = IconData(0xe825, fontFamily: _kFontFam, fontPackage: _kFontPkg);
}

@ -4,13 +4,14 @@ import 'package:doctor_app_flutter/screens/doctor/my_schedule_screen.dart';
import 'package:doctor_app_flutter/screens/doctor/services_screen.dart';
import 'package:doctor_app_flutter/widgets/shared/app_drawer_widget.dart';
import 'package:doctor_app_flutter/widgets/shared/bottom_nav_bar.dart';
import 'package:doctor_app_flutter/widgets/shared/profile_image_widget.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:doctor_app_flutter/util/translations_delegate_base.dart';
import 'icons_app/doctor_app_icons.dart';
class LandingPage extends StatefulWidget {
@override
_LandingPageState createState() => _LandingPageState();
@ -46,7 +47,8 @@ class _LandingPageState extends State<LandingPage> {
leading: Builder(
builder: (BuildContext context) {
return IconButton(
icon: Icon(Icons.menu),
icon: Icon(DoctorApp.drawer_icon),
iconSize: 15,
color: Colors.white,
onPressed: () => Scaffold.of(context).openDrawer(),
);

@ -694,7 +694,7 @@ class _DashboardScreenState extends State<DashboardScreen> {
mainAxisAlignment: MainAxisAlignment.spaceAround,
children: <Widget>[
Icon(
DoctorApp.medicinesearch,
DoctorApp.medicine_search,
size: 50,
color: Colors.black,
),

@ -128,7 +128,7 @@ class _LiveCarePandingListState extends State<LiveCarePandingListScreen> {
? DoctorApp
.male
: DoctorApp
.femaleicon,
.female_icon,
size: 80,
)),
],

@ -98,7 +98,7 @@ class _MedicineSearchState extends State<MedicineSearchScreen> {
children: <Widget>[
Container(
child: Icon(
DoctorApp.medicinesearch,
DoctorApp.medicine_search,
size: 100,
color: Colors.black,
),

@ -442,7 +442,7 @@ class _PatientsScreenState extends State<PatientsScreen> {
? DoctorApp
.male
: DoctorApp
.femaleicon,
.female_icon,
size: 80,
)),
],

@ -63,7 +63,7 @@ class _DoctorReplyWidgetState extends State<DoctorReplyWidget> {
),
width: 80,
height: 80,
child: Icon(widget.reply.gender == 1 ? DoctorApp.male : DoctorApp.femaleicon,size: 80,)),
child: Icon(widget.reply.gender == 1 ? DoctorApp.male : DoctorApp.female_icon,size: 80,)),
SizedBox(width: 15,),
Expanded(

Loading…
Cancel
Save