Skip to content

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

Merge branch 'revert-3f39a305' into 'master' 

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

See merge request !18
parents 2fc38c98 7fef8031
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 379 deletions
lib/I_GUIDER/i_guider.dart
View file @ 15008cc1
import 'package:covidefender/pages/heart_rate/heart_rate_screen.dart'; import 'package:covidefender/pages/heart_rate/heart_rate_screen.dart';
import 'package:covidefender/pages/mask_detect/invoker.dart'; import 'package:covidefender/pages/mask_detect/invoker.dart';
import 'package:covidefender/pages/self_carer/sc_main_screen.dart';
import 'package:flutter/cupertino.dart'; import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
class I_guider extends StatelessWidget { class I_guider extends StatelessWidget {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final mesure = MediaQuery.of(context);
return Scaffold( return Scaffold(
backgroundColor: Colors.white, backgroundColor: Colors.grey[200],
appBar: AppBar( appBar: AppBar(
centerTitle: true,
title: Text('I-Guider'), title: Text('I-Guider'),
// elevation: 0, // elevation: 0,
), ),
body: SingleChildScrollView( body: Column(
child: Column(
children: [ children: [
Row( Row(
children: [ children: [
Expanded( Expanded(
child: Container( child: Container(
height: mesure.size.height/3,
decoration: BoxDecoration( decoration: BoxDecoration(
image: DecorationImage( image: DecorationImage(
image: AssetImage('lib/assets/images/hero.gif'), image: AssetImage('lib/assets/images/hero.gif'),
fit: BoxFit.cover)), fit: BoxFit.cover)),
height: 300,
), ),
), ),
], ],
...@@ -141,9 +136,7 @@ class I_guider extends StatelessWidget { ...@@ -141,9 +136,7 @@ class I_guider extends StatelessWidget {
'', '',
style: TextStyle(fontWeight: FontWeight.bold), style: TextStyle(fontWeight: FontWeight.bold),
), ),
onPressed: () { onPressed: () {},
Navigator.push(context, MaterialPageRoute(builder: (context)=> SC_main()));
},
shape: RoundedRectangleBorder( shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(10)), borderRadius: BorderRadius.circular(10)),
), ),
...@@ -154,7 +147,6 @@ class I_guider extends StatelessWidget { ...@@ -154,7 +147,6 @@ class I_guider extends StatelessWidget {
), ),
], ],
), ),
),
); );
} }
} }
lib/pages/self_carer/SC_result_screen.dart deleted 100644 → 0
View file @ 2fc38c98
import 'package:flutter/cupertino.dart';
import 'package:flutter/material.dart';
class SC_resultScreen extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text('Results'),
),
body: Center(
child: Column(
children: [
Center(
child: Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height / 2.5,
child: Image.asset('lib/assets/images/hero.gif')),
),
Text("Analysis Results"),
ElevatedButton(onPressed: (){}, child: Text('Medical Support'))
],
),
),
);
}
}
lib/pages/self_carer/model/Symptoms.dart deleted 100644 → 0
View file @ 2fc38c98
import 'dart:ui';
class Symptoms {
String symptomname;
bool value;
List<Color> gradientColors;
Symptoms(this.symptomname, this.value,{this.gradientColors});
@override
String toString() {
return 'Symptoms{symptomname: $symptomname, value: $value}';
}
}
\ No newline at end of file
lib/pages/self_carer/model/colors.dart deleted 100644 → 0
View file @ 2fc38c98
import 'package:flutter/material.dart';
class CustomColors {
static Color primaryTextColor = Colors.white;
static Color dividerColor = Colors.white54;
static Color pageBackgroundColor = Color(0xFF2D2F41);
static Color menuBackgroundColor = Color(0xFF242634);
static Color clockBG = Color(0xFF444974);
static Color clockOutline = Color(0xFFEAECFF);
static Color secHandColor = Colors.orange[300];
static Color minHandStatColor = Color(0xFF748EF6);
static Color minHandEndColor = Color(0xFF77DDFF);
static Color hourHandStatColor = Color(0xFFC279FB);
static Color hourHandEndColor = Color(0xFFEA74AB);
}
class GradientColors {
final List<Color> colors;
GradientColors(this.colors);
static List<Color> sky = [Color(0xFF6448FE), Color(0xFF5FC6FF)];
static List<Color> sunset = [Color(0xFFFE6197), Color(0xFFFFB463)];
static List<Color> sea = [Color(0xFF61A3FE), Color(0xFF63FFD5)];
static List<Color> mango = [Color(0xFFFFA738), Color(0xFFFFE130)];
static List<Color> fire = [Color(0xFFFF5DCD), Color(0xFFFF8484)];
}
class GradientTemplate {
static List<GradientColors> gradientTemplate = [
GradientColors(GradientColors.sky),
GradientColors(GradientColors.sunset),
GradientColors(GradientColors.sea),
GradientColors(GradientColors.mango),
GradientColors(GradientColors.fire),
];
}
lib/pages/self_carer/sc_main_screen.dart deleted 100644 → 0
View file @ 2fc38c98
import 'dart:collection';
import 'package:covidefender/pages/self_carer/SC_result_screen.dart';
import 'package:covidefender/pages/self_carer/model/colors.dart';
import 'package:flutter/material.dart';
import 'package:quiver/collection.dart';
import 'model/Symptoms.dart';
class SC_main extends StatefulWidget {
@override
SC_mainState createState() => SC_mainState();
}
class SC_mainState extends State<SC_main> {
bool isPositiveMatch = false;
// String symptom = "i am a symptom";
// HashMap symptomMap = new HashMap<int,String>();
Map<String, bool> symptomList = HashMap();
Map<String, bool> values = {
'Fever With Chills': false,
'Cough and Sneezing': false,
'Difficulty in Breathing': false,
'Sore throat / Blush lips': false,
'Mustle Pain or Ache': false,
};
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text("Self-Carer"),
),
body: Container(
child: SingleChildScrollView(
child: Column(
children: [
Container(
width: MediaQuery.of(context).size.width,
height: MediaQuery.of(context).size.height /2.5,
child: Image.asset(
'lib/assets/images/hospital.gif',
)),
SizedBox(
height: 350,
child: new ListView(
children: values.keys.map((String key) {
return Container(
margin: EdgeInsets.only(bottom: 20,left: 10,right: 10),
decoration: BoxDecoration(
boxShadow: [
BoxShadow(
color: Colors.blue.withOpacity(0.4) ,blurRadius: 8, offset: Offset(4,4),spreadRadius: 4
)
],
gradient: LinearGradient(
colors: [Colors.blue[600], Colors.white],
begin: Alignment.centerLeft,
end: Alignment.centerRight,
),
borderRadius: BorderRadius.all(Radius.circular(24)),
),
child: SizedBox(
height: 90,
child: Padding(
padding: const EdgeInsets.all(8.0),
child: new CheckboxListTile(
title: new Text(key,style:TextStyle(
color: Colors.white,
fontFamily: 'avenir',
),),
value: values[key],
onChanged: (bool value) {
setState(() {
values[key] = value;
symptomList.clear();
values.forEach((key, value) {
print('${key}: ${value}');
if (value) {
symptomList.putIfAbsent(key, () => value);
// if(symptomList.containsKey('Food') && symptomList.containsKey('Materials') ){
// print("all is here");
// }else if(symptomList.containsKey('Food')){
// print("Food only is here");
// Navigator.push(context, MaterialPageRoute(builder: (context)=>HomeScreen()));
// Navigator.pop(context);
// }
print(
'Selected Items::' + symptomList.toString());
}
});
});
print(key);
},
),
),
),
);
}).toList(),
),
),
// Padding(
// padding: const EdgeInsets.all(8.0),
// child: Card(
// elevation: 8,
// shape: RoundedRectangleBorder(
// borderRadius: BorderRadius.circular(15)),
// color: Colors.lightBlueAccent[100],
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// children: [
// Container(
// child: Image(
// image:
// AssetImage('lib/assets/images/man80.png'))),
// // SizedBox(width: 50),
// Text("Fever With Chills",style: TextStyle(color: Colors.white)),
// // SizedBox(width: 70),
// Checkbox(value: cbTestvalue, onChanged: (bool value){
// setState(() {
//
// });
// })
//
//
//
],
),
),
),
floatingActionButton: FloatingActionButton(
onPressed: () => {
if (symptomList.isEmpty)
{print("Please select your Symptoms")}
else
{
if(symptomList.containsKey('Fever With Chills')
&& symptomList.containsKey('Cough and Sneezing')
&& symptomList.containsKey('Difficulty in Breathing')
&& symptomList.containsKey('Sore throat / Blush lips')
&& symptomList.containsKey('Mustle Pain or Ache')){
print("Positive Match Found Immediate Treatements needed !"),
Navigator.push(context,
MaterialPageRoute(builder: (context) => SC_resultScreen()))
}
}
},
child: Icon(
// Icons.next_plan_outlined
Icons.double_arrow_rounded)),
);
}
}
pubspec.yaml
View file @ 15008cc1
...@@ -121,7 +121,6 @@ flutter: ...@@ -121,7 +121,6 @@ flutter:
- lib/assets/labels.txt - lib/assets/labels.txt
- assets/ - assets/
- lib/assets/images/wear.gif - lib/assets/images/wear.gif
- lib/assets/images/
# To add assets to your application, add an assets section, like this: # To add assets to your application, add an assets section, like this:
# assets: # assets:
......
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