diff --git a/find_mentor/README.md b/find_mentor/README.md index beb311f..fca4fde 100644 --- a/find_mentor/README.md +++ b/find_mentor/README.md @@ -60,7 +60,7 @@ Meet -> Ask -> Listen -> Learn -> Change Your Career - [x] Events Page - [x] Jobs Page (If you tap the company logo on the details page. You can go to the company website.) - [x] Home Page -- [ ] ... +- [x] Mentee & Mentors GitHub README (HTML problem) ## API @@ -195,6 +195,10 @@ Mentees Detail Page | Mentees Detail Page | Mentees De :-------------------------:|:-------------------------:|:-------------------------:|:-------------------------: ![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/41.png?raw=true)|![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/42.png?raw=true)|![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/43.png?raw=true)|![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/44.png?raw=true)| +Mentees Detail Page | Mentees Detail Page | Mentees Detail Page | Mentees Detail Page +:-------------------------:|:-------------------------:|:-------------------------:|:-------------------------: +![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/49.png?raw=true)|![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/50.png?raw=true)|![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/51.png?raw=true)|![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/52.png?raw=true)| + Jobs Page (Top) | Jobs Page | Jobs Page | Jobs Page (Bottom) :-------------------------:|:-------------------------:|:-------------------------:|:-------------------------: ![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/21.png?raw=true)|![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/22.png?raw=true)|![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/23.png?raw=true)|![](https://github.com/YunusEmreAlps/Flutter_find-mentor-mobil/blob/master/find_mentor/ss/24.png?raw=true)| diff --git a/find_mentor/assets/images/company.png b/find_mentor/assets/images/company.png index 5b6a094..8f2f065 100644 Binary files a/find_mentor/assets/images/company.png and b/find_mentor/assets/images/company.png differ diff --git a/find_mentor/assets/images/company2.png b/find_mentor/assets/images/company2.png index 8f2f065..5b6a094 100644 Binary files a/find_mentor/assets/images/company2.png and b/find_mentor/assets/images/company2.png differ diff --git a/find_mentor/assets/images/user.png b/find_mentor/assets/images/user.png index cd743f1..eaee9dd 100644 Binary files a/find_mentor/assets/images/user.png and b/find_mentor/assets/images/user.png differ diff --git a/find_mentor/assets/images/user2.png b/find_mentor/assets/images/user2.png index eaee9dd..cd743f1 100644 Binary files a/find_mentor/assets/images/user2.png and b/find_mentor/assets/images/user2.png differ diff --git a/find_mentor/lib/core/constants/image/app_images.dart b/find_mentor/lib/core/constants/image/app_images.dart index 9ee2a02..1202fda 100644 --- a/find_mentor/lib/core/constants/image/app_images.dart +++ b/find_mentor/lib/core/constants/image/app_images.dart @@ -12,16 +12,8 @@ class AppImages { static String get pngLoginBackground => "assets/images/bg2.png"; // - static String get pngUser => "assets/images/user2.png"; - static String get pngCompanyImage => "assets/images/company2.png"; - - // Onboard - static String get pngSlider1 => "assets/images/onboard/onboarding_image_1.png"; // onboarding_image_1 - static String get pngSlider2 => "assets/images/onboard/onboarding_image_2.png"; // onboarding_image_2 - static String get pngSlider3 => "assets/images/onboard/onboarding_image_3.png"; // onboarding_image_3 - - // Login Success - static String get pngSuccess => "assets/images/success/success.png"; + static String get pngUser => "assets/images/user.png"; + static String get pngCompanyImage => "assets/images/company.png"; // Icons static String get iconJoin => "assets/icons/Join.svg"; @@ -40,7 +32,6 @@ class AppImages { static String get iconMessage2 => "assets/icons/icon_message2.svg"; static String get iconMessage3 => "assets/icons/icon_message3.svg"; static String get iconMessage4 => "assets/icons/icon_message4.svg"; - static String get iconMentorGitHub => "assets/icons/Github2.svg"; static String get iconMentorTwitter => "assets/icons/Twitter2.svg"; static String get iconMentorLinkedin => "assets/icons/Linkedin3.svg"; diff --git a/find_mentor/lib/ui/components/personsdetailpage/person_github_card.dart b/find_mentor/lib/ui/components/personsdetailpage/person_github_card.dart index 8c5d3fa..19d7c59 100644 --- a/find_mentor/lib/ui/components/personsdetailpage/person_github_card.dart +++ b/find_mentor/lib/ui/components/personsdetailpage/person_github_card.dart @@ -60,32 +60,30 @@ class PersonGitHubCard extends StatelessWidget { ), ), SizedBox(height: 12), - (model.github.length != 0) - ? FutureBuilder( - future: fetchReadMe(model.github.substring(19)), - builder: (context, snapshot) { - if (snapshot.hasData) { - return MarkdownBody( - selectable: true, - shrinkWrap: true, - fitContent: true, - data: snapshot.data, - styleSheet: - MarkdownStyleSheet.fromTheme(Theme.of(context)) - .copyWith( - p: Theme.of(context).textTheme.body1.copyWith( - fontSize: 14.0, - fontFamily: "Gilroy", - color: AppColors.jobTextLink), - ), - onTapLink: (url) { - Utility.launchURL(url); - }, - ); - } - return Container(); - }) - : Container(), + FutureBuilder( + future: fetchReadMe(model.github.substring(19)), + builder: (context, snapshot) { + if (snapshot.hasData) { + return MarkdownBody( + selectable: true, + shrinkWrap: true, + fitContent: true, + data: snapshot.data, + styleSheet: + MarkdownStyleSheet.fromTheme(Theme.of(context)).copyWith( + p: Theme.of(context).textTheme.body1.copyWith( + fontSize: 14.0, + fontFamily: "Gilroy", + color: AppColors.jobTextLink), + ), + onTapLink: (url) { + Utility.launchURL(url); + }, + ); + } + return Container(); + }, + ), ], ), ); diff --git a/find_mentor/lib/ui/view/home/persons_detail_page/persons_detail_page_body.dart b/find_mentor/lib/ui/view/home/persons_detail_page/persons_detail_page_body.dart index 2ff51bb..d8f76d0 100644 --- a/find_mentor/lib/ui/view/home/persons_detail_page/persons_detail_page_body.dart +++ b/find_mentor/lib/ui/view/home/persons_detail_page/persons_detail_page_body.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; // Project imports: import 'package:find_mentor/core/init/size_config.dart'; import 'package:find_mentor/core/model/person.dart'; +import 'package:find_mentor/core/service/fetchReadMe.dart'; import 'package:find_mentor/ui/components/personsdetailpage/person_card.dart'; import 'package:find_mentor/ui/components/personsdetailpage/person_description_card.dart'; import 'package:find_mentor/ui/components/personsdetailpage/person_github_card.dart'; @@ -63,14 +64,23 @@ class _PersonsDetailPageBodyState extends State { curve: Curves.linearToEaseOut); }), SizedBox(height: 16), - PersonGitHubCard( - model: widget.personDetail, - onApplyTap: () { - controller.animateTo( - controller.position.maxScrollExtent, - duration: Duration(milliseconds: 500), - curve: Curves.linearToEaseOut); - }), + FutureBuilder( + future: fetchReadMe(widget.personDetail.github.substring(19)), + builder: (context, snapshot) { + if (snapshot.hasData) { + return PersonGitHubCard( + model: widget.personDetail, + onApplyTap: () { + controller.animateTo( + controller.position.maxScrollExtent, + duration: Duration(milliseconds: 100), + curve: Curves.linearToEaseOut); + }, + ); + } + return Container(); + }, + ), ], ), ), diff --git a/find_mentor/ss/49.png b/find_mentor/ss/49.png new file mode 100644 index 0000000..b03c14d Binary files /dev/null and b/find_mentor/ss/49.png differ diff --git a/find_mentor/ss/50.png b/find_mentor/ss/50.png new file mode 100644 index 0000000..30c7037 Binary files /dev/null and b/find_mentor/ss/50.png differ diff --git a/find_mentor/ss/51.png b/find_mentor/ss/51.png new file mode 100644 index 0000000..99db086 Binary files /dev/null and b/find_mentor/ss/51.png differ diff --git a/find_mentor/ss/52.png b/find_mentor/ss/52.png new file mode 100644 index 0000000..05aaa17 Binary files /dev/null and b/find_mentor/ss/52.png differ