Skip to content

2
2021-035-CoviDefender
Commit 750dc7a1 authored by indika N kumara's avatar indika N kumara
Browse files
Options

Merge branch 'revert-848195bd' into 'master' 

Revert "Merge branch 'I_GUIDER_PHASE_02_NK' into 'master'"

See merge request !16
parents 848195bd 0a8ae634
Hide whitespace changes
Inline Side-by-side
Showing with 34 additions and 68 deletions
lib/pages/heart_rate/heart_rate_screen.dart
View file @ 750dc7a1
...@@ -9,40 +9,23 @@ class HeartRateScreen extends StatelessWidget { ...@@ -9,40 +9,23 @@ class HeartRateScreen extends StatelessWidget {
appBar: AppBar( appBar: AppBar(
title: Text('Heart Rate Detector'), title: Text('Heart Rate Detector'),
), ),
body: Container( body: Column(
color: Colors.white, children: [
child: Column( Padding(
children: [ padding: const EdgeInsets.all(8.0),
Padding( child: Image.asset('lib/assets/images/pulse.gif'),
padding: const EdgeInsets.all(8.0), ),
child: Image.asset('lib/assets/images/pulse.gif'), SizedBox(height: 20),
), Column(
SizedBox(height: 20), crossAxisAlignment: CrossAxisAlignment.start,
Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, ElevatedButton(
children: [ onPressed: () => Navigator.push(context, MaterialPageRoute(builder: (context) => HomePage(),)),
Padding( child: Text('Measure Heart Rate'),
padding: const EdgeInsets.fromLTRB(8,70,8,8), ),
child: SizedBox( ],
height: 70, ),
width: 350, ],
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Colors.red[300],
elevation: 15,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12)
)
),
onPressed: () => Navigator.push(context, MaterialPageRoute(builder: (context) => HomePage(),)),
child: Text('Measure Heart Rate'),
),
),
),
],
),
],
),
), ),
); );
} }
......
lib/pages/mask_detect/invoker.dart
View file @ 750dc7a1
...@@ -11,40 +11,23 @@ class invoker extends StatelessWidget { ...@@ -11,40 +11,23 @@ class invoker extends StatelessWidget {
appBar: AppBar( appBar: AppBar(
title: Text('Face Mask Detector'), title: Text('Face Mask Detector'),
), ),
body: Container( body: Column(
color: Colors.white, children: [
child: Column( Padding(
children: [ padding: const EdgeInsets.all(8.0),
Padding( child: Image.asset('lib/assets/images/wear.gif'),
padding: const EdgeInsets.all(8.0), ),
child: Image.asset('lib/assets/images/wear.gif'), SizedBox(height: 20),
), Column(
SizedBox(height: 20), crossAxisAlignment: CrossAxisAlignment.start,
Column( children: [
crossAxisAlignment: CrossAxisAlignment.start, ElevatedButton(
children: [ onPressed: () => invokeCamera(),
Padding( child: Text('Detect Mask'),
padding: const EdgeInsets.fromLTRB(8,70,8,8), ),
child: SizedBox( ],
height: 70, ),
width: 350, ],
child: ElevatedButton(
style: ElevatedButton.styleFrom(
primary: Colors.blue[300],
elevation: 15,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(12)
)
),
onPressed: () => invokeCamera(),
child: Text('Detect Mask'),
),
),
),
],
),
],
),
), ),
); );
} }
......
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