From d80ebc4d8e56f4f519978787fce86c688d6f0d4e Mon Sep 17 00:00:00 2001 From: h7x4abk3g Date: Mon, 29 Jun 2020 17:38:57 +0200 Subject: [PATCH] Update folder structure and add components --- lib/components/kanjiSearch/kanji_list.dart | 13 +++ .../kanjiSearch/kanji_search_card.dart | 15 +++ .../{ => kanjiSearch}/yomi_card.dart | 0 lib/components/kanji_search_card.dart | 0 lib/components/{ => search}/search_card.dart | 0 .../{ => search}/wikipedia_attribute.dart | 0 lib/components/search_bar.dart | 14 +++ pubspec.lock | 97 ++++++------------- 8 files changed, 73 insertions(+), 66 deletions(-) create mode 100644 lib/components/kanjiSearch/kanji_list.dart create mode 100644 lib/components/kanjiSearch/kanji_search_card.dart rename lib/components/{ => kanjiSearch}/yomi_card.dart (100%) delete mode 100644 lib/components/kanji_search_card.dart rename lib/components/{ => search}/search_card.dart (100%) rename lib/components/{ => search}/wikipedia_attribute.dart (100%) create mode 100644 lib/components/search_bar.dart diff --git a/lib/components/kanjiSearch/kanji_list.dart b/lib/components/kanjiSearch/kanji_list.dart new file mode 100644 index 0000000..559c1c9 --- /dev/null +++ b/lib/components/kanjiSearch/kanji_list.dart @@ -0,0 +1,13 @@ +import 'dart:io'; + +import 'package:flutter/material.dart'; + +class KanjiGrid extends StatelessWidget { + + @override + Widget build(BuildContext context) { + return GridView.count( + crossAxisCount: 3, + ); + } +} \ No newline at end of file diff --git a/lib/components/kanjiSearch/kanji_search_card.dart b/lib/components/kanjiSearch/kanji_search_card.dart new file mode 100644 index 0000000..08f96fc --- /dev/null +++ b/lib/components/kanjiSearch/kanji_search_card.dart @@ -0,0 +1,15 @@ +import 'dart:io'; + +import 'package:flutter/material.dart'; + +class KanjiResultCard extends StatelessWidget { + + @override + Widget build(BuildContext context) { + return Container( + height: 100, + width: 100, + child: Text('Test'), + ); + } +} \ No newline at end of file diff --git a/lib/components/yomi_card.dart b/lib/components/kanjiSearch/yomi_card.dart similarity index 100% rename from lib/components/yomi_card.dart rename to lib/components/kanjiSearch/yomi_card.dart diff --git a/lib/components/kanji_search_card.dart b/lib/components/kanji_search_card.dart deleted file mode 100644 index e69de29..0000000 diff --git a/lib/components/search_card.dart b/lib/components/search/search_card.dart similarity index 100% rename from lib/components/search_card.dart rename to lib/components/search/search_card.dart diff --git a/lib/components/wikipedia_attribute.dart b/lib/components/search/wikipedia_attribute.dart similarity index 100% rename from lib/components/wikipedia_attribute.dart rename to lib/components/search/wikipedia_attribute.dart diff --git a/lib/components/search_bar.dart b/lib/components/search_bar.dart new file mode 100644 index 0000000..751c684 --- /dev/null +++ b/lib/components/search_bar.dart @@ -0,0 +1,14 @@ +import 'dart:io'; + +import 'package:flutter/material.dart'; + +class SearchBar extends StatelessWidget { + + @override + Widget build(BuildContext context) { + return Container( + height: 20, + width: 100, + ); + } +} \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 3b7e3ae..b8d71ba 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,62 +1,48 @@ # Generated by pub # See https://dart.dev/tools/pub/glossary#lockfile packages: - archive: - dependency: transitive - description: - name: archive - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.11" - args: - dependency: transitive - description: - name: args - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.2" async: dependency: transitive description: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.4.0" + version: "2.4.1" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.5" + version: "2.0.0" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.1.3" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.0.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" - convert: - dependency: transitive - description: - name: convert - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.1" - crypto: - dependency: transitive - description: - name: crypto - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.3" + version: "1.14.13" csslib: dependency: transitive description: @@ -71,6 +57,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.3" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" flutter: dependency: "direct main" description: flutter @@ -109,20 +102,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "3.1.4" - image: - dependency: transitive - description: - name: image - url: "https://pub.dartlang.org" - source: hosted - version: "2.1.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.6" + version: "0.12.8" meta: dependency: transitive description: @@ -136,7 +122,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.4" + version: "1.7.0" pedantic: dependency: transitive description: @@ -144,20 +130,6 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "1.8.0+1" - petitparser: - dependency: transitive - description: - name: petitparser - url: "https://pub.dartlang.org" - source: hosted - version: "2.4.0" - quiver: - dependency: transitive - description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.5" sky_engine: dependency: transitive description: flutter @@ -169,7 +141,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.7.0" stack_trace: dependency: transitive description: @@ -204,14 +176,14 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.11" + version: "0.2.17" typed_data: dependency: transitive description: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.2.0" unofficial_jisho_api: dependency: "direct main" description: @@ -226,12 +198,5 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "2.0.8" - xml: - dependency: transitive - description: - name: xml - url: "https://pub.dartlang.org" - source: hosted - version: "3.5.0" sdks: - dart: ">=2.7.0 <3.0.0" + dart: ">=2.9.0-14.0.dev <3.0.0"