Add search bar to title bar
This commit is contained in:
parent
9204ce4cfd
commit
bd87af4a38
|
@ -1,8 +1,12 @@
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
|
import 'package:flutter_bloc/flutter_bloc.dart';
|
||||||
|
import 'package:jisho_study_tool/bloc/kanji/kanji_bloc.dart';
|
||||||
import 'package:jisho_study_tool/screens/kanji_search.dart';
|
import 'package:jisho_study_tool/screens/kanji_search.dart';
|
||||||
import 'package:jisho_study_tool/screens/history.dart';
|
import 'package:jisho_study_tool/screens/history.dart';
|
||||||
import 'package:jisho_study_tool/screens/search.dart';
|
import 'package:jisho_study_tool/screens/search.dart';
|
||||||
|
|
||||||
|
import 'bloc/search/search_bloc.dart';
|
||||||
|
|
||||||
void main() => runApp(MyApp());
|
void main() => runApp(MyApp());
|
||||||
|
|
||||||
class MyApp extends StatelessWidget {
|
class MyApp extends StatelessWidget {
|
||||||
|
@ -14,7 +18,13 @@ class MyApp extends StatelessWidget {
|
||||||
theme: ThemeData(
|
theme: ThemeData(
|
||||||
primarySwatch: Colors.blue,
|
primarySwatch: Colors.blue,
|
||||||
),
|
),
|
||||||
home: Home(),
|
home: MultiBlocProvider(
|
||||||
|
providers: [
|
||||||
|
BlocProvider(create: (context) => SearchBloc()),
|
||||||
|
BlocProvider(create: (context) => KanjiBloc()),
|
||||||
|
],
|
||||||
|
child: Home(),
|
||||||
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -82,14 +92,14 @@ class Page {
|
||||||
Widget content;
|
Widget content;
|
||||||
Widget titleBar;
|
Widget titleBar;
|
||||||
|
|
||||||
Page({ this.content,this.titleBar,});
|
Page({
|
||||||
|
this.content,
|
||||||
|
this.titleBar,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
final List<Page> pages = [
|
final List<Page> pages = [
|
||||||
Page(
|
Page(content: SearchView(), titleBar: Text('Search')),
|
||||||
content: SearchView(),
|
|
||||||
titleBar: Text('Search')
|
|
||||||
),
|
|
||||||
Page(
|
Page(
|
||||||
content: KanjiView(),
|
content: KanjiView(),
|
||||||
titleBar: KanjiViewBar(),
|
titleBar: KanjiViewBar(),
|
||||||
|
|
|
@ -6,24 +6,17 @@ import 'package:jisho_study_tool/components/kanji/kanji__search_page/kanji_searc
|
||||||
import 'package:jisho_study_tool/components/loading.dart';
|
import 'package:jisho_study_tool/components/loading.dart';
|
||||||
|
|
||||||
class KanjiView extends StatelessWidget {
|
class KanjiView extends StatelessWidget {
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return BlocProvider(
|
|
||||||
create: (context) => KanjiBloc(),
|
|
||||||
child: _KanjiSearchPage(),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class _KanjiSearchPage extends StatelessWidget {
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return BlocBuilder<KanjiBloc, KanjiState>(
|
return BlocBuilder<KanjiBloc, KanjiState>(
|
||||||
builder: (context, state) {
|
builder: (context, state) {
|
||||||
if (state is KanjiSearchInitial) return KanjiSearchBar();
|
if (state is KanjiSearchInitial)
|
||||||
else if (state is KanjiSearchLoading) return LoadingScreen();
|
return Container();
|
||||||
else if (state is KanjiSearchFinished) return KanjiResultCard(state.kanji);
|
else if (state is KanjiSearchLoading)
|
||||||
|
return LoadingScreen();
|
||||||
|
else if (state is KanjiSearchFinished)
|
||||||
|
return KanjiResultCard(state.kanji);
|
||||||
|
|
||||||
throw 'No such event found';
|
throw 'No such event found';
|
||||||
},
|
},
|
||||||
);
|
);
|
||||||
|
@ -31,23 +24,45 @@ class _KanjiSearchPage extends StatelessWidget {
|
||||||
}
|
}
|
||||||
|
|
||||||
class KanjiViewBar extends StatelessWidget {
|
class KanjiViewBar extends StatelessWidget {
|
||||||
@override
|
|
||||||
Widget build(BuildContext context) {
|
|
||||||
return Text('Kanji');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class KanjiSearchBar extends StatelessWidget {
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return Center(
|
return Center(
|
||||||
child: TextField(
|
child: Container(
|
||||||
onSubmitted: (text) => BlocProvider.of<KanjiBloc>(context).add(GetKanji(text)),
|
child: Row(
|
||||||
decoration: new InputDecoration(
|
children: [
|
||||||
prefixIcon: Icon(Icons.search),
|
IconButton(
|
||||||
hintText: 'Search for kanji'
|
icon: Icon(Icons.arrow_back),
|
||||||
|
onPressed: () => BlocProvider.of<KanjiBloc>(context)
|
||||||
|
.add(ReturnToInitialState()),
|
||||||
|
),
|
||||||
|
Expanded(
|
||||||
|
child: Padding(
|
||||||
|
padding: EdgeInsets.symmetric(vertical: 10.0),
|
||||||
|
child: TextField(
|
||||||
|
onSubmitted: (text) =>
|
||||||
|
BlocProvider.of<KanjiBloc>(context).add(GetKanji(text)),
|
||||||
|
decoration: new InputDecoration(
|
||||||
|
prefixIcon: Icon(Icons.search),
|
||||||
|
hintText: 'Search for kanji',
|
||||||
|
fillColor: Colors.white,
|
||||||
|
filled: true,
|
||||||
|
border: OutlineInputBorder(
|
||||||
|
borderRadius: BorderRadius.circular(100.0)),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
icon: Icon(Icons.star_border),
|
||||||
|
onPressed: null,
|
||||||
|
),
|
||||||
|
IconButton(
|
||||||
|
icon: Icon(Icons.add),
|
||||||
|
onPressed: null,
|
||||||
|
),
|
||||||
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue