diff --git a/assets/images/aadhaar.jpg b/assets/images/aadhaar.jpg deleted file mode 100644 index c9a09d8..0000000 Binary files a/assets/images/aadhaar.jpg and /dev/null differ diff --git a/assets/images/pan.jpg b/assets/images/pan.jpg deleted file mode 100644 index 1ff20e9..0000000 Binary files a/assets/images/pan.jpg and /dev/null differ diff --git a/assets/images/po.svg b/assets/images/po.svg deleted file mode 100644 index 311c228..0000000 --- a/assets/images/po.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/lib/main.dart b/lib/main.dart index bc2df60..0d3a585 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -340,7 +340,7 @@ class GeolocationExampleState extends State { }, ), IconButton( - icon: Icon(Icons.chat), + icon: Icon(Icons.assistant), onPressed: () { // _handlePressButton(); }, diff --git a/lib/screens/bankUploads.dart b/lib/screens/bankUploads.dart index 8286464..356a80d 100644 --- a/lib/screens/bankUploads.dart +++ b/lib/screens/bankUploads.dart @@ -118,7 +118,7 @@ class MyCustomFormState extends State { "uniqueId": code }); await http.post( - 'http://205afcdfb1fb.ngrok.io/account/sendOtp/', + 'http://jandhan2.herokuapp.com/account/sendOtp/', headers: { 'Content-Type': 'application/json; charset=UTF-8', }, @@ -389,28 +389,28 @@ class MyCustomFormState extends State { Column( children: [ GestureDetector( - // onTap: () => getImage(1), + onTap: () => null, //getImage(1), child: Container( - height: 180, - child: (_aadharImage != null) - ? Image.file( - _aadharImage, - fit: BoxFit.fill, - ) - : Container( - height: 180, - width: 375, - decoration: BoxDecoration( - color: Colors.blueGrey[50], - borderRadius: - BorderRadius.all(Radius.circular(5.0))), - child: Padding( - padding: EdgeInsets.only(top: 75.0), - child: Column(children: [ - Icon(Icons.linked_camera), - Text('Add Passport Size Photo') - ]))), - )), + height: 180, + child: (_aadharImage != null) + ? Image.file( + _aadharImage, + fit: BoxFit.fill, + ) + : Container( + height: 180, + width: 375, + decoration: BoxDecoration( + color: Colors.blueGrey[50], + borderRadius: BorderRadius.all( + Radius.circular(5.0))), + child: Padding( + padding: EdgeInsets.only(top: 75.0), + child: Column(children: [ + Icon(Icons.linked_camera), + Text('Add Passport Size Photo') + ]))), + )), SizedBox( height: 15.0, ), @@ -468,6 +468,32 @@ class MyCustomFormState extends State { SizedBox( height: 15.0, ), + GestureDetector( + onTap: () => null, //getImage(1), + child: Container( + height: 180, + child: (_aadharImage != null) + ? Image.file( + _aadharImage, + fit: BoxFit.fill, + ) + : Container( + height: 180, + width: 375, + decoration: BoxDecoration( + color: Colors.blueGrey[50], + borderRadius: + BorderRadius.all(Radius.circular(5.0))), + child: Padding( + padding: EdgeInsets.only(top: 75.0), + child: Column(children: [ + Icon(Icons.linked_camera), + Text('Add Signature') + ]))), + )), + SizedBox( + height: 15.0, + ), Container( width: 375, height: 49.0, diff --git a/lib/screens/updatesScreen.dart b/lib/screens/updatesScreen.dart index 7c8552d..5c78dfe 100644 --- a/lib/screens/updatesScreen.dart +++ b/lib/screens/updatesScreen.dart @@ -1,15 +1,19 @@ import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; import 'dart:convert'; +import 'package:url_launcher/url_launcher.dart'; class UpdateScreen extends StatelessWidget { @override Widget build(BuildContext context) { - return MaterialApp( - theme: ThemeData( - primarySwatch: Colors.blue, - ), - home: UserList(), + return Scaffold( + appBar: AppBar( + title: Text('Latest Updates'), + automaticallyImplyLeading: true, + leading: IconButton( + icon: Icon(Icons.arrow_back), + onPressed: () => Navigator.pop(context, false))), + body: UserList(), ); } } @@ -44,7 +48,7 @@ class _UserListState extends State { return _users.length != 0 ? RefreshIndicator( child: ListView.builder( - padding: EdgeInsets.all(8), + padding: EdgeInsets.all(8.0), itemCount: _users.length, itemBuilder: (BuildContext context, int index) { return Card( @@ -93,9 +97,6 @@ class _UserListState extends State { @override Widget build(BuildContext context) { return Scaffold( - appBar: AppBar( - title: Text("Latest Updates"), - ), body: Container( child: _buildList(), ), @@ -105,94 +106,106 @@ class _UserListState extends State { class DetailsScreen extends StatelessWidget { final desc; - // In the constructor, require a Todo. + + _launchURL(data) async { + if (await canLaunch(data)) { + await launch(data); + } else { + throw 'Could not launch $data'; + } + } + DetailsScreen({Key key, @required this.desc}) : super(key: key); @override Widget build(BuildContext context) { - return MaterialApp( - theme: ThemeData( - primarySwatch: Colors.blue, - ), - home: Scaffold( - appBar: AppBar( - title: Text('Detail Information'), - ), - body: Builder(builder: (context) { - return Card( - color: Colors.white, - margin: const EdgeInsets.all(20.0), - child: Padding( - padding: const EdgeInsets.all(5.0), - child: Column( - children: [ - Text( - desc['title'], - style: TextStyle( - fontSize: 20.0, - fontWeight: FontWeight.w700, - ), - ), - SizedBox( - height: 20.0, - ), - Image( - image: NetworkImage(desc['imageUrl']), - ), - SizedBox( - height: 20.0, - ), - Center( - child: Text( - desc['description'], - style: TextStyle( - fontSize: 14.0, - fontWeight: FontWeight.w700, - ), - ), - ), - SizedBox( - height: 20.0, + return Scaffold( + appBar: AppBar( + title: Text('Detailed Information'), + automaticallyImplyLeading: true, + leading: IconButton( + icon: Icon(Icons.arrow_back), + onPressed: () => Navigator.pop(context, false))), + body: Builder(builder: (context) { + return Card( + color: Colors.white, + child: Padding( + padding: const EdgeInsets.all(10.0), + child: Column( + children: [ + Text( + desc['title'], + style: TextStyle( + fontSize: 20.0, + fontWeight: FontWeight.w700, + ), + ), + SizedBox( + height: 20.0, + ), + Image( + image: NetworkImage(desc['imageUrl']), + height: 200.0, + width: 200.0, + ), + SizedBox( + height: 20.0, + ), + Center( + child: Text( + desc['description'], + style: TextStyle( + fontSize: 14.0, ), - Text( - "Additional File Url " + desc['additionalFileUrl'], + ), + ), + SizedBox( + height: 20.0, + ), + Text( + "Additional File Url", + style: TextStyle(fontWeight: FontWeight.bold), + ), + GestureDetector( + onTap: () => _launchURL(desc['additionalFileUrl']), + child: Text( + desc['additionalFileUrl'], textAlign: TextAlign.center, style: TextStyle( - fontSize: 14.0, - fontWeight: FontWeight.w700, - ), - ), - SizedBox(height: 10.0), - Text( - "Location " + desc['location'], - style: TextStyle( - fontSize: 20.0, - fontWeight: FontWeight.w700, - ), - ), - SizedBox( - height: 10.0, - ), - Text( - "Date and Time " + desc['date'] + " " + desc['time'], - style: TextStyle( - fontSize: 18.0, - fontWeight: FontWeight.w700, - ), - ), - SizedBox( - height: 10.0, - ), - Text( - "Post By: " + desc['postBy'], - style: TextStyle( - fontSize: 20.0, - fontWeight: FontWeight.w700, - ), - ), - ], + fontSize: 14.0, + fontWeight: FontWeight.w700, + textBaseline: TextBaseline.ideographic, + color: Colors.blue[600]), + )), + SizedBox(height: 10.0), + Text( + "Location: " + desc['location'], + style: TextStyle( + fontSize: 18.0, + fontWeight: FontWeight.w700, + ), + ), + SizedBox( + height: 10.0, ), - ), - ); - }))); + Text( + "Date and Time: " + desc['date'] + " " + desc['time'], + style: TextStyle( + fontSize: 18.0, + ), + ), + SizedBox( + height: 10.0, + ), + Text( + "Posted By: " + desc['postBy'], + style: TextStyle( + fontSize: 18.0, + ), + ), + ], + ), + ), + ); + })); } }