Haroon6138
/
doctor_app_flutter
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix in patient

Browse Source
merge-requests/922/head
Elham Rababh 4 years ago
parent f97b0bee14
commit 9e4a9c4b6a
4 changed files with 50 additions and 33 deletions
Show Stats Download Patch File Download Diff File

7
ios/Runner.xcodeproj/project.pbxproj
Unescape Escape View File

@ -215,7 +215,6 @@
TargetAttributes = {
97C146ED1CF9000F007C117D = {
CreatedOnToolsVersion = 7.3.1;
DevelopmentTeam = 3A359E86ZF;
LastSwiftMigration = 1100;
};
};
@ -416,7 +415,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 3A359E86ZF;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -551,7 +550,7 @@
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_MODULES = YES;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 3A359E86ZF;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",
@ -582,7 +581,7 @@
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Runner/RunnerRelease.entitlements;
CURRENT_PROJECT_VERSION = 4;
DEVELOPMENT_TEAM = 3A359E86ZF;
DEVELOPMENT_TEAM = "";
ENABLE_BITCODE = NO;
FRAMEWORK_SEARCH_PATHS = (
"$(inherited)",

10
ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
Unescape Escape View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1020"
LastUpgradeVersion = "1310"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
@ -27,8 +27,6 @@
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
<Testables>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
@ -38,8 +36,8 @@
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
<Testables>
</Testables>
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
@ -61,8 +59,6 @@
ReferencedContainer = "container:Runner.xcodeproj">
</BuildableReference>
</BuildableProductRunnable>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
buildConfiguration = "Profile"

43
lib/screens/patients/In_patient/in_patient_screen.dart
Unescape Escape View File

@ -112,6 +112,7 @@ class _InPatientScreenState extends State<InPatientScreen>
Expanded(
child: Scaffold(
extendBodyBehindAppBar: false,
appBar: PreferredSize(
preferredSize: Size.fromHeight(
MediaQuery.of(context).size.height * 0.070),
@ -124,26 +125,28 @@ class _InPatientScreenState extends State<InPatientScreen>
width: 0.5), //width: 0.7
),
color: Colors.white),
child: Center(
child: Container(
margin: EdgeInsets.only(top: 9),
child: TabBar(
isScrollable: false,
controller: _tabController,
indicatorColor: Colors.transparent,
indicatorWeight: 1.0,
indicatorSize: TabBarIndicatorSize.tab,
labelColor: Theme.of(context).primaryColor,
indicatorColor: Colors.red,
indicatorWeight: 0.001,
indicator:BoxDecoration(),
// indicatorSize: TabBarIndicatorSize.tab,
// labelColor: Theme.of(context).primaryColor,
labelPadding: EdgeInsets.only(
top: 0, left: 0, right: 0, bottom: 0),
unselectedLabelColor: Colors.grey[800],
// unselectedLabelColor: Colors.grey[800],
tabs: [
tabWidget(screenSize, _activeTab == 0,
TranslationBase.of(context).inPatientAll,
counter: model.inPatientList.length),
counter: model.inPatientList.length, isFirst: true),
tabWidget(screenSize, _activeTab == 1,
TranslationBase.of(context).myInPatientTitle,
counter: model.myIinPatientList.length),
counter: model.myIinPatientList.length, isMiddle: true),
tabWidget(screenSize, _activeTab == 2,
TranslationBase.of(context).discharged),
TranslationBase.of(context).discharged, isLast:true),
],
),
),
@ -193,23 +196,23 @@ class _InPatientScreenState extends State<InPatientScreen>
}
Widget tabWidget(Size screenSize, bool isActive, String title,
{int counter = -1}) {
{int counter = -1,
bool isFirst = false,
bool isMiddle = false,
bool isLast = false,}) {
return Center(
child: Container(
height: screenSize.height * 0.070,
decoration: TextFieldsUtils.containerBorderDecoration(
isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA),
isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA),
borderRadius: isActive?4:0,
borderWidth: 0),
height: screenSize.height * 0.060,
decoration:Helpers.getBoxTabsBoxDecoration(isActive: isActive,isFirst: isFirst, isMiddle: isMiddle, isLast: isLast),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
AppText(
title,
fontSize: SizeConfig.textMultiplier * 1.5,
color: isActive ? Colors.white : Color(0xFF2B353E),
fontWeight: FontWeight.w700,
color: isActive ? Colors.white : AppGlobal.appTextColor,
letterSpacing: -0.48,
fontWeight: FontWeight.w600,
),
if (counter != -1)
Container(
@ -217,7 +220,7 @@ class _InPatientScreenState extends State<InPatientScreen>
width: 15,
height: 15,
decoration: BoxDecoration(
color: isActive ? Colors.white : Color(0xFFD02127),
color: isActive ? Colors.white : AppGlobal.appRedColor,
shape: BoxShape.circle,
),
child: Center(
@ -225,7 +228,7 @@ class _InPatientScreenState extends State<InPatientScreen>
child: AppText(
"$counter",
fontSize: SizeConfig.textMultiplier * 1.5,
color: !isActive ? Colors.white : Color(0xFFD02127),
color: !isActive ? Colors.white : AppGlobal.appRedColor,
fontWeight: FontWeight.w700,
),
),

23
lib/util/helpers.dart
Unescape Escape View File

@ -188,7 +188,8 @@ class Helpers {
static clearSharedPref() async {
await sharedPref.clear();
}
static getCardBoxDecoration(){
static getCardBoxDecoration() {
return BoxDecoration(
borderRadius: BorderRadius.circular(10),
color: Colors.white,
@ -328,5 +329,23 @@ class Helpers {
return kpi;
}
static getBoxTabsBoxDecoration(
{
bool isFirst = false,
bool isMiddle = false,
bool isLast = false,
bool isActive = false,
double radius = 6.0
}) {
return BoxDecoration(
color: isActive ? AppGlobal.appRedColor : Color(0xFFEAEAEA),
shape: BoxShape.rectangle,
borderRadius: BorderRadius.only(
topRight: Radius.circular(isActive?isFirst || isMiddle?radius:0:0),
bottomRight: Radius.circular(isActive?isFirst || isMiddle?radius:0:0),
topLeft: Radius.circular(isActive?isLast|| isMiddle?radius:0:0),
bottomLeft: Radius.circular(isActive?isLast || isMiddle?radius:0:0)
),
);
}
}

Write Preview
Loading…
Cancel
Save