From 1180f4b949d214f4f8727b8b98de0682a1fee016 Mon Sep 17 00:00:00 2001 From: Chintan-K <60056833+Chintan-K@users.noreply.github.com> Date: Sun, 21 Mar 2021 13:26:06 +0530 Subject: [PATCH 1/6] Update README.md --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6fbdc43a..db7ffe0e 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,11 @@ Codephile is an application specially made for all the competitive oders out there. With features like submission feed, context reminders, user search and many more this app is a perfect companion for stalking your fellow coders and learning from them. +## Screenshots + + + + ## Getting Started Project structure:- @@ -17,7 +22,6 @@ Project structure:- |-ios |-test ``` - ## How to Contribute We'd love to accept your patches and contributions to this project. There are just a few small guidelines you need to follow. From c853268fe87c9e5a20759ed95a112b6d1bf4697f Mon Sep 17 00:00:00 2001 From: Chintan-K <60056833+Chintan-K@users.noreply.github.com> Date: Sun, 21 Mar 2021 13:30:35 +0530 Subject: [PATCH 2/6] docs : added screenshots and restored typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index db7ffe0e..4a65755a 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Codephile -Codephile is an application specially made for all the competitive oders out there. With features like submission feed, context reminders, user search and many more this app is a perfect companion for stalking your fellow coders and learning from them. +Codephile is an application specially made for all the competitive coders out there. With features like submission feed, contest reminders, user search, and many more, this app is a perfect companion for stalking your fellow coders and learning from them. ## Screenshots From 4158815b0c1d0909f270735f513267b1cfcbbba1 Mon Sep 17 00:00:00 2001 From: Chintan-K <60056833+Chintan-K@users.noreply.github.com> Date: Sun, 21 Mar 2021 13:33:39 +0530 Subject: [PATCH 3/6] docs : added screenshots and restored typo --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 4a65755a..253247da 100644 --- a/README.md +++ b/README.md @@ -22,6 +22,7 @@ Project structure:- |-ios |-test ``` + ## How to Contribute We'd love to accept your patches and contributions to this project. There are just a few small guidelines you need to follow. From ef892aa937fd0e9b59527349d994c10c0dd05fa1 Mon Sep 17 00:00:00 2001 From: Chintan-K <60056833+Chintan-K@users.noreply.github.com> Date: Sun, 21 Mar 2021 20:18:34 +0530 Subject: [PATCH 4/6] chor: Remove redundant MaterialApp widget --- lib/main.dart | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/lib/main.dart b/lib/main.dart index 72cf9877..5bc1530e 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -77,16 +77,18 @@ Future main() async { print(message.toString()); }, ); - runApp(MaterialApp(home: MyApp())); + runApp( + MaterialApp( + home: MyApp(), + debugShowCheckedModeBanner: false, + ), + ); } class MyApp extends StatelessWidget { @override Widget build(BuildContext context) { - return new MaterialApp( - debugShowCheckedModeBanner: false, - home: new ChooseHome(), - ); + return new ChooseHome(); } } From b3ada20b56d6a00ec77b26890a6b3e67c5b48e84 Mon Sep 17 00:00:00 2001 From: Chintan-K <60056833+Chintan-K@users.noreply.github.com> Date: Tue, 23 Mar 2021 15:29:44 +0530 Subject: [PATCH 5/6] bfix : solved bottom overflowed --- lib/screens/signup/signup4.dart | 76 +++++++++++++++++---------------- 1 file changed, 39 insertions(+), 37 deletions(-) diff --git a/lib/screens/signup/signup4.dart b/lib/screens/signup/signup4.dart index d70e27b4..dbb9fa64 100644 --- a/lib/screens/signup/signup4.dart +++ b/lib/screens/signup/signup4.dart @@ -82,44 +82,46 @@ class _SignUpPageState extends State { key: _scaffoldKey, body: Form( key: _formKey, - child: new Column( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ((isCreateAccountButtonTapped) || (isCreateAccountSuccessful)) - ? Expanded( - child: Center( - child: CircularProgressIndicator(), + child: SingleChildScrollView( + child: new Column( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + ((isCreateAccountButtonTapped) || (isCreateAccountSuccessful)) + ? Expanded( + child: Center( + child: CircularProgressIndicator(), + ), + ) + : Column( + children: [ + ProgressTabBar(4), + Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SizedBox( + height: MediaQuery.of(context).size.height / + 15), + Text( + 'Setup a username and password for Codephile', + style: TextStyle( + fontSize: 20.0, + fontWeight: FontWeight.bold)), + SizedBox(height: 25.0), + _showUsernameInput(), + SizedBox(height: 15.0), + _showPasswordInput(), + ], + ), + ) + ], ), - ) - : Column( - children: [ - ProgressTabBar(4), - Padding( - padding: const EdgeInsets.all(16.0), - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SizedBox( - height: - MediaQuery.of(context).size.height / 15), - Text( - 'Setup a username and password for Codephile', - style: TextStyle( - fontSize: 20.0, - fontWeight: FontWeight.bold)), - SizedBox(height: 25.0), - _showUsernameInput(), - SizedBox(height: 15.0), - _showPasswordInput(), - ], - ), - ) - ], - ), - _showCreateAccountButton(), - ], + _showCreateAccountButton(), + ], + ), ), ), ), From 95a0b4c8c30209453d5431900d75e40a3b36175f Mon Sep 17 00:00:00 2001 From: Chintan-K <60056833+Chintan-K@users.noreply.github.com> Date: Tue, 23 Mar 2021 19:22:18 +0530 Subject: [PATCH 6/6] ptch: search screen inside safearea --- lib/screens/search/search_page.dart | 198 ++++++++++++++-------------- 1 file changed, 101 insertions(+), 97 deletions(-) diff --git a/lib/screens/search/search_page.dart b/lib/screens/search/search_page.dart index 89b96761..cc6a5f3e 100644 --- a/lib/screens/search/search_page.dart +++ b/lib/screens/search/search_page.dart @@ -47,110 +47,114 @@ class _SearchPageState extends State { return Scaffold( resizeToAvoidBottomInset: false, backgroundColor: Colors.white, - body: Column( - children: [ - Padding( - padding: const EdgeInsets.fromLTRB(16.0, 40.0, 16.0, 8.0), - child: Container( - decoration: BoxDecoration( - color: const Color.fromRGBO(243, 244, 247, 1), - borderRadius: BorderRadius.all(Radius.circular(2.0)), - ), - child: Row( - crossAxisAlignment: CrossAxisAlignment.center, - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Container( - width: MediaQuery.of(context).size.width * 0.7, - child: Padding( - padding: const EdgeInsets.fromLTRB(8.0, 4.0, 2.0, 4.0), - child: TextField( - controller: _controller, - decoration: InputDecoration.collapsed( - hintText: inputHint, - hintStyle: TextStyle( - fontSize: 17.0, - color: secondaryTextGrey, - )), - onSubmitted: (text) { - text = text.trim(); - if (text != "") { - _handleSearch(text); - } - }, - style: TextStyle( - color: const Color.fromRGBO( - 36, 36, 36, 1), //TODO: use color resources + body: SafeArea( + child: Column( + children: [ + Padding( + padding: const EdgeInsets.fromLTRB(16.0, 16.0, 16.0, 8.0), + child: Container( + decoration: BoxDecoration( + color: const Color.fromRGBO(243, 244, 247, 1), + borderRadius: BorderRadius.all(Radius.circular(2.0)), + ), + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Container( + width: MediaQuery.of(context).size.width * 0.7, + child: Padding( + padding: + const EdgeInsets.fromLTRB(8.0, 4.0, 2.0, 4.0), + child: TextField( + controller: _controller, + decoration: InputDecoration.collapsed( + hintText: inputHint, + hintStyle: TextStyle( + fontSize: 17.0, + color: secondaryTextGrey, + )), + onSubmitted: (text) { + text = text.trim(); + if (text != "") { + _handleSearch(text); + } + }, + style: TextStyle( + color: const Color.fromRGBO( + 36, 36, 36, 1), //TODO: use color resources + ), ), ), ), - ), - IconButton( - //TODO: use search icon from designs - padding: EdgeInsets.fromLTRB(8.0, 1.0, 2.0, 4.0), - icon: Icon( - Icons.search, - size: 30.0, - color: const Color.fromRGBO(141, 141, 141, 1), + IconButton( + //TODO: use search icon from designs + padding: EdgeInsets.fromLTRB(8.0, 1.0, 2.0, 4.0), + icon: Icon( + Icons.search, + size: 30.0, + color: const Color.fromRGBO(141, 141, 141, 1), + ), + onPressed: () { + if (_controller.text.trim() != "") { + _handleSearch(_controller.text.trim()); + } + }, ), - onPressed: () { - if (_controller.text.trim() != "") { - _handleSearch(_controller.text.trim()); - } - }, - ), - ], + ], + ), ), ), - ), - Expanded( - child: _isSearching == true - ? Center( - child: CircularProgressIndicator(), - ) - : isResultNull - ? Center( - child: Text( - "No matching users found", - style: TextStyle( - fontSize: 16.0, - color: const Color.fromRGBO(36, 36, 36, 1), - ), - ), - ) - : ((showRecentSearches) && - (_recentlySearchedUsers != null) && - (_recentlySearchedUsers.length != 0)) - ? recentSearches() - : ListView.builder( - shrinkWrap: true, - padding: EdgeInsets.fromLTRB(0.0, 8.0, 0.0, 8.0), - itemCount: searchResult.length, - itemBuilder: (BuildContext context, int index) { - CodephileUser user = searchResult[index]; - return GestureDetector( - child: SearchResultCard( - token, - user.fullname, - user.username, - user.picture, - ), - onTap: () { - addToRecentSearches(user); - Navigator.push( - context, - MaterialPageRoute( - builder: (context) => new Profile( - token, - user.id, - (widget.uId == user.id), - true))); - }, - ); - }, + Expanded( + child: _isSearching == true + ? Center( + child: CircularProgressIndicator(), + ) + : isResultNull + ? Center( + child: Text( + "No matching users found", + style: TextStyle( + fontSize: 16.0, + color: const Color.fromRGBO(36, 36, 36, 1), + ), ), - ) - ], + ) + : ((showRecentSearches) && + (_recentlySearchedUsers != null) && + (_recentlySearchedUsers.length != 0)) + ? recentSearches() + : ListView.builder( + shrinkWrap: true, + padding: + EdgeInsets.fromLTRB(0.0, 8.0, 0.0, 8.0), + itemCount: searchResult.length, + itemBuilder: (BuildContext context, int index) { + CodephileUser user = searchResult[index]; + return GestureDetector( + child: SearchResultCard( + token, + user.fullname, + user.username, + user.picture, + ), + onTap: () { + addToRecentSearches(user); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => new Profile( + token, + user.id, + (widget.uId == user.id), + true))); + }, + ); + }, + ), + ) + ], + ), )); }