diff --git a/README.md b/README.md index d9e571f..5cbc1eb 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,3 @@ # PORTFOLIO Il s’agit d’un portfolio que j’ai avec Flutter créé pour mettre en valeur mes compétences et mon expérience. - - - -## Credits - -**Design** : Pour la sctructure du design je me suis inspirer de Mike | Creative Mints mais j'ai modifié plusieurs widget. -**Image** : Pour l'image dans la photo de couverture c'est le travaille de 梁 白开 \ No newline at end of file diff --git a/assets/audios/wellcome_audio.mp3 b/assets/audios/wellcome_audio.mp3 deleted file mode 100644 index f7e2ce9..0000000 Binary files a/assets/audios/wellcome_audio.mp3 and /dev/null differ diff --git a/assets/images/ani_v.png b/assets/images/ani_v.png deleted file mode 100755 index 7e8ece4..0000000 Binary files a/assets/images/ani_v.png and /dev/null differ diff --git a/assets/images/avg.png b/assets/images/avg.png deleted file mode 100644 index 51e83c9..0000000 Binary files a/assets/images/avg.png and /dev/null differ diff --git a/assets/images/avg.webp b/assets/images/avg.webp new file mode 100644 index 0000000..38aa14b Binary files /dev/null and b/assets/images/avg.webp differ diff --git a/assets/images/buildeo.png b/assets/images/buildeo.png deleted file mode 100644 index ca9bb6f..0000000 Binary files a/assets/images/buildeo.png and /dev/null differ diff --git a/assets/images/buildeo.webp b/assets/images/buildeo.webp new file mode 100644 index 0000000..8bfdb7b Binary files /dev/null and b/assets/images/buildeo.webp differ diff --git a/assets/images/cher_project.jpg b/assets/images/cher_project.jpg deleted file mode 100755 index dd892ea..0000000 Binary files a/assets/images/cher_project.jpg and /dev/null differ diff --git a/assets/images/cher_project.webp b/assets/images/cher_project.webp new file mode 100644 index 0000000..f0fbd7c Binary files /dev/null and b/assets/images/cher_project.webp differ diff --git a/assets/images/croquis_cover.png b/assets/images/croquis_cover.png deleted file mode 100755 index a6a21f6..0000000 Binary files a/assets/images/croquis_cover.png and /dev/null differ diff --git a/assets/images/croquis_cover.webp b/assets/images/croquis_cover.webp new file mode 100644 index 0000000..a3a4902 Binary files /dev/null and b/assets/images/croquis_cover.webp differ diff --git a/assets/images/dekoa.png b/assets/images/dekoa.png deleted file mode 100644 index d3794d8..0000000 Binary files a/assets/images/dekoa.png and /dev/null differ diff --git a/assets/images/dekoa.webp b/assets/images/dekoa.webp new file mode 100644 index 0000000..670d39e Binary files /dev/null and b/assets/images/dekoa.webp differ diff --git a/assets/images/designer_project.jpeg b/assets/images/designer_project.jpeg deleted file mode 100755 index 4e765d6..0000000 Binary files a/assets/images/designer_project.jpeg and /dev/null differ diff --git a/assets/images/designer_project.webp b/assets/images/designer_project.webp new file mode 100644 index 0000000..006b9bb Binary files /dev/null and b/assets/images/designer_project.webp differ diff --git a/assets/images/dev_project.jpg b/assets/images/dev_project.jpg deleted file mode 100755 index 686aece..0000000 Binary files a/assets/images/dev_project.jpg and /dev/null differ diff --git a/assets/images/dev_project.webp b/assets/images/dev_project.webp new file mode 100644 index 0000000..56b4ef9 Binary files /dev/null and b/assets/images/dev_project.webp differ diff --git a/assets/images/gfs.png b/assets/images/gfs.png deleted file mode 100644 index cfe1415..0000000 Binary files a/assets/images/gfs.png and /dev/null differ diff --git a/assets/images/gfs.webp b/assets/images/gfs.webp new file mode 100644 index 0000000..265765c Binary files /dev/null and b/assets/images/gfs.webp differ diff --git a/assets/images/mozika.png b/assets/images/mozika.png deleted file mode 100644 index 7c347d4..0000000 Binary files a/assets/images/mozika.png and /dev/null differ diff --git a/assets/images/mozika.webp b/assets/images/mozika.webp new file mode 100644 index 0000000..1c36f73 Binary files /dev/null and b/assets/images/mozika.webp differ diff --git a/assets/images/portfolio.png b/assets/images/portfolio.png deleted file mode 100755 index 9a41b28..0000000 Binary files a/assets/images/portfolio.png and /dev/null differ diff --git a/assets/images/portfolio.webp b/assets/images/portfolio.webp new file mode 100644 index 0000000..78cbe72 Binary files /dev/null and b/assets/images/portfolio.webp differ diff --git a/assets/images/rakitra.png b/assets/images/rakitra.png deleted file mode 100644 index e000bf0..0000000 Binary files a/assets/images/rakitra.png and /dev/null differ diff --git a/assets/images/rakitra.webp b/assets/images/rakitra.webp new file mode 100644 index 0000000..1111b12 Binary files /dev/null and b/assets/images/rakitra.webp differ diff --git a/assets/images/sample.png b/assets/images/sample.png deleted file mode 100644 index 6432710..0000000 Binary files a/assets/images/sample.png and /dev/null differ diff --git a/assets/logo/zahageek.png b/assets/logo/zahageek.png old mode 100755 new mode 100644 index 2737624..8f39e81 Binary files a/assets/logo/zahageek.png and b/assets/logo/zahageek.png differ diff --git a/lib/app.dart b/lib/app.dart index 1ab8c0b..f517fe2 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -1,6 +1,4 @@ import 'package:flutter/material.dart'; -// ignore: unused_import -import 'package:theme_provider/theme_provider.dart'; import 'core/theme/app_theme.dart'; import 'pages/home/home.dart'; diff --git a/lib/data/image_assets.dart b/lib/data/image_assets.dart index 03b12f0..a4eb120 100644 --- a/lib/data/image_assets.dart +++ b/lib/data/image_assets.dart @@ -17,18 +17,18 @@ class ImageAssets { String get iteams => '${directory}logo/iteams.png'; String get freelance => '${directory}logo/freelance.png'; //images - String get covertPhoto1 => '${directory}images/croquis_cover.png'; + String get covertPhoto1 => '${directory}images/croquis_cover.webp'; String get cekahLogo => '${directory}images/cekah.png'; - String get chefProject => '${directory}images/cher_project.jpg'; - String get designerProject => '${directory}images/designer_project.jpeg'; - String get devProject => '${directory}images/dev_project.jpg'; - String get dekoa => '${directory}images/dekoa.png'; - String get mozika => '${directory}images/mozika.png'; - String get rakitra => '${directory}images/rakitra.png'; - String get gfs => '${directory}images/gfs.png'; - String get buildeo => '${directory}images/buildeo.png'; - String get avg => '${directory}images/avg.png'; - String get portfolio => '${directory}images/portfolio.png'; + String get chefProject => '${directory}images/cher_project.webp'; + String get designerProject => '${directory}images/designer_project.webp'; + String get devProject => '${directory}images/dev_project.webp'; + String get dekoa => '${directory}images/dekoa.webp'; + String get mozika => '${directory}images/mozika.webp'; + String get rakitra => '${directory}images/rakitra.webp'; + String get gfs => '${directory}images/gfs.webp'; + String get buildeo => '${directory}images/buildeo.webp'; + String get avg => '${directory}images/avg.webp'; + String get portfolio => '${directory}images/portfolio.webp'; //icon String get team => '${directory}icon/team.svg'; String get project => '${directory}icon/project.svg'; diff --git a/lib/pages/home/parts/awards/awards.dart b/lib/pages/home/parts/awards/awards.dart index 1419e1a..55dbdc9 100644 --- a/lib/pages/home/parts/awards/awards.dart +++ b/lib/pages/home/parts/awards/awards.dart @@ -8,13 +8,19 @@ import '../../../../models/time_line_model.dart'; import '../widgets/icon_and_title_widet.dart'; import '../widgets/my_awards_widget.dart'; -class AwardPart extends StatelessWidget { +class AwardPart extends StatefulWidget { // final Size size; const AwardPart({ super.key, // required this.size, }); + @override + State createState() => _AwardPartState(); +} + +class _AwardPartState extends State { + int _currentIndex = 0; @override Widget build(BuildContext context) { final themeColor = Theme.of(context).extension()!; @@ -49,15 +55,19 @@ class AwardPart extends StatelessWidget { indicatorBorderColor: Colors.transparent, indicatorRadius: 5, ), + onPageChanged: (index, reason) { + setState(() { + _currentIndex = index; + }); + }, ), items: List.generate( palmaresList.length, (index) { TimeLineContentModel palmares = palmaresList[index]; return MyAwardsCarSwipeWidget( - size: MediaQuery.sizeOf(context), + isInitial: index == _currentIndex, palmares: palmares, - id: index, ); }, ), diff --git a/lib/pages/home/parts/widgets/floating_btt.dart b/lib/pages/home/parts/widgets/floating_btt.dart index c07e76e..3b0d0d6 100644 --- a/lib/pages/home/parts/widgets/floating_btt.dart +++ b/lib/pages/home/parts/widgets/floating_btt.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; -import 'package:flutter_speed_dial/flutter_speed_dial.dart'; + import 'package:scroll_vanisher/scroll_vanisher.dart'; -import 'package:theme_provider/theme_provider.dart'; + import 'package:unicons/unicons.dart'; import '../../../../core/theme/app_color.dart'; @@ -79,28 +79,4 @@ class FloatingColorBtt extends StatelessWidget { ), ); } - - SpeedDialChild childDial({ - required String title, - required Color color, - required String themeId, - required BuildContext context, - }) { - return SpeedDialChild( - label: title, - labelStyle: const TextStyle( - fontFamily: 'Product sans', - fontWeight: FontWeight.bold, - ), - backgroundColor: color, - shape: RoundedRectangleBorder( - borderRadius: BorderRadius.circular(30), - ), - elevation: 0, - child: const SizedBox(), - onTap: () { - ThemeProvider.controllerOf(context).setTheme(themeId); - }, - ); - } } diff --git a/lib/pages/home/parts/widgets/my_awards_widget.dart b/lib/pages/home/parts/widgets/my_awards_widget.dart index ff6bc67..e1eda43 100644 --- a/lib/pages/home/parts/widgets/my_awards_widget.dart +++ b/lib/pages/home/parts/widgets/my_awards_widget.dart @@ -8,15 +8,13 @@ import '../../../../core/theme/app_color.dart'; import '../../../../models/time_line_model.dart'; class MyAwardsCarSwipeWidget extends StatelessWidget { - final int id; - + final bool isInitial; final TimeLineContentModel palmares; - final Size size; + const MyAwardsCarSwipeWidget({ Key? key, - required this.size, - required this.id, required this.palmares, + this.isInitial = false, }) : super(key: key); @override @@ -39,7 +37,7 @@ class MyAwardsCarSwipeWidget extends StatelessWidget { ), ); return Container( - width: size.width, + width: MediaQuery.sizeOf(context).width, padding: const EdgeInsets.all(10), decoration: BoxDecoration( color: themeColor.whiteColor, @@ -141,8 +139,8 @@ class MyAwardsCarSwipeWidget extends StatelessWidget { context: context, mobile: 3, tablet: 3, - mobileLarge: 3, - desktop: 2, + mobileLarge: isInitial ? 3 : 2, + desktop: isInitial ? 3 : 2, ).toInt(), overflow: TextOverflow.ellipsis, style: TextStyle( diff --git a/pubspec.lock b/pubspec.lock index c6ac7a7..05be500 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,14 +1,6 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - animated_background: - dependency: "direct main" - description: - name: animated_background - sha256: "24b05a6dca2cb0231b011f9e8fd2e9d8060faac08a78cf0643915bb7d6e9b03b" - url: "https://pub.dev" - source: hosted - version: "2.0.0" args: dependency: transitive description: @@ -25,14 +17,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.11.0" - bamboo: - dependency: "direct main" - description: - name: bamboo - sha256: "2341a40a3a7e733a6e75e80e5bb8687dc9ec6d262e5edc9130c59409f9484f35" - url: "https://pub.dev" - source: hosted - version: "1.0.3" boolean_selector: dependency: transitive description: @@ -89,14 +73,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" - expansion_tile_card: - dependency: "direct main" - description: - name: expansion_tile_card - sha256: "27ce4cb518f00e21d0f2309aaa6462b26b148e93cee2029a73088cecf42b1eb0" - url: "https://pub.dev" - source: hosted - version: "3.0.0" fake_async: dependency: transitive description: @@ -126,14 +102,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_card_swiper: - dependency: "direct main" - description: - name: flutter_card_swiper - sha256: "05bbbc11a0f57a6b9294cebe857d4d3dfdfbdad4e1628f4dc910c317d9684319" - url: "https://pub.dev" - source: hosted - version: "7.0.0" flutter_carousel_widget: dependency: "direct main" description: @@ -155,14 +123,6 @@ packages: description: flutter source: sdk version: "0.0.0" - flutter_speed_dial: - dependency: "direct main" - description: - name: flutter_speed_dial - sha256: "698a037274a66dbae8697c265440e6acb6ab6cae9ac5f95c749e7944d8f28d41" - url: "https://pub.dev" - source: hosted - version: "7.0.0" flutter_svg: dependency: "direct main" description: @@ -253,14 +213,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.0" - meta_seo: - dependency: "direct main" - description: - name: meta_seo - sha256: fb1984710baca873da6ca9cd411d869bc56370f0cfb8e140dd42827424c681b5 - url: "https://pub.dev" - source: hosted - version: "3.0.9" nested: dependency: transitive description: @@ -269,14 +221,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.0" - overlapped_carousel: - dependency: "direct main" - description: - name: overlapped_carousel - sha256: a3bc6af9651e1732cffcdd2b4df4204f4fae5ef4b270a6a2dd9707fa8b1e1f3c - url: "https://pub.dev" - source: hosted - version: "1.0.2" path: dependency: transitive description: @@ -373,14 +317,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.3" - scrollable_positioned_list: - dependency: "direct main" - description: - name: scrollable_positioned_list - sha256: "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287" - url: "https://pub.dev" - source: hosted - version: "0.3.8" shared_preferences: dependency: transitive description: @@ -490,14 +426,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.6.1" - theme_provider: - dependency: "direct main" - description: - name: theme_provider - sha256: "6a2839ee1bd539ceb789f25ea9696fe90f9dfad28e3228f209b8ff9255c58099" - url: "https://pub.dev" - source: hosted - version: "0.6.0" typed_data: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 63ac7d9..cdc8f42 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,24 +14,24 @@ dependencies: cupertino_icons: ^1.0.2 unicons: ^2.1.1 - scrollable_positioned_list: ^0.3.8 + # scrollable_positioned_list: ^0.3.8 device_preview: ^1.1.0 - animated_background: ^2.0.0 - bamboo: ^1.0.3 + # animated_background: ^2.0.0 + # bamboo: ^1.0.3 flutter_svg: ^2.0.10+1 - expansion_tile_card: ^3.0.0 + # expansion_tile_card: ^3.0.0 # assets_audio_player: ^3.1.1 # assets_audio_player_web: ^3.1.1 scroll_vanisher: ^1.0.3 - overlapped_carousel: ^1.0.2 - flutter_card_swiper: ^7.0.0 + # overlapped_carousel: ^1.0.2 + # flutter_card_swiper: ^7.0.0 flutter_carousel_widget: ^2.2.0 url_launcher: ^6.2.6 - meta_seo: ^3.0.9 + # meta_seo: ^3.0.9 percent_indicator: ^4.2.3 responsive_grid: ^2.4.4 - theme_provider: ^0.6.0 - flutter_speed_dial: ^7.0.0 + # theme_provider: ^0.6.0 + # flutter_speed_dial: ^7.0.0 dependency_overrides: web: ^0.5.1 @@ -52,8 +52,6 @@ flutter: - assets/images/ - assets/icon/ - assets/logo/ - - web/zoom.js - - assets/images/croquis_cover.png - assets/icon/team.svg - assets/icon/project.svg - assets/icon/cup.svg @@ -69,15 +67,17 @@ flutter: - assets/logo/zahageek.png - assets/logo/iteams.png - assets/images/cekah.png - - assets/images/cher_project.jpg - - assets/images/designer_project.jpeg - - assets/images/dev_project.jpg - - assets/images/dekoa.png - - assets/images/mozika.png - - assets/images/rakitra.png - - assets/images/gfs.png - - assets/images/buildeo.png - - assets/images/avg.png + - assets/images/cher_project.webp + - assets/images/designer_project.webp + - assets/images/dev_project.webp + - assets/images/dekoa.webp + - assets/images/portfolio.webp + - assets/images/mozika.webp + - assets/images/rakitra.webp + - assets/images/gfs.webp + - assets/images/buildeo.webp + - assets/images/avg.webp + - assets/images/croquis_cover.webp - assets/icon/team.svg - assets/icon/project.svg - assets/icon/cup.svg