Skip to content

GitLab

Commit 38d17dba authored by Sai Srinivas's avatar Sai Srinivas
Browse files

ios pub

parent 45a85185
Show whitespace changes
Inline Side-by-side
lib/screens/AttendanceScreen.dart
View file @ 38d17dba
...@@ -91,7 +91,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -91,7 +91,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
// prevMonthName == currentMonthName // prevMonthName == currentMonthName
// ? '$currentMonthName $year' // ? '$currentMonthName $year'
// : '$prevMonthName - $currentMonthName $year'; // : '$prevMonthName - $currentMonthName $year';
final monthLabel ='$currentMonthName $year'; final monthLabel = '$currentMonthName $year';
return RefreshIndicator.adaptive( return RefreshIndicator.adaptive(
color: AppColors.app_blue, color: AppColors.app_blue,
...@@ -106,13 +106,12 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -106,13 +106,12 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
onWillPop: () => onBackPressed(context), onWillPop: () => onBackPressed(context),
child: SafeArea( child: SafeArea(
top: false, top: false,
bottom: Platform.isIOS?false:true, bottom: Platform.isIOS ? false : true,
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
appBar: appbar(context, "Attendance"), appBar: appbar(context, "Attendance"),
body: SafeArea( body: Container(
child: Container(
child: SingleChildScrollView( child: SingleChildScrollView(
child: Column( child: Column(
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
...@@ -168,7 +167,14 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -168,7 +167,14 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
TextSpan( TextSpan(
text: formattedTime, text: formattedTime,
style: TextStyle( style: TextStyle(
color:formattedTime!="-"?Color(0xFF493272): Color(0xFFED3424), color:
formattedTime != "-"
? Color(
0xFF493272,
)
: Color(
0xFFED3424,
),
fontFamily: fontFamily:
"JakartaRegular", "JakartaRegular",
fontSize: 30, fontSize: 30,
...@@ -177,7 +183,14 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -177,7 +183,14 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
TextSpan( TextSpan(
text: period, text: period,
style: TextStyle( style: TextStyle(
color:period!="-"?Color(0xFF493272): Color(0xFFED3424), color:
period != "-"
? Color(
0xFF493272,
)
: Color(
0xFFED3424,
),
fontFamily: fontFamily:
"JakartaRegular", "JakartaRegular",
), ),
...@@ -221,7 +234,14 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -221,7 +234,14 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
TextSpan( TextSpan(
text: formattedTime2, text: formattedTime2,
style: TextStyle( style: TextStyle(
color:formattedTime2!="-"?Color(0xFF493272): Color(0xFFED3424), color:
formattedTime2 != "-"
? Color(
0xFF493272,
)
: Color(
0xFFED3424,
),
fontFamily: fontFamily:
"JakartaRegular", "JakartaRegular",
fontSize: 30, fontSize: 30,
...@@ -230,7 +250,14 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -230,7 +250,14 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
TextSpan( TextSpan(
text: period2, text: period2,
style: TextStyle( style: TextStyle(
color:period2!="-"?Color(0xFF493272): Color(0xFFED3424), color:
period2 != "-"
? Color(
0xFF493272,
)
: Color(
0xFFED3424,
),
fontFamily: fontFamily:
"JakartaRegular", "JakartaRegular",
), ),
...@@ -687,7 +714,6 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -687,7 +714,6 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
), ),
), ),
), ),
),
floatingActionButton: floatingActionButton:
attendance.attendanceStatus == 0 || attendance.attendanceStatus == 0 ||
attendance.attendanceStatus == 1 attendance.attendanceStatus == 1
...@@ -704,7 +730,6 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -704,7 +730,6 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
attendance.attendanceStatus, attendance.attendanceStatus,
), ),
), ),
); );
if (res == true) { if (res == true) {
attendance.getAttendanceList( attendance.getAttendanceList(
...@@ -839,7 +864,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -839,7 +864,7 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: [ children: [
Expanded( Expanded(
flex:1, flex: 1,
child: Container( child: Container(
width: 18, width: 18,
height: 18, height: 18,
...@@ -860,11 +885,11 @@ class _AttendanceScreenState extends State<AttendanceScreen> { ...@@ -860,11 +885,11 @@ class _AttendanceScreenState extends State<AttendanceScreen> {
), ),
SizedBox(width: 5), SizedBox(width: 5),
Expanded( Expanded(
flex:4, flex: 4,
child: Text( child: Text(
text[index], text[index],
maxLines: 2, maxLines: 2,
overflow:TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: TextStyle( style: TextStyle(
fontSize: 14, fontSize: 14,
color: Colors.black, color: Colors.black,
......
lib/screens/HomeScreen.dart
View file @ 38d17dba
...@@ -166,7 +166,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -166,7 +166,7 @@ class _MyHomePageState extends State<MyHomePage> {
}, },
child: SafeArea( child: SafeArea(
top: false, top: false,
bottom: Platform.isIOS?false:true, bottom: Platform.isIOS ? false : true,
child: Scaffold( child: Scaffold(
resizeToAvoidBottomInset: true, resizeToAvoidBottomInset: true,
backgroundColor: AppColors.scaffold_bg_color, backgroundColor: AppColors.scaffold_bg_color,
...@@ -191,10 +191,7 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -191,10 +191,7 @@ class _MyHomePageState extends State<MyHomePage> {
right: 15, right: 15,
top: 30, top: 30,
), ),
padding: EdgeInsets.only( padding: EdgeInsets.only(bottom: 15, right: 10),
bottom: 15,
),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
gradient: LinearGradient( gradient: LinearGradient(
...@@ -271,7 +268,8 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -271,7 +268,8 @@ class _MyHomePageState extends State<MyHomePage> {
), ),
Expanded( Expanded(
flex: 3, flex: 3,
child: SizedBox( child: Container(
padding: EdgeInsets.only(right: 10),
child: Column( child: Column(
crossAxisAlignment: crossAxisAlignment:
CrossAxisAlignment.start, CrossAxisAlignment.start,
...@@ -291,9 +289,10 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -291,9 +289,10 @@ class _MyHomePageState extends State<MyHomePage> {
'${profile.employeeName}', '${profile.employeeName}',
maxFontSize: 18, maxFontSize: 18,
minFontSize: 12, minFontSize: 12,
style: TextStyle(fontSize: 18, style: TextStyle(
fontSize: 18,
color: AppColors.app_blue, color: AppColors.app_blue,
fontFamily: "JakartaRegular" fontFamily: "JakartaRegular",
), ),
maxLines: 2, maxLines: 2,
), ),
...@@ -301,9 +300,10 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -301,9 +300,10 @@ class _MyHomePageState extends State<MyHomePage> {
'(${profile.designation})', '(${profile.designation})',
maxFontSize: 14, maxFontSize: 14,
minFontSize: 10, minFontSize: 10,
style: TextStyle(fontSize: 14, style: TextStyle(
fontSize: 14,
color: AppColors.semi_black, color: AppColors.semi_black,
fontFamily: "JakartaRegular" fontFamily: "JakartaRegular",
), ),
maxLines: 1, maxLines: 1,
), ),
...@@ -394,7 +394,9 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -394,7 +394,9 @@ class _MyHomePageState extends State<MyHomePage> {
MaterialPageRoute( MaterialPageRoute(
builder: builder:
(context) => AttendanceScreen(), (context) => AttendanceScreen(),
settings: RouteSettings(arguments: 'AttendanceScreen'), settings: RouteSettings(
arguments: 'AttendanceScreen',
),
), ),
); );
break; break;
...@@ -436,7 +438,9 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -436,7 +438,9 @@ class _MyHomePageState extends State<MyHomePage> {
builder: builder:
(context) => (context) =>
Gentrackerdashboard(), Gentrackerdashboard(),
settings: RouteSettings(arguments: 'Gentrackerdashboard'), settings: RouteSettings(
arguments: 'Gentrackerdashboard',
),
), ),
); );
break; break;
...@@ -498,16 +502,15 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -498,16 +502,15 @@ class _MyHomePageState extends State<MyHomePage> {
); );
break; break;
case "Finance": case "Finance":
res = await Navigator.push( res = await Navigator.push(
context, context,
MaterialPageRoute( MaterialPageRoute(
builder: builder:
(context) => Financedashboard(), (context) => Financedashboard(),
settings: RouteSettings(arguments: 'Financedashboard'), settings: RouteSettings(
arguments: 'Financedashboard',
),
), ),
); );
break; break;
case "Orders": case "Orders":
...@@ -525,7 +528,9 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -525,7 +528,9 @@ class _MyHomePageState extends State<MyHomePage> {
MaterialPageRoute( MaterialPageRoute(
builder: builder:
(context) => CrmdashboardScreen(), (context) => CrmdashboardScreen(),
settings: RouteSettings(name: 'CrmdashboardScreen') settings: RouteSettings(
name: 'CrmdashboardScreen',
),
), ),
); );
default: default:
...@@ -591,7 +596,9 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -591,7 +596,9 @@ class _MyHomePageState extends State<MyHomePage> {
right: 15, right: 15,
top: 30, top: 30,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,), padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom,
),
child: Consumer3< child: Consumer3<
HomescreenNotifier, HomescreenNotifier,
ProfileNotifer, ProfileNotifer,
...@@ -637,7 +644,10 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -637,7 +644,10 @@ class _MyHomePageState extends State<MyHomePage> {
), ),
SizedBox(height: 15), SizedBox(height: 15),
Container( Container(
padding: EdgeInsets.symmetric(horizontal: 5,vertical: 10), padding: EdgeInsets.symmetric(
horizontal: 5,
vertical: 10,
),
decoration: BoxDecoration( decoration: BoxDecoration(
borderRadius: BorderRadius.circular(30), borderRadius: BorderRadius.circular(30),
gradient: LinearGradient( gradient: LinearGradient(
...@@ -845,7 +855,9 @@ class _MyHomePageState extends State<MyHomePage> { ...@@ -845,7 +855,9 @@ class _MyHomePageState extends State<MyHomePage> {
right: 15, right: 15,
top: 30, top: 30,
), ),
padding: EdgeInsets.only( bottom: MediaQuery.of(context).viewInsets.bottom,), padding: EdgeInsets.only(
bottom: MediaQuery.of(context).viewInsets.bottom,
),
child: Consumer3< child: Consumer3<
HomescreenNotifier, HomescreenNotifier,
ProfileNotifer, ProfileNotifer,
......
pubspec.lock
View file @ 38d17dba
...@@ -37,10 +37,10 @@ packages: ...@@ -37,10 +37,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: async name: async
sha256: d2872f9c19731c2e5f10444b14686eb7cc85c76274bd6c16e1816bff9a3bab63 sha256: "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "2.12.0" version: "2.13.0"
auto_size_text: auto_size_text:
dependency: "direct main" dependency: "direct main"
description: description:
...@@ -293,10 +293,10 @@ packages: ...@@ -293,10 +293,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: fake_async name: fake_async
sha256: "6a95e56b2449df2273fd8c45a662d6947ce1ebb7aafe80e550a3f68297f3cacc" sha256: "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "1.3.2" version: "1.3.3"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
...@@ -940,26 +940,26 @@ packages: ...@@ -940,26 +940,26 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker name: leak_tracker
sha256: c35baad643ba394b40aac41080300150a4f08fd0fd6a10378f8f7c6bc161acec sha256: "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "10.0.8" version: "11.0.1"
leak_tracker_flutter_testing: leak_tracker_flutter_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_flutter_testing name: leak_tracker_flutter_testing
sha256: f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573 sha256: "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.9" version: "3.0.10"
leak_tracker_testing: leak_tracker_testing:
dependency: transitive dependency: transitive
description: description:
name: leak_tracker_testing name: leak_tracker_testing
sha256: "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3" sha256: "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1"
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "3.0.1" version: "3.0.2"
lints: lints:
dependency: transitive dependency: transitive
description: description:
...@@ -1665,10 +1665,10 @@ packages: ...@@ -1665,10 +1665,10 @@ packages:
dependency: transitive dependency: transitive
description: description:
name: vm_service name: vm_service
sha256: "0968250880a6c5fe7edc067ed0a13d4bae1577fe2771dcf3010d52c4a9d3ca14" sha256: ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02
url: "https://pub.dev" url: "https://pub.dev"
source: hosted source: hosted
version: "14.3.1" version: "15.0.0"
web: web:
dependency: transitive dependency: transitive
description: description:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment