From aa25288c3e2364e90f2c2da890562b0e1bfe65a4 Mon Sep 17 00:00:00 2001 From: Leandro Date: Mon, 20 May 2024 18:17:56 +0200 Subject: [PATCH] Better add wool modal --- lib/screens/add_wool_modal.dart | 71 ++++++++++++++++++++++++++++----- pubspec.lock | 24 +++++++---- pubspec.yaml | 2 +- 3 files changed, 78 insertions(+), 19 deletions(-) diff --git a/lib/screens/add_wool_modal.dart b/lib/screens/add_wool_modal.dart index d203934..40ce7ff 100644 --- a/lib/screens/add_wool_modal.dart +++ b/lib/screens/add_wool_modal.dart @@ -1,32 +1,83 @@ +import 'package:flex_color_picker/flex_color_picker.dart'; import 'package:flutter/material.dart'; -import 'package:flutter_colorpicker/flutter_colorpicker.dart'; +import 'package:hexcolor/hexcolor.dart'; import 'package:temperaturdecke/widgets/modal_wrapper.dart'; class AddWoolModal extends StatelessWidget { AddWoolModal({super.key}); - String selectedColor = "#FFFFFF"; + Color selectedColor = Colors.white; void setSelectedColor(Color color) { - selectedColor = colorToHex(color); + selectedColor = color; } @override Widget build(BuildContext context) { return ModalWrapper( Column( + crossAxisAlignment: CrossAxisAlignment.start, children: [ - TextField(), - TextField(), SizedBox( height: 25, ), + Text( + "Randdaten", + textAlign: TextAlign.start, + style: Theme.of(context).textTheme.headlineSmall, + ), + SizedBox( + height: 10, + ), + TextField( + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Name', + ), + ), + SizedBox( + height: 25, + ), + TextField( + decoration: InputDecoration( + border: OutlineInputBorder(), + labelText: 'Marke', + ), + ), + SizedBox( + height: 25, + ), + Text( + "Farbe", + textAlign: TextAlign.start, + style: Theme.of(context).textTheme.headlineSmall, + ), + SizedBox( + height: 10, + ), ColorPicker( - displayThumbColor: false, - colorPickerWidth: 200, - enableAlpha: false, - pickerColor: Colors.black, - onColorChanged: setSelectedColor, + spacing: 8, + padding: EdgeInsets.all(0), + borderRadius: 10, + onColorChanged: (value) => setSelectedColor(value), + enableShadesSelection: false, + enableTonalPalette: true, + tonalColorSameSize: true, + pickersEnabled: {ColorPickerType.accent: false}, + tonalSubheading: Divider(), + ), + SizedBox( + height: 25, + ), + Align( + alignment: Alignment.centerRight, + child: FilledButton( + onPressed: () => () {}, + child: Text( + "Hinzufügen", + style: TextStyle(fontSize: 16), + ), + ), ) ], ), diff --git a/pubspec.lock b/pubspec.lock index 7737e2d..62bc216 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -265,19 +265,27 @@ packages: url: "https://pub.dev" source: hosted version: "1.1.0" + flex_color_picker: + dependency: "direct main" + description: + name: flex_color_picker + sha256: "5c846437069fb7afdd7ade6bf37e628a71d2ab0787095ddcb1253bf9345d5f3a" + url: "https://pub.dev" + source: hosted + version: "3.4.1" + flex_seed_scheme: + dependency: transitive + description: + name: flex_seed_scheme + sha256: "4cee2f1d07259f77e8b36f4ec5f35499d19e74e17c7dce5b819554914082bc01" + url: "https://pub.dev" + source: hosted + version: "1.5.0" flutter: dependency: "direct main" description: flutter source: sdk version: "0.0.0" - flutter_colorpicker: - dependency: "direct main" - description: - name: flutter_colorpicker - sha256: "969de5f6f9e2a570ac660fb7b501551451ea2a1ab9e2097e89475f60e07816ea" - url: "https://pub.dev" - source: hosted - version: "1.1.0" flutter_lints: dependency: "direct dev" description: diff --git a/pubspec.yaml b/pubspec.yaml index 0f920b0..08cc1c4 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -35,7 +35,7 @@ dependencies: shimmer: - flutter_colorpicker: + flex_color_picker: hexcolor: