diff --git a/assets/girl1.jpeg b/assets/girl1.jpeg new file mode 100644 index 0000000..741dac0 Binary files /dev/null and b/assets/girl1.jpeg differ diff --git a/assets/girl10.jpeg b/assets/girl10.jpeg new file mode 100644 index 0000000..1bb1e26 Binary files /dev/null and b/assets/girl10.jpeg differ diff --git a/assets/girl11.jpeg b/assets/girl11.jpeg new file mode 100644 index 0000000..fd615a0 Binary files /dev/null and b/assets/girl11.jpeg differ diff --git a/assets/girl12.jpeg b/assets/girl12.jpeg new file mode 100644 index 0000000..6f6dbe4 Binary files /dev/null and b/assets/girl12.jpeg differ diff --git a/assets/girl13.jpeg b/assets/girl13.jpeg new file mode 100644 index 0000000..aaa4e7f Binary files /dev/null and b/assets/girl13.jpeg differ diff --git a/assets/girl2.jpeg b/assets/girl2.jpeg new file mode 100644 index 0000000..c6586c7 Binary files /dev/null and b/assets/girl2.jpeg differ diff --git a/assets/girl3.jpeg b/assets/girl3.jpeg new file mode 100644 index 0000000..fdc73cc Binary files /dev/null and b/assets/girl3.jpeg differ diff --git a/assets/girl4.jpeg b/assets/girl4.jpeg new file mode 100644 index 0000000..0839ec7 Binary files /dev/null and b/assets/girl4.jpeg differ diff --git a/assets/girl5.jpeg b/assets/girl5.jpeg new file mode 100644 index 0000000..6411509 Binary files /dev/null and b/assets/girl5.jpeg differ diff --git a/assets/girl6.jpeg b/assets/girl6.jpeg new file mode 100644 index 0000000..4120834 Binary files /dev/null and b/assets/girl6.jpeg differ diff --git a/assets/girl7.jpg b/assets/girl7.jpg new file mode 100644 index 0000000..bbdd352 Binary files /dev/null and b/assets/girl7.jpg differ diff --git a/assets/girl8.jpeg b/assets/girl8.jpeg new file mode 100644 index 0000000..9d38b2a Binary files /dev/null and b/assets/girl8.jpeg differ diff --git a/assets/girl9.jpeg b/assets/girl9.jpeg new file mode 100644 index 0000000..8724457 Binary files /dev/null and b/assets/girl9.jpeg differ diff --git a/lib/Appoitment/Appointmentlist.dart b/lib/Appoitment/Appointmentlist.dart index 70905ce..a1c47a6 100644 --- a/lib/Appoitment/Appointmentlist.dart +++ b/lib/Appoitment/Appointmentlist.dart @@ -71,6 +71,8 @@ class _ListState extends State { check: snapshot1.data.value['check'], uid: snapshot1.data.value['uid'], + drimage: + snapshot1.data.value['drimage'], ))); }, child: Row( diff --git a/lib/Appoitment/Makeapt.dart b/lib/Appoitment/Makeapt.dart index d2f6b1a..6103598 100644 --- a/lib/Appoitment/Makeapt.dart +++ b/lib/Appoitment/Makeapt.dart @@ -129,16 +129,19 @@ class _MakeaptState extends State { return Scaffold( backgroundColor: Color(0xFFFFC0CB), appBar: AppBar( - automaticallyImplyLeading: false, + iconTheme: IconThemeData(color: Colors.black), + automaticallyImplyLeading: true, backgroundColor: Colors.white, elevation: 0, - title: Text( - "APPOINTMENT FORM", - style: TextStyle( - color: Colors.black, - letterSpacing: 3, - fontSize: 20, - fontWeight: FontWeight.w400), + title: Center( + child: Text( + "APPOINTMENT FORM", + style: TextStyle( + color: Colors.black, + letterSpacing: 3, + fontSize: 20, + fontWeight: FontWeight.w400), + ), ), ), body: SingleChildScrollView( diff --git a/lib/Appoitment/Show.dart b/lib/Appoitment/Show.dart index bc15430..50303bf 100644 --- a/lib/Appoitment/Show.dart +++ b/lib/Appoitment/Show.dart @@ -12,6 +12,7 @@ class Show extends StatefulWidget { final String report; final String check; final String uid; + final String drimage; const Show( {Key key, this.index, @@ -22,7 +23,8 @@ class Show extends StatefulWidget { this.image, this.report, this.check, - this.uid}) + this.uid, + this.drimage}) : super(key: key); @override _ShowState createState() => _ShowState(); @@ -33,12 +35,13 @@ class _ShowState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - automaticallyImplyLeading: false, + iconTheme: IconThemeData(color: Colors.black), + automaticallyImplyLeading: true, backgroundColor: Colors.white, elevation: 0, title: Center( child: Text( - "APPOINNTMENT STATUS", + "APPOINTMENT STATUS", style: TextStyle( color: Colors.black, letterSpacing: 5, @@ -148,6 +151,7 @@ class _ShowState extends State { MaterialPageRoute( builder: (context) => MyApp( uid: widget.uid, + image: widget.drimage, ))); } }, diff --git a/lib/Appoitment/appointmentrequest.dart b/lib/Appoitment/appointmentrequest.dart index f8c8c8f..9d53e99 100644 --- a/lib/Appoitment/appointmentrequest.dart +++ b/lib/Appoitment/appointmentrequest.dart @@ -32,7 +32,8 @@ class _RequestState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - automaticallyImplyLeading: false, + iconTheme: IconThemeData(color: Colors.black), + automaticallyImplyLeading: true, backgroundColor: Colors.white, elevation: 0, title: Center( diff --git a/lib/Appoitment/bot.dart b/lib/Appoitment/bot.dart new file mode 100644 index 0000000..bfa50d0 --- /dev/null +++ b/lib/Appoitment/bot.dart @@ -0,0 +1,150 @@ +import 'package:bubble/bubble.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_dialogflow/dialogflow_v2.dart'; +import 'package:hackathon2/global.dart'; + +class MyApp extends StatefulWidget { + final String drimag; + + const MyApp({Key key, this.drimag}) : super(key: key); + + @override + _MyAppState createState() => _MyAppState(); +} + +class _MyAppState extends State { + void response(query) async { + AuthGoogle authGoogle = + await AuthGoogle(fileJson: "assets/pink-288804-5fbc02059449.json") + .build(); + Dialogflow dialogflow = + Dialogflow(authGoogle: authGoogle, language: Language.english); + AIResponse aiResponse = await dialogflow.detectIntent(query); + setState(() { + messsages.insert(0, { + "data": 0, + "message": aiResponse.getListMessage()[0]["text"]["text"][0].toString() + }); + }); + } + + final messageInsert = TextEditingController(); + List messsages = List(); + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + leading: IconButton( + icon: Icon(Icons.arrow_back, color: Colors.black), + onPressed: () { + Navigator.pop(context); + }), + backgroundColor: Colors.white, + elevation: 0, + title: Center( + child: Text( + "CHAT", + style: TextStyle( + color: Colors.black, + letterSpacing: 5, + fontSize: 20, + fontWeight: FontWeight.w400), + ), + ), + ), + body: Container( + child: Column( + children: [ + Flexible( + child: ListView.builder( + reverse: true, + itemCount: messsages.length, + itemBuilder: (context, index) => chat( + messsages[index]["message"].toString(), + messsages[index]["data"]))), + Divider( + height: 5.0, + color: Colors.deepOrange, + ), + Container( + padding: EdgeInsets.only(left: 15.0, right: 15.0), + margin: const EdgeInsets.symmetric(horizontal: 8.0), + child: Row( + children: [ + Flexible( + child: TextField( + controller: messageInsert, + decoration: InputDecoration.collapsed( + hintText: "Send your message", + hintStyle: TextStyle( + fontWeight: FontWeight.bold, fontSize: 18.0)), + )), + Container( + margin: EdgeInsets.symmetric(horizontal: 4.0), + child: IconButton( + icon: Icon( + Icons.send, + size: 30.0, + color: Colors.black, + ), + onPressed: () { + if (messageInsert.text.isEmpty) { + print("empty message"); + } else { + setState(() { + messsages.insert(0, + {"data": 1, "message": messageInsert.text}); + }); + response(messageInsert.text); + messageInsert.clear(); + } + }), + ) + ], + ), + ), + SizedBox( + height: 15.0, + ) + ], + ), + ), + ); + } + + //for better one i have use the bubble package check out the pubspec.yaml + + Widget chat(String message, int data) { + return Padding( + padding: EdgeInsets.all(10.0), + child: Bubble( + radius: Radius.circular(15.0), + color: data == 0 ? Colors.pink[100] : Colors.pink[100], + elevation: 0.0, + alignment: data == 0 ? Alignment.topLeft : Alignment.topRight, + nip: data == 0 ? BubbleNip.leftBottom : BubbleNip.rightTop, + child: Padding( + padding: EdgeInsets.all(2.0), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + CircleAvatar( + backgroundImage: + NetworkImage(data == 0 ? widget.drimag : globalimage), + ), + SizedBox( + width: 10.0, + ), + Flexible( + child: Text( + message, + style: TextStyle( + color: Colors.white, fontWeight: FontWeight.bold), + )) + ], + ), + )), + ); + } +} diff --git a/lib/Blogs and post/blogs.dart b/lib/Blogs and post/blogs.dart index d638c8b..ba8e8e8 100644 --- a/lib/Blogs and post/blogs.dart +++ b/lib/Blogs and post/blogs.dart @@ -54,127 +54,135 @@ class _BlogsState extends State { ? Center( child: Padding( padding: const EdgeInsets.fromLTRB(5, 5, 5, 5), - child: Container( - decoration: BoxDecoration( - color: Color(0xFFFFC0CB), + child: Card( + shape: RoundedRectangleBorder( borderRadius: BorderRadius.all(Radius.circular(10))), - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Padding( - padding: const EdgeInsets.fromLTRB( - 10, 10, 20, 5), - child: Center( + elevation: 10, + child: Container( + decoration: BoxDecoration( + color: Color(0xFFFFC0CB), + borderRadius: BorderRadius.all( + Radius.circular(10))), + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Padding( + padding: const EdgeInsets.fromLTRB( + 10, 10, 20, 5), + child: Center( + child: Text( + snapshot1.data.value['username'], + style: TextStyle( + color: Colors.black87, + fontWeight: FontWeight.w900, + letterSpacing: 3, + fontSize: 20), + ), + ), + ), + Padding( + padding: const EdgeInsets.fromLTRB( + 10, 0, 5, 0), child: Text( - snapshot1.data.value['username'], + snapshot1.data.value['post'] + .toString() + .substring(0, 79), style: TextStyle( - color: Colors.black87, - fontWeight: FontWeight.w900, - letterSpacing: 3, - fontSize: 20), + color: Colors.black, + fontWeight: FontWeight.w400, + fontSize: 16), ), ), - ), - Padding( - padding: const EdgeInsets.fromLTRB( - 10, 0, 5, 0), - child: Text( - snapshot1.data.value['post'] - .toString() - .substring(0, 79), - style: TextStyle( - color: Colors.black, - fontWeight: FontWeight.w400, - fontSize: 16), - ), - ), - Padding( - padding: const EdgeInsets.fromLTRB( - 10, 0, 20, 10), - child: GestureDetector( - onTap: () { - showDialog( - context: context, - builder: (context) { - return AlertDialog( - scrollable: true, - content: Text(snapshot1 - .data.value['post']), - ); - }); - }, - child: Padding( - padding: const EdgeInsets.all(0.0), - child: Container( - child: Text( - "Read More...", - style: TextStyle( - color: Colors.black, - fontWeight: FontWeight.bold, - fontSize: 17), + Padding( + padding: const EdgeInsets.fromLTRB( + 10, 0, 20, 10), + child: GestureDetector( + onTap: () { + showDialog( + context: context, + builder: (context) { + return AlertDialog( + scrollable: true, + content: Text(snapshot1 + .data.value['post']), + ); + }); + }, + child: Padding( + padding: const EdgeInsets.all(0.0), + child: Container( + child: Text( + "Read More...", + style: TextStyle( + color: Colors.black, + fontWeight: FontWeight.bold, + fontSize: 17), + ), ), ), ), ), - ), - Container( - width: 550, - height: 300, - decoration: BoxDecoration( - image: DecorationImage( - image: NetworkImage(snapshot1 - .data.value['image']), - fit: BoxFit.cover)), - ), - Container( - child: Padding( - padding: const EdgeInsets.fromLTRB( - 0, 10, 0, 10), - child: Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - Icon( - MdiIcons.heart, - color: Colors.red, - size: 30, - ), - SizedBox( - width: 100, - ), - GestureDetector( - onTap: () { - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => - Comment1( - comment1: snapshot1 - .data - .value['uid'], - ))); - }, - child: Icon( - Icons.insert_comment, - color: Colors.white, + Container( + width: 550, + height: 300, + decoration: BoxDecoration( + image: DecorationImage( + image: NetworkImage(snapshot1 + .data.value['image']), + fit: BoxFit.cover)), + ), + Container( + child: Padding( + padding: const EdgeInsets.fromLTRB( + 0, 10, 0, 10), + child: Row( + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + Icon( + MdiIcons.heart, + color: Colors.red, size: 30, ), - ), - SizedBox( - width: 100, - ), - Icon( - MdiIcons.share, - color: Colors.black, - size: 30, - ) - ], + SizedBox( + width: 100, + ), + GestureDetector( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => + Comment1( + comment1: snapshot1 + .data + .value[ + 'uid'], + ))); + }, + child: Icon( + Icons.insert_comment, + color: Colors.white, + size: 30, + ), + ), + SizedBox( + width: 100, + ), + Icon( + MdiIcons.share, + color: Colors.black, + size: 30, + ) + ], + ), ), ), - ), - ], + ], + ), ), ), ), diff --git a/lib/Chat/1.dart b/lib/Chat/1.dart index 28225d7..d9fa9ea 100644 --- a/lib/Chat/1.dart +++ b/lib/Chat/1.dart @@ -6,8 +6,8 @@ import 'chatmodel.dart'; class MyApp extends StatefulWidget { final String uid; - - const MyApp({Key key, this.uid}) : super(key: key); + final String image; + const MyApp({Key key, this.uid, this.image}) : super(key: key); @override _MyAppState createState() => _MyAppState(); } @@ -21,6 +21,7 @@ class _MyAppState extends State { debugShowCheckedModeBanner: false, home: AllChatsPage( uid: widget.uid, + image2: widget.image, ), ), ); diff --git a/lib/Chat/2.dart b/lib/Chat/2.dart index c3b26a0..13a2ec1 100644 --- a/lib/Chat/2.dart +++ b/lib/Chat/2.dart @@ -1,6 +1,10 @@ import 'package:agora_rtc_engine/rtc_engine.dart'; import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'package:hackathon2/Appoitment/Appointmentlist.dart'; +import 'package:hackathon2/Appoitment/Show.dart'; +import 'package:hackathon2/Appoitment/appointment.dart'; +import 'package:hackathon2/Appoitment/bot.dart'; import 'package:hackathon2/Appoitment/call.dart'; import 'package:hexcolor/hexcolor.dart'; import 'package:permission_handler/permission_handler.dart'; @@ -12,8 +16,8 @@ import 'user.dart'; class AllChatsPage extends StatefulWidget { final String uid; - - const AllChatsPage({Key key, this.uid}) : super(key: key); + final String image2; + const AllChatsPage({Key key, this.uid, this.image2}) : super(key: key); @override _AllChatsPageState createState() => _AllChatsPageState(); } @@ -54,7 +58,9 @@ class _AllChatsPageState extends State { Navigator.of(context).push( MaterialPageRoute( builder: (BuildContext context) { - return ChatPage(friend); + return MyApp( + drimag: widget.image2, + ); }, ), ); @@ -127,8 +133,17 @@ class _AllChatsPageState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - iconTheme: IconThemeData(color: Colors.black), - automaticallyImplyLeading: true, + leading: IconButton( + icon: Icon( + Icons.arrow_back, + color: Colors.black, + ), + onPressed: () { + Navigator.push(context, + MaterialPageRoute(builder: (context) => Appointment3())); + }), + // iconTheme: IconThemeData(color: Colors.black), + //automaticallyImplyLeading: true, backgroundColor: Colors.white, elevation: 0, title: Center( diff --git a/lib/Chooselanguage.dart b/lib/Chooselanguage.dart new file mode 100644 index 0000000..3ebe088 --- /dev/null +++ b/lib/Chooselanguage.dart @@ -0,0 +1,76 @@ +import 'package:flutter/material.dart'; +import 'package:hackathon2/1.dart'; + +class Language extends StatefulWidget { + @override + _LanguageState createState() => _LanguageState(); +} + +class _LanguageState extends State { + String dropdownValue = 'Select your language'; + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + automaticallyImplyLeading: false, + backgroundColor: Colors.white, + elevation: 0, + title: Center( + child: Text( + "CHOOSE YOUR LANGUAGE", + style: TextStyle( + color: Colors.black, + letterSpacing: 5, + fontSize: 20, + fontWeight: FontWeight.w400), + ), + ), + ), + body: Column( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + Center( + child: DropdownButton( + value: dropdownValue, + icon: Icon(Icons.arrow_downward), + iconSize: 24, + elevation: 16, + style: TextStyle(color: Colors.black), + underline: Container( + height: 2, + color: Colors.pink[100], + ), + onChanged: (String newValue) { + setState(() { + dropdownValue = newValue; + }); + }, + items: [ + 'Select your language', + 'English', + 'Hindi', + 'French', + 'Arabic' + ].map>((String value) { + return DropdownMenuItem( + value: value, + child: Text(value), + ); + }).toList(), + ), + ), + SizedBox( + height: 20, + ), + RaisedButton( + child: Text("Next"), + onPressed: () { + Navigator.push( + context, MaterialPageRoute(builder: (context) => One())); + }) + ], + ), + ); + } +} diff --git a/lib/Community/call.dart b/lib/Community/call.dart new file mode 100644 index 0000000..49ba742 --- /dev/null +++ b/lib/Community/call.dart @@ -0,0 +1,303 @@ +import 'dart:async'; +import 'package:agora_rtc_engine/rtc_engine.dart'; +import 'package:agora_rtc_engine/rtc_local_view.dart' as RtcLocalView; +import 'package:agora_rtc_engine/rtc_remote_view.dart' as RtcRemoteView; +import 'package:flutter/material.dart'; +import 'package:hackathon2/Appoitment/settings.dart'; +import 'package:hexcolor/hexcolor.dart'; + +class CallPage1 extends StatefulWidget { + /// non-modifiable channel name of the page + final String channelName; + + /// non-modifiable client role of the page + final ClientRole role; + + /// Creates a call page with given channel name. + const CallPage1({Key key, this.channelName, this.role}) : super(key: key); + + @override + _CallPageState createState() => _CallPageState(); +} + +class _CallPageState extends State { + final _users = []; + final _infoStrings = []; + bool muted = false; + RtcEngine _engine; + + @override + void dispose() { + // clear users + _users.clear(); + // destroy sdk + _engine.leaveChannel(); + _engine.destroy(); + super.dispose(); + } + + @override + void initState() { + super.initState(); + // initialize agora sdk + initialize(); + } + + Future initialize() async { + if (APP_ID.isEmpty) { + setState(() { + _infoStrings.add( + 'APP_ID missing, please provide your APP_ID in settings.dart', + ); + _infoStrings.add('Agora Engine is not starting'); + }); + return; + } + + await _initAgoraRtcEngine(); + _addAgoraEventHandlers(); + await _engine.enableWebSdkInteroperability(true); + VideoEncoderConfiguration configuration = VideoEncoderConfiguration(); + configuration.dimensions = VideoDimensions(1920, 1080); + await _engine.setVideoEncoderConfiguration(configuration); + await _engine.joinChannel(null, widget.channelName, null, 0); + } + + /// Create agora sdk instance and initialize + Future _initAgoraRtcEngine() async { + _engine = await RtcEngine.create(APP_ID); + await _engine.enableVideo(); + await _engine.setChannelProfile(ChannelProfile.LiveBroadcasting); + await _engine.setClientRole(widget.role); + } + + /// Add agora event handlers + void _addAgoraEventHandlers() { + _engine.setEventHandler(RtcEngineEventHandler(error: (code) { + setState(() { + final info = 'onError: $code'; + _infoStrings.add(info); + }); + }, joinChannelSuccess: (channel, uid, elapsed) { + setState(() { + final info = 'onJoinChannel: $channel, uid: $uid'; + _infoStrings.add(info); + }); + }, leaveChannel: (stats) { + setState(() { + _infoStrings.add('onLeaveChannel'); + _users.clear(); + }); + }, userJoined: (uid, elapsed) { + setState(() { + final info = 'userJoined: $uid'; + _infoStrings.add(info); + _users.add(uid); + }); + }, userOffline: (uid, elapsed) { + setState(() { + final info = 'userOffline: $uid'; + _infoStrings.add(info); + _users.remove(uid); + }); + }, firstRemoteVideoFrame: (uid, width, height, elapsed) { + setState(() { + final info = 'firstRemoteVideo: $uid ${width}x $height'; + _infoStrings.add(info); + }); + })); + } + + /// Helper function to get list of native views + List _getRenderViews() { + final List list = []; + if (widget.role == ClientRole.Broadcaster) { + list.add(RtcLocalView.SurfaceView()); + } + _users.forEach((int uid) => list.add(RtcRemoteView.SurfaceView(uid: uid))); + return list; + } + + /// Video view wrapper + Widget _videoView(view) { + return Expanded(child: Container(child: view)); + } + + /// Video view row wrapper + Widget _expandedVideoRow(List views) { + final wrappedViews = views.map(_videoView).toList(); + return Expanded( + child: Row( + children: wrappedViews, + ), + ); + } + + /// Video layout wrapper + Widget _viewRows() { + final views = _getRenderViews(); + switch (views.length) { + case 1: + return Container( + child: Column( + children: [_videoView(views[0])], + )); + case 2: + return Container( + child: Column( + children: [ + _expandedVideoRow([views[0]]), + _expandedVideoRow([views[1]]) + ], + )); + case 3: + return Container( + child: Column( + children: [ + _expandedVideoRow(views.sublist(0, 2)), + _expandedVideoRow(views.sublist(2, 3)) + ], + )); + case 4: + return Container( + child: Column( + children: [ + _expandedVideoRow(views.sublist(0, 2)), + _expandedVideoRow(views.sublist(2, 4)) + ], + )); + default: + } + return Container(); + } + + /// Toolbar layout + Widget _toolbar() { + if (widget.role == ClientRole.Audience) return Container(); + return Container( + alignment: Alignment.bottomCenter, + padding: const EdgeInsets.symmetric(vertical: 48), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + children: [ + RawMaterialButton( + onPressed: _onToggleMute, + child: Icon( + muted ? Icons.mic_off : Icons.mic, + color: muted ? Colors.white : Colors.blueAccent, + size: 20.0, + ), + shape: CircleBorder(), + elevation: 2.0, + fillColor: muted ? Colors.blueAccent : Colors.white, + padding: const EdgeInsets.all(12.0), + ), + RawMaterialButton( + onPressed: () => _onCallEnd(context), + child: Icon( + Icons.call_end, + color: Colors.white, + size: 35.0, + ), + shape: CircleBorder(), + elevation: 2.0, + fillColor: Colors.redAccent, + padding: const EdgeInsets.all(15.0), + ), + RawMaterialButton( + onPressed: _onSwitchCamera, + child: Icon( + Icons.switch_camera, + color: Colors.blueAccent, + size: 20.0, + ), + shape: CircleBorder(), + elevation: 2.0, + fillColor: Colors.white, + padding: const EdgeInsets.all(12.0), + ) + ], + ), + ); + } + + /// Info panel to show logs + Widget _panel() { + return Container( + padding: const EdgeInsets.symmetric(vertical: 48), + alignment: Alignment.bottomCenter, + child: FractionallySizedBox( + heightFactor: 0.5, + child: Container( + padding: const EdgeInsets.symmetric(vertical: 48), + child: ListView.builder( + reverse: true, + itemCount: _infoStrings.length, + itemBuilder: (BuildContext context, int index) { + if (_infoStrings.isEmpty) { + return null; + } + return Padding( + padding: const EdgeInsets.symmetric( + vertical: 3, + horizontal: 10, + ), + child: Row( + mainAxisSize: MainAxisSize.min, + children: [ + Flexible( + child: Container( + padding: const EdgeInsets.symmetric( + vertical: 2, + horizontal: 5, + ), + decoration: BoxDecoration( + color: Colors.yellowAccent, + borderRadius: BorderRadius.circular(5), + ), + child: Text( + _infoStrings[index], + style: TextStyle(color: Colors.blueGrey), + ), + ), + ) + ], + ), + ); + }, + ), + ), + ), + ); + } + + void _onCallEnd(BuildContext context) { + Navigator.pop(context); + } + + void _onToggleMute() { + setState(() { + muted = !muted; + }); + _engine.muteLocalAudioStream(muted); + } + + void _onSwitchCamera() { + _engine.switchCamera(); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + body: Center( + child: Stack( + children: [ + _viewRows(), + _panel(), + _toolbar(), + ], + ), + ), + ); + } +} diff --git a/lib/Community/commmunity.dart b/lib/Community/commmunity.dart index 8e9ff62..8599d3e 100644 --- a/lib/Community/commmunity.dart +++ b/lib/Community/commmunity.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:hackathon2/Community/communtity1.dart'; class Community extends StatefulWidget { @override @@ -7,32 +8,193 @@ class Community extends StatefulWidget { class _CommunityState extends State { List abc = ["Hello"]; + List abc1 = ['Group1', 'Group2', 'Group3']; @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar( - automaticallyImplyLeading: false, - backgroundColor: Colors.white, - elevation: 0, - title: Center( - child: Text( - "COMMUNITY", - style: TextStyle( - color: Colors.black, - letterSpacing: 5, - fontSize: 20, - fontWeight: FontWeight.w400), + appBar: AppBar( + automaticallyImplyLeading: false, + backgroundColor: Colors.white, + elevation: 0, + title: Center( + child: Text( + "COMMUNITY", + style: TextStyle( + color: Colors.black, + letterSpacing: 5, + fontSize: 20, + fontWeight: FontWeight.w400), + ), ), ), - ), - body: Column( - children: [ - SizedBox( - height: MediaQuery.of(context).size.height / 1.5, - ), - TextField() - ], - ), - ); + body: Column( + children: [ + GestureDetector( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => Community1( + groupname: "Texas Club", + ))); + }, + child: Card( + child: Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height / 8, + child: Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + SizedBox(height: 20), + Center( + child: Text( + "Texas Club", + style: TextStyle(color: Colors.black, fontSize: 18), + ), + ), + SizedBox( + height: 20, + ), + Align( + alignment: Alignment.bottomLeft, + child: Row( + children: [ + CircleAvatar( + radius: 20, + backgroundColor: Colors.transparent, + backgroundImage: + ExactAssetImage("assets/girl4.jpeg"), + ), + CircleAvatar( + radius: 20, + backgroundColor: Colors.transparent, + backgroundImage: + ExactAssetImage("assets/girl5.jpeg"), + ), + CircleAvatar( + radius: 20, + backgroundColor: Colors.transparent, + backgroundImage: + ExactAssetImage("assets/girl7.jpg"), + ), + ], + ), + ), + ], + ), + )), + ), + GestureDetector( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => Community1( + groupname: "California Support", + ))); + }, + child: Card( + child: Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height / 8, + child: Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + SizedBox(height: 20), + Center( + child: Text( + "California Support", + style: TextStyle(color: Colors.black, fontSize: 18), + ), + ), + SizedBox( + height: 20, + ), + Align( + alignment: Alignment.bottomLeft, + child: Row( + children: [ + CircleAvatar( + radius: 20, + backgroundColor: Colors.transparent, + backgroundImage: + ExactAssetImage("assets/girl8.jpeg"), + ), + CircleAvatar( + radius: 20, + backgroundColor: Colors.transparent, + backgroundImage: + ExactAssetImage("assets/girl9.jpeg"), + ), + CircleAvatar( + radius: 20, + backgroundColor: Colors.transparent, + backgroundImage: + ExactAssetImage("assets/girl10.jpeg"), + ), + ], + ), + ), + ], + ), + )), + ), + GestureDetector( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => Community1( + groupname: "GRP,san diego women grp", + ))); + }, + child: Card( + child: Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height / 8, + child: Column( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + SizedBox(height: 20), + Center( + child: Text( + "GRP,san diego women grp", + style: TextStyle(color: Colors.black, fontSize: 18), + ), + ), + SizedBox( + height: 20, + ), + Align( + alignment: Alignment.bottomLeft, + child: Row( + children: [ + CircleAvatar( + radius: 20, + backgroundColor: Colors.transparent, + backgroundImage: + ExactAssetImage("assets/girl11.jpeg"), + ), + CircleAvatar( + radius: 20, + backgroundColor: Colors.transparent, + backgroundImage: + ExactAssetImage("assets/girl12.jpeg"), + ), + CircleAvatar( + radius: 20, + backgroundColor: Colors.transparent, + backgroundImage: + ExactAssetImage("assets/girl13.jpeg"), + ), + ], + ), + ), + ], + ), + )), + ), + ], + )); } } diff --git a/lib/Community/communtity1.dart b/lib/Community/communtity1.dart new file mode 100644 index 0000000..a9f094e --- /dev/null +++ b/lib/Community/communtity1.dart @@ -0,0 +1,290 @@ +import 'dart:async'; + +import 'package:agora_rtc_engine/rtc_engine.dart'; +import 'package:delayed_display/delayed_display.dart'; +import 'package:flutter/material.dart'; +import 'package:hackathon2/Community/call.dart'; +import 'package:hackathon2/global.dart'; +import 'package:permission_handler/permission_handler.dart'; + +int f, g, k; +String text1, text2; + +class Community1 extends StatefulWidget { + final String groupname; + + const Community1({Key key, this.groupname}) : super(key: key); + @override + _Community1State createState() => _Community1State(); +} + +class _Community1State extends State { + TextEditingController controller = TextEditingController(); + + ClientRole _role = ClientRole.Broadcaster; + + Future onJoin() async { + // update input validation + // await for camera and mic permissions before pushing video page + await _handleCameraAndMic(); + // push video page with given channel name + await Navigator.push( + context, + MaterialPageRoute( + builder: (context) => CallPage1( + channelName: 'abc', + role: _role, + ), + ), + ); + } + + Future _handleCameraAndMic() async { + await PermissionHandler().requestPermissions( + [PermissionGroup.camera, PermissionGroup.microphone], + ); + } + + @override + Widget build(BuildContext context) { + return Scaffold( + appBar: AppBar( + actions: [ + IconButton( + icon: Icon( + Icons.video_call_outlined, + color: Colors.black, + ), + onPressed: () { + onJoin(); + }) + ], + leading: IconButton( + icon: Icon(Icons.arrow_back, color: Colors.black), + onPressed: () { + Navigator.pop(context); + setState(() { + f = 1; + g = 0; + }); + }), + backgroundColor: Colors.white, + elevation: 0, + title: Center( + child: Text( + widget.groupname, + style: TextStyle( + color: Colors.black, + letterSpacing: 5, + fontSize: 20, + fontWeight: FontWeight.w400), + ), + ), + ), + body: SingleChildScrollView( + child: Column( + children: [ + Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height / 1.5, + // color: Colors.green, + child: Column( + children: [ + if (f == 0) + DelayedDisplay( + delay: Duration(seconds: 0), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Align( + alignment: Alignment.centerRight, + child: Container( + width: MediaQuery.of(context).size.width / 1.8, + height: MediaQuery.of(context).size.width / 9, + decoration: BoxDecoration( + color: Colors.pink[100], + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + topRight: Radius.circular(10), + bottomRight: Radius.circular(10))), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + children: [ + CircleAvatar( + backgroundColor: Colors.transparent, + radius: 20, + backgroundImage: NetworkImage(globalimage), + ), + Center( + child: Text( + text1, + style: TextStyle( + color: Colors.black, fontSize: 20), + ), + ), + ], + ), + ), + ), + ), + ), + ), + SizedBox( + height: 20, + ), + if (g == 1) + DelayedDisplay( + delay: Duration(seconds: 5), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Align( + alignment: Alignment.centerLeft, + child: Container( + width: MediaQuery.of(context).size.width / 1.5, + height: MediaQuery.of(context).size.width / 9, + decoration: BoxDecoration( + color: Colors.pink[100], + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + topRight: Radius.circular(10), + bottomLeft: Radius.circular(10))), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + children: [ + CircleAvatar( + backgroundColor: Colors.transparent, + radius: 20, + backgroundImage: + ExactAssetImage("assets/girl4.jpeg"), + ), + Center( + child: Text( + "Welcome to our group", + style: TextStyle( + color: Colors.black, fontSize: 20), + ), + ), + ], + ), + ), + ), + ), + ), + ), + if (g == 1) + DelayedDisplay( + delay: Duration(seconds: 8), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Align( + alignment: Alignment.centerLeft, + child: Container( + width: MediaQuery.of(context).size.width / 1.8, + height: MediaQuery.of(context).size.width / 9, + decoration: BoxDecoration( + color: Colors.pink[100], + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + topRight: Radius.circular(10), + bottomLeft: Radius.circular(10))), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + children: [ + CircleAvatar( + backgroundColor: Colors.transparent, + backgroundImage: + ExactAssetImage('assets/girl6.jpeg'), + ), + Center( + child: Text( + "How are you doing ", + style: TextStyle( + color: Colors.black, fontSize: 20), + ), + ), + ], + ), + ), + ), + ), + ), + ), + if (g == 1) + DelayedDisplay( + delay: Duration(seconds: 10), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Align( + alignment: Alignment.centerLeft, + child: Container( + width: MediaQuery.of(context).size.width / 1.8, + height: MediaQuery.of(context).size.width / 9, + decoration: BoxDecoration( + color: Colors.pink[100], + borderRadius: BorderRadius.only( + topLeft: Radius.circular(10), + topRight: Radius.circular(10), + bottomLeft: Radius.circular(10))), + child: Padding( + padding: const EdgeInsets.all(8.0), + child: Row( + children: [ + CircleAvatar( + backgroundColor: Colors.transparent, + backgroundImage: + ExactAssetImage('assets/girl7.jpg'), + ), + Center( + child: Text( + "Hi", + style: TextStyle( + color: Colors.black, fontSize: 20), + ), + ), + ], + ), + ), + ), + ), + ), + ), + ], + ), + ), + SizedBox( + height: MediaQuery.of(context).size.height / 6.8, + ), + Row( + children: [ + Container( + width: MediaQuery.of(context).size.width / 1.2, + child: Padding( + padding: const EdgeInsets.all(8.0), + child: TextField( + controller: controller, + decoration: InputDecoration( + hintText: "Write Something", + ), + ), + ), + ), + IconButton( + icon: Icon(Icons.send), + onPressed: () { + text1 = controller.text; + controller.clear(); + setState(() { + f = 0; + g = 1; + }); + }) + ], + ) + ], + ), + ), + ); + } +} diff --git a/lib/Doctor/Login1 and signup1/SignUp1.dart b/lib/Doctor/Login1 and signup1/SignUp1.dart index c0aa62c..c35fc8f 100644 --- a/lib/Doctor/Login1 and signup1/SignUp1.dart +++ b/lib/Doctor/Login1 and signup1/SignUp1.dart @@ -30,23 +30,26 @@ class _SignUpState extends State { TextEditingController _exp = TextEditingController(); TextEditingController _fee = TextEditingController(); TextEditingController _deg = TextEditingController(); + TextEditingController _language = TextEditingController(); final _auth = FirebaseAuth.instance; bool check = false; final picker = ImagePicker(); String downloadurl; + String downloadurl1; File image1; + File image2; final databaseReference = FirebaseDatabase.instance.reference(); var uid = Uuid(); void _trysubmit(BuildContext ctx, String name, String email, String pwd, - String pwd1, String exp, String fee, String degree) { + String pwd1, String exp, String fee, String degree, String language) { final isvalid = formkey.currentState.validate(); FocusScope.of(ctx).unfocus(); if (isvalid) { formkey.currentState.save(); } else {} _submitAuthForm(name.trim(), email.trim(), pwd.trim(), pwd1.trim(), - exp.trim(), fee.trim(), degree.trim(), ctx); + exp.trim(), fee.trim(), degree.trim(), language.trim(), ctx); } void _submitAuthForm( @@ -57,6 +60,7 @@ class _SignUpState extends State { var exp, var fee, var degree, + var language, BuildContext ctx, ) async { try { @@ -75,7 +79,7 @@ class _SignUpState extends State { } catch (err) { print(err); } - add(name1, email1, pwd1, exp, fee, degree); + add(name1, email1, pwd1, exp, fee, degree, language); } Future uploadToStorage() async { @@ -118,8 +122,48 @@ class _SignUpState extends State { return downloadurl; } + Future uploadToStorage1() async { + try { + final DateTime now = DateTime.now(); + final int millSeconds = now.millisecondsSinceEpoch; + final String month = now.month.toString(); + final String date = now.day.toString(); + final String storageId = (millSeconds.toString() + uid.toString()); + final String today = ('$month-$date'); + + final file = await picker.getImage( + source: ImageSource.gallery, + imageQuality: 80, + ); + image2 = File(file.path); + uploadVideo(image2); + } catch (error) { + print(error); + } + } + + Future uploadVideo1(var videofile) async { + var uuid = new Uuid().v1(); + StorageReference ref = + FirebaseStorage.instance.ref().child("post_$uuid.jpg"); + + await ref.putFile(videofile).onComplete.then((val) { + val.ref.getDownloadURL().then((val) { + print(val); + downloadurl1 = val; + // add(downloadurl); //Val here is Already String + Future.delayed(Duration(seconds: 2), () { + setState(() { + // check = true; + }); + }); + }); + }); + return downloadurl1; + } + Future add(String username, String useremail, String passwd, String exp, - String fee, String degree) async { + String fee, String degree, String language1) async { // var uuid = new Uuid().v1(); DatabaseReference _color2 = databaseReference.child("Doctors").child(user); final TransactionResult transactionResult = @@ -137,6 +181,7 @@ class _SignUpState extends State { "exp": "true", "fee": "true", "degree": "true", + "language": "true", "uid": "true" }).then((_) { print('Transaction committed.'); @@ -155,6 +200,7 @@ class _SignUpState extends State { "exp": exp, "fee": fee, "degree": degree, + "language": language1, "uid": user }); } @@ -201,7 +247,12 @@ class _SignUpState extends State { SizedBox( height: 10, ), - Text("Add your profile image",style: TextStyle(fontSize: 17,),), + Text( + "Add your profile image", + style: TextStyle( + fontSize: 17, + ), + ), SizedBox( height: 10, ), @@ -362,7 +413,6 @@ class _SignUpState extends State { padding: const EdgeInsets.fromLTRB( 10, 0, 10, 10), child: TextFormField( - keyboardType: TextInputType.number, controller: _exp, style: TextStyle(color: Colors.black), decoration: InputDecoration( @@ -391,7 +441,6 @@ class _SignUpState extends State { padding: const EdgeInsets.fromLTRB( 10, 0, 10, 10), child: TextFormField( - keyboardType: TextInputType.number, controller: _fee, style: TextStyle(color: Colors.black), decoration: InputDecoration( @@ -439,26 +488,60 @@ class _SignUpState extends State { ), ), ), - Container( - height: 50, - width: 300, - color: Color(0xFFFFC0CB), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - crossAxisAlignment: CrossAxisAlignment.center, - children: [ - Icon( - MdiIcons.attachment, - size: 30, - ), - SizedBox( - width: 20, + Padding( + padding: + const EdgeInsets.fromLTRB(10, 0, 10, 0), + child: Container( + color: Colors.white10, + child: Padding( + padding: const EdgeInsets.fromLTRB( + 10, 0, 10, 10), + child: TextFormField( + controller: _language, + style: TextStyle(color: Colors.black), + decoration: InputDecoration( + hintText: "Language Known", + hintStyle: + TextStyle(color: Colors.black54), + focusedBorder: OutlineInputBorder( + borderRadius: + BorderRadius.circular(10), + ), + enabledBorder: OutlineInputBorder( + borderRadius: + BorderRadius.circular(10), + ), + ), ), - Text( - "Upload your documents\nto be verified.", - style: TextStyle(fontSize: 17), - ) - ], + ), + ), + ), + GestureDetector( + onTap: () { + uploadToStorage1(); + }, + child: Container( + height: 50, + width: 300, + color: Color(0xFFFFC0CB), + child: Row( + mainAxisAlignment: MainAxisAlignment.center, + crossAxisAlignment: + CrossAxisAlignment.center, + children: [ + Icon( + MdiIcons.attachment, + size: 30, + ), + SizedBox( + width: 20, + ), + Text( + "Upload your documents\nto be verified.", + style: TextStyle(fontSize: 17), + ) + ], + ), ), ), SizedBox( @@ -478,7 +561,8 @@ class _SignUpState extends State { _pwd1.text, _exp.text, _fee.text, - _deg.text); + _deg.text, + _language.text); }, child: Container( height: 40, diff --git a/lib/Donation/Organization.dart b/lib/Donation/Organization.dart index 428e5f5..e2c4922 100644 --- a/lib/Donation/Organization.dart +++ b/lib/Donation/Organization.dart @@ -209,7 +209,7 @@ class _OrganizationState extends State { Widget build(BuildContext context) { return Scaffold( appBar: AppBar( - automaticallyImplyLeading: false, + automaticallyImplyLeading: true, iconTheme: IconThemeData(color: Colors.black), backgroundColor: Colors.white, elevation: 0, diff --git a/lib/Donation/payment.dart b/lib/Donation/payment.dart index 4852461..c6e41a7 100644 --- a/lib/Donation/payment.dart +++ b/lib/Donation/payment.dart @@ -19,41 +19,48 @@ class _MyAppState extends State { @override Widget build(BuildContext context) { - return MaterialApp( - debugShowCheckedModeBanner: false, - home: Scaffold( - appBar: AppBar( - elevation: 0, - backgroundColor: Colors.white, - title: Center( - child: const Text('PAYMENT GATEWAY', - style: TextStyle( - letterSpacing: 5, - fontWeight: FontWeight.w400, - color: Colors.black, - )), - )), - body: Container( - child: Center( - child: GestureDetector( - onTap: openCheckout, - child: Container( - height: 200, - width: 200, - child: Center( - child: Text( - "PROCEED TO PAYMENT", - textAlign: TextAlign.center, - style: TextStyle( - color: Colors.white, - fontSize: 20, - letterSpacing: 2, - fontWeight: FontWeight.w800), + return Scaffold( + appBar: AppBar( + leading: IconButton( + icon: Icon( + Icons.arrow_back, + color: Colors.black, + ), + onPressed: () { + Navigator.pop(context); + }, + ), + automaticallyImplyLeading: false, + elevation: 0, + backgroundColor: Colors.white, + title: Center( + child: const Text('PAYMENT GATEWAY', + style: TextStyle( + letterSpacing: 5, + fontWeight: FontWeight.w400, + color: Colors.black, )), - decoration: BoxDecoration( - color: Colors.blue[700], - borderRadius: BorderRadius.all(Radius.circular(20)), - ), + )), + body: Container( + child: Center( + child: GestureDetector( + onTap: openCheckout, + child: Container( + height: 200, + width: 200, + child: Center( + child: Text( + "PROCEED TO PAYMENT", + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.white, + fontSize: 20, + letterSpacing: 2, + fontWeight: FontWeight.w800), + )), + decoration: BoxDecoration( + color: Colors.blue[700], + borderRadius: BorderRadius.all(Radius.circular(20)), ), ), ), diff --git a/lib/SelfAssesmentrep.dart b/lib/SelfAssesmentrep.dart index fe898d0..2cbfc7c 100644 --- a/lib/SelfAssesmentrep.dart +++ b/lib/SelfAssesmentrep.dart @@ -1,6 +1,9 @@ import 'package:flutter/material.dart'; +import 'package:hackathon2/messages.dart'; import 'package:percent_indicator/percent_indicator.dart'; +import 'Choices/Choices.dart'; + class SelfReport extends StatefulWidget { @override _SelfReportState createState() => _SelfReportState(); @@ -35,8 +38,8 @@ class _SelfReportState extends State { lineWidth: 20.0, percent: 0.4, center: new Text("40%"), - progressColor: Colors.green[500], - backgroundColor: Colors.red[600], + progressColor: Colors.red[600], + backgroundColor: Colors.green[500], ), SizedBox( height: 80, @@ -91,32 +94,48 @@ class _SelfReportState extends State { color: Colors.black12, child: Row( children: [ - Container( - width: 150, - height: 50, - color: Colors.blue[900], - child: Center( - child: Text( - "Retake\nAssessment", - textAlign: TextAlign.center, - style: TextStyle( - color: Colors.white, - fontSize: 16, - fontWeight: FontWeight.w500), - )), + GestureDetector( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => Message())); + }, + child: Container( + width: 150, + height: 50, + color: Colors.blue[900], + child: Center( + child: Text( + "Retake\nAssessment", + textAlign: TextAlign.center, + style: TextStyle( + color: Colors.white, + fontSize: 16, + fontWeight: FontWeight.w500), + )), + ), ), - Container( - width: 150, - height: 50, - color: Colors.blue[100], - child: Center( - child: Text( - "End Now", - style: TextStyle( - color: Colors.black, - fontSize: 16, - fontWeight: FontWeight.w500), - )), + GestureDetector( + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => Choices())); + }, + child: Container( + width: 150, + height: 50, + color: Colors.blue[100], + child: Center( + child: Text( + "End Now", + style: TextStyle( + color: Colors.black, + fontSize: 16, + fontWeight: FontWeight.w500), + )), + ), ) ], ), diff --git a/lib/messages.dart b/lib/messages.dart index ec8e310..f18dbb0 100644 --- a/lib/messages.dart +++ b/lib/messages.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:hackathon2/SelfAssesmentrep.dart'; import 'package:hexcolor/hexcolor.dart'; class Message extends StatefulWidget { @@ -1543,6 +1544,17 @@ class _MessageState extends State { ), ), ), + if (f25 == 0) + Center( + child: RaisedButton( + child: Text("Check the analysis"), + onPressed: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => SelfReport())); + }), + ) ], ), )); diff --git a/lib/onboarding/onboarding.dart b/lib/onboarding/onboarding.dart index cc89aeb..fb2f885 100644 --- a/lib/onboarding/onboarding.dart +++ b/lib/onboarding/onboarding.dart @@ -1,5 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flutter/services.dart'; +import 'package:hackathon2/Chooselanguage.dart'; import 'package:introduction_screen/introduction_screen.dart'; import '../1.dart'; @@ -30,7 +31,7 @@ class _OnBoardingPageState extends State { void _onIntroEnd(context) { Navigator.of(context).push( - MaterialPageRoute(builder: (_) => One()), + MaterialPageRoute(builder: (_) => Language()), ); } diff --git a/pubspec.lock b/pubspec.lock index 5f7e76c..1a78282 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -106,6 +106,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.3" + delayed_display: + dependency: "direct main" + description: + name: delayed_display + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.3" dio: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 41cc90c..73f40e9 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -45,6 +45,7 @@ dependencies: permission_handler: ^3.0.0 agora_rtc_engine: ^3.0.1-dev.7 uuid: ^2.0.4 + delayed_display: ^1.0.3 image_picker: ^0.6.3+1 bubble: material_design_icons_flutter: ^4.0.5655 @@ -79,6 +80,19 @@ flutter: - assets/1.jpg - assets/home.gif - assets/self.gif + - assets/girl1.jpeg + - assets/girl2.jpeg + - assets/girl3.jpeg + - assets/girl4.jpeg + - assets/girl5.jpeg + - assets/girl6.jpeg + - assets/girl7.jpg + - assets/girl8.jpeg + - assets/girl9.jpeg + - assets/girl10.jpeg + - assets/girl11.jpeg + - assets/girl12.jpeg + - assets/girl13.jpeg - assets/2.jpg - assets/3.jpg - assets/4.jpg