From 90f720c12e058c492f6c6afea48230a97cb1f755 Mon Sep 17 00:00:00 2001 From: poka Date: Thu, 16 Feb 2023 20:19:05 +0100 Subject: [PATCH] make it better --- lib/screens/home.dart | 98 +++++++++++++++++++-------------- pubspec.lock | 125 +++++++++++++++++++++++++++--------------- 2 files changed, 139 insertions(+), 84 deletions(-) diff --git a/lib/screens/home.dart b/lib/screens/home.dart index ad83894..74b7bc0 100644 --- a/lib/screens/home.dart +++ b/lib/screens/home.dart @@ -39,7 +39,13 @@ class _BoguiState extends ConsumerState { // screenHight = MediaQuery.of(context).size.height; return Scaffold( appBar: AppBar( - title: Text(widget.title), + bottomOpacity: 0.5, + backgroundColor: orangeC, + title: Center( + child: Text( + widget.title, + style: const TextStyle(fontSize: 16), + )), ), body: Center( child: SizedBox( @@ -62,11 +68,12 @@ class _BoguiState extends ConsumerState { controller: scrollController, child: Row(mainAxisAlignment: MainAxisAlignment.center, children: [ - const Spacer(flex: 3), + Spacer(flex: screenWidth > 800 ? 3 : 2), Column(children: [ const SizedBox(height: 40), Container( - constraints: const BoxConstraints(minWidth: 300), + constraints: + const BoxConstraints(minWidth: 500, maxWidth: 700), width: screenWidth - 600, child: CallbackShortcuts( bindings: { @@ -86,8 +93,15 @@ class _BoguiState extends ConsumerState { cursorColor: orangeC, style: TextStyle(color: Colors.grey[400], fontSize: 16), decoration: InputDecoration( - hintText: "Qu'ils aillent tous se faire enculer", + hintText: "Qu'ils aillent tous se faire recompiler", filled: true, + helperText: + "Laissez-le autocompléter votre texte plutôt que de lui poser une question...", + helperStyle: const TextStyle(fontSize: 10), + hintStyle: TextStyle( + color: Colors.grey[50], + fontWeight: FontWeight.w100, + fontSize: 14), // fillColor: Colors.white, prefixIconConstraints: const BoxConstraints( minHeight: 32, @@ -95,7 +109,7 @@ class _BoguiState extends ConsumerState { prefixIcon: const Padding( padding: EdgeInsets.symmetric(horizontal: 17), child: Icon( - Icons.fireplace_rounded, + Icons.agriculture_outlined, color: orangeC, size: 30, )), @@ -115,34 +129,37 @@ class _BoguiState extends ConsumerState { ), ), const SizedBox(height: 40), - SizedBox( - width: 250, - height: 50, - child: ElevatedButton( - style: ElevatedButton.styleFrom( - foregroundColor: Colors.white, elevation: 4, - backgroundColor: orangeC, // foreground - ), - onPressed: - ref.watch(gpt.prompt).text.length > 100000000000 - ? null - : () { - _handleValidation(); - }, - child: ref.watch(gpt.isLoading) - ? SizedBox( - height: 18, - width: 18, - child: CircularProgressIndicator( - color: Colors.grey[800], - strokeWidth: 4, + Opacity( + opacity: 0.8, + child: SizedBox( + width: 250, + height: 50, + child: ElevatedButton( + style: ElevatedButton.styleFrom( + foregroundColor: Colors.white, elevation: 4, + backgroundColor: orangeC, // foreground + ), + onPressed: + ref.watch(gpt.prompt).text.length > 100000000000 + ? null + : () { + _handleValidation(); + }, + child: ref.watch(gpt.isLoading) + ? SizedBox( + height: 18, + width: 18, + child: CircularProgressIndicator( + color: Colors.grey[800], + strokeWidth: 4, + ), + ) + : const Text( + 'Valider', + style: TextStyle( + fontSize: 21, fontWeight: FontWeight.w500), ), - ) - : const Text( - 'Valider', - style: TextStyle( - fontSize: 21, fontWeight: FontWeight.w500), - ), + ), ), ), const SizedBox(height: 5), @@ -153,14 +170,15 @@ class _BoguiState extends ConsumerState { const SizedBox(height: 40), ]), const Spacer(), - Column( - children: [ - CustomSlider( - parameter: gpt.temperature, - nameParameter: 'Température', - ), - ], - ), + if (screenWidth > 800) + Column( + children: [ + CustomSlider( + parameter: gpt.temperature, + nameParameter: 'Température', + ), + ], + ), const Spacer(), ]), ), diff --git a/pubspec.lock b/pubspec.lock index 7faf026..9c4f470 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,49 +5,56 @@ packages: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0 + url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.10.0" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted version: "1.2.1" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0 + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: e35129dc44c9118cee2a5603506d823bab99c68393879edb440e0090d07586be + url: "https://pub.dev" source: hosted version: "1.0.5" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted version: "1.3.1" flutter: @@ -59,23 +66,26 @@ packages: dependency: "direct main" description: name: flutter_hooks - url: "https://pub.dartlang.org" + sha256: "2b202559a4ed3656bbb7aae9d8b335fb0037b23acc7ae3f377d1ba0b95c21aec" + url: "https://pub.dev" source: hosted version: "0.18.5+1" flutter_lints: dependency: "direct dev" description: name: flutter_lints - url: "https://pub.dartlang.org" + sha256: aeb0b80a8b3709709c9cc496cdc027c5b3216796bc0af0ce1007eaf24464fd4c + url: "https://pub.dev" source: hosted version: "2.0.1" flutter_riverpod: dependency: "direct main" description: name: flutter_riverpod - url: "https://pub.dartlang.org" + sha256: "46a27b7a11dc13738054093076f2dc65692ddcd463979b15092accf5681aea20" + url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.2.0" flutter_test: dependency: "direct dev" description: flutter @@ -85,56 +95,72 @@ packages: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + url: "https://pub.dev" source: hosted version: "0.13.5" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted version: "4.0.2" + js: + dependency: transitive + description: + name: js + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" + source: hosted + version: "0.6.5" json_annotation: dependency: transitive description: name: json_annotation - url: "https://pub.dartlang.org" + sha256: c33da08e136c3df0190bd5bbe51ae1df4a7d96e7954d1d7249fea2968a72d317 + url: "https://pub.dev" source: hosted - version: "4.7.0" + version: "4.8.0" lints: dependency: transitive description: name: lints - url: "https://pub.dartlang.org" + sha256: "5e4a9cd06d447758280a8ac2405101e0e2094d2a1dbdd3756aec3fe7775ba593" + url: "https://pub.dev" source: hosted version: "2.0.1" logger: dependency: "direct main" description: name: logger - url: "https://pub.dartlang.org" + sha256: "5076f09225f91dc49289a4ccb92df2eeea9ea01cf7c26d49b3a1f04c6a49eec1" + url: "https://pub.dev" source: hosted version: "1.1.0" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72" + url: "https://pub.dev" source: hosted - version: "0.12.12" + version: "0.12.13" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724 + url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.2.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42" + url: "https://pub.dev" source: hosted version: "1.8.0" openai_gpt3_api: @@ -150,16 +176,18 @@ packages: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted version: "1.8.2" riverpod: dependency: transitive description: name: riverpod - url: "https://pub.dartlang.org" + sha256: "59a48de9c757aa61aa28e9fd625ffb360d43b6b54606f12536622c55be9e8c4b" + url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.2.0" sky_engine: dependency: transitive description: flutter @@ -169,65 +197,74 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250 + url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.9.1" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" state_notifier: dependency: transitive description: name: state_notifier - url: "https://pub.dartlang.org" + sha256: "8fe42610f179b843b12371e40db58c9444f8757f8b69d181c97e50787caed289" + url: "https://pub.dev" source: hosted version: "0.7.2+1" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206 + url: "https://pub.dev" source: hosted - version: "0.4.12" + version: "0.4.16" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: "26f87ade979c47a150c9eaab93ccd2bebe70a27dc0b4b29517f2904f04eb11a5" + url: "https://pub.dev" source: hosted version: "1.3.1" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" sdks: - dart: ">=2.18.6 <3.0.0" + dart: ">=2.18.6 <4.0.0" flutter: ">=3.0.0"