From 1662c36262794db5dbfb131465f2850559258e20 Mon Sep 17 00:00:00 2001 From: Pjunn <89245460+Pjunn@users.noreply.github.com> Date: Tue, 30 Aug 2022 10:22:04 +0900 Subject: [PATCH 01/11] FEAT: create search screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 아직 미완 --- lib/page/search_page/search_screen.dart | 145 ++++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100644 lib/page/search_page/search_screen.dart diff --git a/lib/page/search_page/search_screen.dart b/lib/page/search_page/search_screen.dart new file mode 100644 index 0000000..2a1aae5 --- /dev/null +++ b/lib/page/search_page/search_screen.dart @@ -0,0 +1,145 @@ +import 'package:flutter/material.dart'; + +class SearchScreen extends StatefulWidget { + _SearchScreenState createState() => _SearchScreenState(); +} + +class _SearchScreenState extends State { + final TextEditingController _filter = TextEditingController(); + FocusNode focusNode = FocusNode(); + String _searchText = ""; + + _SearchScreenState() { + _filter.addListener(() { + setState(() { + _searchText = _filter.text; + }); + }); + } + + Widget _buildBody(BuildContext context) { + return StreamBuilder( + stream: Firestore.instance.collection('movie').snapshots(), + builder: (context, snapshot) { + if (!snapshot.hasData) return LinearProgressIndicator(); + return _buildList(context, snapshot.data.documents); + }, + ); + } + + Widget _buildList(BuildContext context, List snapshot) { + List searchResults = []; + for (DocumentSnapshot d in snapshot) { + if (d.data.toString().contains(_searchText)) { + searchResults.add(d); + } + } + return Expanded( + child: GridView.count( + crossAxisCount: 3, + childAspectRatio: 1 / 1.5, + padding: EdgeInsets.all(3), + children: searchResults + .map((data) => _buildListItem(context, data)) + .toList()), + ); + } + + Widget _buildListItem(BuildContext context, DocumentSnapshot data) { + final movie = Movie.fromSnapshot(data); + return InkWell( + child: Image.network(movie.poster), + onTap: () { + Navigator.of(context).push(MaterialPageRoute( + fullscreenDialog: true, + builder: (BuildContext context) { + return DetailScreen(movie: movie); + })); + }, + ); + } + + @override + Widget build(BuildContext context) { + return Container( + child: Column( + children: [ + Padding( + padding: EdgeInsets.all(30), + ), + Container( + color: Colors.black, + padding: EdgeInsets.fromLTRB(5, 10, 5, 10), + child: Row( + children: [ + Expanded( + flex: 6, + child: TextField( + focusNode: focusNode, + style: TextStyle( + fontSize: 15, + ), + autofocus: true, + controller: _filter, + decoration: InputDecoration( + filled: true, + fillColor: Colors.white12, + prefixIcon: Icon( + Icons.search, + color: Colors.white60, + size: 20, + ), + suffixIcon: focusNode.hasFocus + ? IconButton( + icon: Icon( + Icons.cancel, + size: 20, + ), + onPressed: () { + setState(() { + _filter.clear(); + _searchText = ""; + }); + }, + ) + : Container(), + hintText: '검색', + labelStyle: TextStyle(color: Colors.white), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.transparent), + borderRadius: BorderRadius.all(Radius.circular(10))), + enabledBorder: OutlineInputBorder( + borderSide: BorderSide(color: Colors.transparent), + borderRadius: BorderRadius.all(Radius.circular(10))), + border: OutlineInputBorder( + borderSide: BorderSide(color: Colors.transparent), + borderRadius: BorderRadius.all(Radius.circular(10))), + ), + ), + ), + focusNode.hasFocus + ? Expanded( + child: FlatButton( + child: Text('취소'), + onPressed: () { + setState(() { + _filter.clear(); + _searchText = ""; + focusNode.unfocus(); + }); + }, + ), + ) + : Expanded( + flex: 0, + child: Container(), + ) + ], + ), + ), + _buildBody(context) + ], + ), + ); + } +} \ No newline at end of file From 2a461e0e89fb966d5c2c3382d4e6b84e76ac83b6 Mon Sep 17 00:00:00 2001 From: Pjunn Date: Tue, 30 Aug 2022 17:57:08 +0900 Subject: [PATCH 02/11] FEAT: create search page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 서치 페이지 완성함. 검색결과에서 디테일 페이지로 이어지게 만들기 필요 --- lib/page/detail_page/detailPage.dart | 3 +- lib/page/search_page/searchPage.dart | 1 + lib/page/search_page/search_screen.dart | 42 ++++++------ lib/page/search_page/searchbar.dart | 29 +++++--- pubspec.lock | 90 ++++++++++++++----------- 5 files changed, 99 insertions(+), 66 deletions(-) diff --git a/lib/page/detail_page/detailPage.dart b/lib/page/detail_page/detailPage.dart index 79a0a1e..4b80ac6 100644 --- a/lib/page/detail_page/detailPage.dart +++ b/lib/page/detail_page/detailPage.dart @@ -3,6 +3,7 @@ import 'package:cafegation/page/detail_page/detailMapPage.dart'; import 'package:cafegation/page/location_page/locationPage.dart'; import 'package:flutter/material.dart'; import 'package:cloud_firestore/cloud_firestore.dart'; +import 'package:cafegation/models/cafe.dart'; class detailPage extends StatefulWidget { const detailPage({Key? key, required this.cafeName, required this.likedStatus}) : super(key: key); @@ -94,7 +95,7 @@ class _detailPageState extends State { return Text("Loading"); } - _images = snapshot.data!['images'][0]; + _images = snapshot.data!['images']; _name = snapshot.data!['name']; _location = snapshot.data!['location']; _tags = snapshot.data!['tags']; diff --git a/lib/page/search_page/searchPage.dart b/lib/page/search_page/searchPage.dart index 32b958a..1c5d8fd 100644 --- a/lib/page/search_page/searchPage.dart +++ b/lib/page/search_page/searchPage.dart @@ -1,6 +1,7 @@ import 'package:cafegation/constants/colors.dart'; import 'package:cafegation/page/favorites_page/favoritesPage.dart'; import 'package:cafegation/page/map_page/mapPage.dart'; +import 'package:cafegation/page/search_page/search_screen.dart'; import 'package:cafegation/page/search_page/searchbar.dart'; import 'package:cafegation/page/tag_page/tagPage.dart'; import 'package:flutter/material.dart'; diff --git a/lib/page/search_page/search_screen.dart b/lib/page/search_page/search_screen.dart index 2a1aae5..f308040 100644 --- a/lib/page/search_page/search_screen.dart +++ b/lib/page/search_page/search_screen.dart @@ -1,5 +1,8 @@ +import 'package:cafegation/models/cafe.dart'; +import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; - +import 'package:cafegation/page/detail_page/detailPage.dart'; +import 'package:cafegation/services/database.dart'; class SearchScreen extends StatefulWidget { _SearchScreenState createState() => _SearchScreenState(); } @@ -19,18 +22,19 @@ class _SearchScreenState extends State { Widget _buildBody(BuildContext context) { return StreamBuilder( - stream: Firestore.instance.collection('movie').snapshots(), + stream: FirebaseFirestore.instance.collection('cae').snapshots(), builder: (context, snapshot) { if (!snapshot.hasData) return LinearProgressIndicator(); - return _buildList(context, snapshot.data.documents); + return _buildList(context, snapshot.data!.docs); }, ); } - Widget _buildList(BuildContext context, List snapshot) { + Widget _buildList(BuildContext context, List snapshot) { List searchResults = []; for (DocumentSnapshot d in snapshot) { - if (d.data.toString().contains(_searchText)) { + final cafe = DataBaseService.instance.cafeBuilder(d); + if (cafe.name.toString().contains(_searchText)) { searchResults.add(d); } } @@ -46,23 +50,23 @@ class _SearchScreenState extends State { } Widget _buildListItem(BuildContext context, DocumentSnapshot data) { - final movie = Movie.fromSnapshot(data); + final cafe = DataBaseService.instance.cafeBuilder(data); return InkWell( - child: Image.network(movie.poster), - onTap: () { - Navigator.of(context).push(MaterialPageRoute( - fullscreenDialog: true, - builder: (BuildContext context) { - return DetailScreen(movie: movie); - })); - }, + child: Image.network(cafe.images), + // onTap: () { + // Navigator.of(context).push(MaterialPageRoute( + // fullscreenDialog: true, + // builder: (BuildContext context) { + // return detailPage(cafe: cafe); + // })); + // }, ); } @override Widget build(BuildContext context) { - return Container( - child: Column( + return Scaffold( + body: Column( children: [ Padding( padding: EdgeInsets.all(30), @@ -83,10 +87,10 @@ class _SearchScreenState extends State { controller: _filter, decoration: InputDecoration( filled: true, - fillColor: Colors.white12, + fillColor: Colors.white, prefixIcon: Icon( Icons.search, - color: Colors.white60, + color: Colors.black, size: 20, ), suffixIcon: focusNode.hasFocus @@ -119,7 +123,7 @@ class _SearchScreenState extends State { ), focusNode.hasFocus ? Expanded( - child: FlatButton( + child: TextButton( child: Text('취소'), onPressed: () { setState(() { diff --git a/lib/page/search_page/searchbar.dart b/lib/page/search_page/searchbar.dart index 2931aaa..6c62c3a 100644 --- a/lib/page/search_page/searchbar.dart +++ b/lib/page/search_page/searchbar.dart @@ -1,4 +1,5 @@ import 'package:flutter/material.dart'; +import 'package:cafegation/page/search_page/search_screen.dart'; class SearchBar extends StatelessWidget { const SearchBar({ @@ -11,18 +12,30 @@ class SearchBar extends StatelessWidget { margin: EdgeInsets.symmetric(vertical: 20, horizontal: 10), padding: EdgeInsets.symmetric(horizontal: 30, vertical: 5), decoration: BoxDecoration( - boxShadow: [BoxShadow(color: Colors.grey.withOpacity(0.5), - offset: Offset(0, 3))], + boxShadow: [ + BoxShadow(color: Colors.grey.withOpacity(0.5), offset: Offset(0, 3)) + ], color: Colors.white24, borderRadius: BorderRadius.circular(20), ), - child: TextField( - decoration: InputDecoration( - hintText: "카페 검색하기", - border: InputBorder.none, - icon: Icon(Icons.search), - iconColor: Colors.black + // child: TextField( + // decoration: InputDecoration( + // hintText: "카페 검색하기", + // border: InputBorder.none, + // icon: Icon(Icons.search), + // iconColor: Colors.black + // ), + // ), + // child: Scaffold(body: TabBarView(children: [SearchScreen(),])) + child: IconButton( + icon: Icon( + Icons.search, + size: 20, ), + onPressed: () { + Navigator.push( + context, MaterialPageRoute(builder: (context) => SearchScreen())); + }, ), ); } diff --git a/pubspec.lock b/pubspec.lock index 2068dc4..0cb8f2b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -42,42 +42,42 @@ packages: name: cloud_firestore url: "https://pub.dartlang.org" source: hosted - version: "3.1.5" + version: "3.4.6" cloud_firestore_platform_interface: dependency: transitive description: name: cloud_firestore_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "5.4.10" + version: "5.7.3" cloud_firestore_web: dependency: transitive description: name: cloud_firestore_web url: "https://pub.dartlang.org" source: hosted - version: "2.6.5" + version: "2.8.6" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.0.5" fake_async: dependency: transitive description: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" favorite_button: dependency: "direct main" description: @@ -91,42 +91,42 @@ packages: name: firebase_auth url: "https://pub.dartlang.org" source: hosted - version: "3.3.4" + version: "3.7.0" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "6.1.9" + version: "6.6.0" firebase_auth_web: dependency: transitive description: name: firebase_auth_web url: "https://pub.dartlang.org" source: hosted - version: "3.3.5" + version: "4.3.0" firebase_core: dependency: "direct main" description: name: firebase_core url: "https://pub.dartlang.org" source: hosted - version: "1.10.6" + version: "1.21.1" firebase_core_platform_interface: dependency: transitive description: name: firebase_core_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.2.3" + version: "4.5.1" firebase_core_web: dependency: transitive description: name: firebase_core_web url: "https://pub.dartlang.org" source: hosted - version: "1.5.3" + version: "1.7.2" flutter: dependency: "direct main" description: flutter @@ -145,14 +145,14 @@ packages: name: flutter_plugin_android_lifecycle url: "https://pub.dartlang.org" source: hosted - version: "2.0.5" + version: "2.0.7" flutter_rating_bar: dependency: "direct main" description: name: flutter_rating_bar url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" flutter_spinkit: dependency: "direct main" description: @@ -176,70 +176,84 @@ packages: name: geolocator url: "https://pub.dartlang.org" source: hosted - version: "8.2.0" + version: "8.2.1" geolocator_android: dependency: transitive description: name: geolocator_android url: "https://pub.dartlang.org" source: hosted - version: "3.1.3" + version: "3.2.1" geolocator_apple: dependency: transitive description: name: geolocator_apple url: "https://pub.dartlang.org" source: hosted - version: "2.1.1+1" + version: "2.2.1" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "4.0.4" + version: "4.0.6" geolocator_web: dependency: "direct main" description: name: geolocator_web url: "https://pub.dartlang.org" source: hosted - version: "2.1.4" + version: "2.1.6" geolocator_windows: dependency: transitive description: name: geolocator_windows url: "https://pub.dartlang.org" source: hosted - version: "0.1.0" + version: "0.1.1" google_maps_flutter: dependency: "direct main" description: name: google_maps_flutter url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.12" + google_maps_flutter_android: + dependency: transitive + description: + name: google_maps_flutter_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.2.0" + google_maps_flutter_ios: + dependency: transitive + description: + name: google_maps_flutter_ios + url: "https://pub.dartlang.org" + source: hosted + version: "2.1.11" google_maps_flutter_platform_interface: dependency: transitive description: name: google_maps_flutter_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "2.1.3" + version: "2.2.2" http: dependency: transitive description: name: http url: "https://pub.dartlang.org" source: hosted - version: "0.13.4" + version: "0.13.5" http_parser: dependency: transitive description: name: http_parser url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.0.1" intl: dependency: transitive description: @@ -253,7 +267,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" kakaomap_webview: dependency: "direct main" description: @@ -274,7 +288,7 @@ packages: name: location url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "4.4.0" location_platform_interface: dependency: transitive description: @@ -302,7 +316,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -323,7 +337,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" plugin_platform_interface: dependency: transitive description: @@ -337,7 +351,7 @@ packages: name: provider url: "https://pub.dartlang.org" source: hosted - version: "6.0.1" + version: "6.0.3" sky_engine: dependency: transitive description: flutter @@ -349,7 +363,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -391,7 +405,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.9" transparent_image: dependency: "direct main" description: @@ -405,14 +419,14 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" webview_flutter: dependency: transitive description: @@ -426,21 +440,21 @@ packages: name: webview_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.8.2" + version: "2.9.5" webview_flutter_platform_interface: dependency: transitive description: name: webview_flutter_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.9.2" webview_flutter_wkwebview: dependency: transitive description: name: webview_flutter_wkwebview url: "https://pub.dartlang.org" source: hosted - version: "2.7.1" + version: "2.9.3" sdks: - dart: ">=2.15.1 <3.0.0" - flutter: ">=2.8.0" + dart: ">=2.17.0 <3.0.0" + flutter: ">=3.0.0" From 33e24f1374464ab632489c72c892bddc673f7b43 Mon Sep 17 00:00:00 2001 From: Pjunn <89245460+Pjunn@users.noreply.github.com> Date: Mon, 5 Sep 2022 23:07:12 +0900 Subject: [PATCH 03/11] FIX: modify search bar design MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 서치바 디자인 보기 좋게 바꾸었음 --- lib/page/detail_page/detailPage.dart | 4 +- lib/page/search_page/searchPage.dart | 49 +++++++++++++++++++------ lib/page/search_page/search_screen.dart | 14 ++++++- lib/page/search_page/searchbar.dart | 18 ++++++--- pubspec.lock | 36 +++++++++--------- 5 files changed, 81 insertions(+), 40 deletions(-) diff --git a/lib/page/detail_page/detailPage.dart b/lib/page/detail_page/detailPage.dart index 4b80ac6..9c7cb1e 100644 --- a/lib/page/detail_page/detailPage.dart +++ b/lib/page/detail_page/detailPage.dart @@ -27,7 +27,7 @@ class _detailPageState extends State { PreferredSizeWidget _appBarWidget() { DocumentReference _documentReference = - FirebaseFirestore.instance.collection('cafes').doc(widget.cafeName); + FirebaseFirestore.instance.collection('cae').doc(widget.cafeName); return AppBar( elevation: 0, @@ -82,7 +82,7 @@ class _detailPageState extends State { var size = MediaQuery.of(context).size; DocumentReference _documentReference = - FirebaseFirestore.instance.collection('cafes').doc(widget.cafeName); + FirebaseFirestore.instance.collection('cae').doc(widget.cafeName); return StreamBuilder( stream: _documentReference.snapshots(), diff --git a/lib/page/search_page/searchPage.dart b/lib/page/search_page/searchPage.dart index 1c5d8fd..1979d94 100644 --- a/lib/page/search_page/searchPage.dart +++ b/lib/page/search_page/searchPage.dart @@ -25,7 +25,7 @@ class _searchPageState extends State { appBar: AppBar( backgroundColor: Colors.blue[200], shadowColor: Colors.blue[300], - title: Text('Search Page'), + title: Text('Main Page'), automaticallyImplyLeading: false, leading: const SizedBox( width: 100, @@ -47,7 +47,7 @@ class _searchPageState extends State { child: Column( children: [ SearchBar(), - SizedBox(height: 30), + SizedBox(height: 1), Container( width: MediaQuery.of(context).size.width * 0.9, height: MediaQuery.of(context).size.height * 0.09, @@ -59,7 +59,10 @@ class _searchPageState extends State { primary: Color(0xFF2C2E43), onPrimary: Colors.black), onPressed: () { - Navigator.push(context, MaterialPageRoute(builder: (context) => KakaoMapTest())); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => KakaoMapTest())); // _openKakaoMapScreen(context); }, child: Row(children: [ @@ -72,7 +75,11 @@ class _searchPageState extends State { ), Text( '내 주변 카페 찾기', - style: TextStyle(color: Colors.white, fontSize: 23.0, letterSpacing: 5.0, fontWeight: FontWeight.normal), + style: TextStyle( + color: Colors.white, + fontSize: 23.0, + letterSpacing: 5.0, + fontWeight: FontWeight.normal), ), ]), ), @@ -89,7 +96,10 @@ class _searchPageState extends State { primary: Color(0xFF2C2E43), onPrimary: Colors.black), onPressed: () { - Navigator.push(context, MaterialPageRoute(builder: (context) => tagPage())); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => tagPage())); }, child: Row(children: [ Icon( @@ -101,7 +111,11 @@ class _searchPageState extends State { ), Text( '카테고리별 카페 찾기', - style: TextStyle(color: Colors.white, fontSize: 23.0, letterSpacing: 5.0, fontWeight: FontWeight.normal), + style: TextStyle( + color: Colors.white, + fontSize: 23.0, + letterSpacing: 5.0, + fontWeight: FontWeight.normal), ), ]), ), @@ -118,7 +132,10 @@ class _searchPageState extends State { primary: Color(0xFF2C2E43), onPrimary: Colors.black), onPressed: () { - Navigator.push(context, MaterialPageRoute(builder: (context) => favoritesPage())); + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => favoritesPage())); }, child: Row(children: [ Icon( @@ -130,7 +147,11 @@ class _searchPageState extends State { ), Text( '즐겨찾는 카페 찾기', - style: TextStyle(color: Colors.white, fontSize: 23.0, letterSpacing: 5.0, fontWeight: FontWeight.normal), + style: TextStyle( + color: Colors.white, + fontSize: 23.0, + letterSpacing: 5.0, + fontWeight: FontWeight.normal), ), ]), ), @@ -153,14 +174,17 @@ Future _openKakaoMapScreen(BuildContext context) async { // util.getKakaoMapURL(37.402056, 127.108212, name: 'Kakao 본사')); /// This is short form of the above comment - String url = await util.getMapScreenURL(37.5515814, 126.9227864, name: '홍익대학교'); + String url = + await util.getMapScreenURL(37.5515814, 126.9227864, name: '홍익대학교'); debugPrint('url : $url'); - Navigator.push(context, MaterialPageRoute(builder: (_) => KakaoMapScreen(url: url))); + Navigator.push( + context, MaterialPageRoute(builder: (_) => KakaoMapScreen(url: url))); } -Widget _testingCustomScript({required Size size, required BuildContext context}) { +Widget _testingCustomScript( + {required Size size, required BuildContext context}) { return KakaoMapView( width: size.width, height: 400, @@ -195,6 +219,7 @@ Widget _testingCustomScript({required Size size, required BuildContext context}) ''', onTapMarker: (message) { - ScaffoldMessenger.of(context).showSnackBar(SnackBar(content: Text(message.message))); + ScaffoldMessenger.of(context) + .showSnackBar(SnackBar(content: Text(message.message))); }); } diff --git a/lib/page/search_page/search_screen.dart b/lib/page/search_page/search_screen.dart index f308040..e38e19c 100644 --- a/lib/page/search_page/search_screen.dart +++ b/lib/page/search_page/search_screen.dart @@ -3,6 +3,7 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:cafegation/page/detail_page/detailPage.dart'; import 'package:cafegation/services/database.dart'; + class SearchScreen extends StatefulWidget { _SearchScreenState createState() => _SearchScreenState(); } @@ -30,7 +31,7 @@ class _SearchScreenState extends State { ); } - Widget _buildList(BuildContext context, List snapshot) { + Widget _buildList(BuildContext context, List snapshot) { List searchResults = []; for (DocumentSnapshot d in snapshot) { final cafe = DataBaseService.instance.cafeBuilder(d); @@ -60,6 +61,15 @@ class _SearchScreenState extends State { // return detailPage(cafe: cafe); // })); // }, + onTap: () { + Navigator.push( + context, + MaterialPageRoute( + builder: (context) => detailPage( + cafeName: cafe.name, + )), + ); + }, ); } @@ -146,4 +156,4 @@ class _SearchScreenState extends State { ), ); } -} \ No newline at end of file +} diff --git a/lib/page/search_page/searchbar.dart b/lib/page/search_page/searchbar.dart index 6c62c3a..792d602 100644 --- a/lib/page/search_page/searchbar.dart +++ b/lib/page/search_page/searchbar.dart @@ -9,8 +9,9 @@ class SearchBar extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - margin: EdgeInsets.symmetric(vertical: 20, horizontal: 10), - padding: EdgeInsets.symmetric(horizontal: 30, vertical: 5), + alignment: Alignment(-1.0, 0.0), + margin: EdgeInsets.symmetric(vertical: 30, horizontal: 20), + padding: EdgeInsets.symmetric(horizontal: 20, vertical: 6), decoration: BoxDecoration( boxShadow: [ BoxShadow(color: Colors.grey.withOpacity(0.5), offset: Offset(0, 3)) @@ -27,10 +28,15 @@ class SearchBar extends StatelessWidget { // ), // ), // child: Scaffold(body: TabBarView(children: [SearchScreen(),])) - child: IconButton( - icon: Icon( - Icons.search, - size: 20, + child: TextButton.icon( + label: Text( + '카페 검색하기', + style: TextStyle(fontSize: 19), + ), + icon: Icon(Icons.search, size: 22), + style: TextButton.styleFrom( + primary: Colors.black54, + alignment: Alignment.centerLeft, ), onPressed: () { Navigator.push( diff --git a/pubspec.lock b/pubspec.lock index 0cb8f2b..1aa5949 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -63,7 +63,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: @@ -77,7 +77,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" favorite_button: dependency: "direct main" description: @@ -91,21 +91,21 @@ packages: name: firebase_auth url: "https://pub.dartlang.org" source: hosted - version: "3.7.0" + version: "3.4.2" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "6.6.0" + version: "6.3.2" firebase_auth_web: dependency: transitive description: name: firebase_auth_web url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "4.0.0" firebase_core: dependency: "direct main" description: @@ -183,7 +183,7 @@ packages: name: geolocator_android url: "https://pub.dartlang.org" source: hosted - version: "3.2.1" + version: "3.1.8" geolocator_apple: dependency: transitive description: @@ -225,7 +225,7 @@ packages: name: google_maps_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.1.10" google_maps_flutter_ios: dependency: transitive description: @@ -267,7 +267,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.4" + version: "0.6.3" kakaomap_webview: dependency: "direct main" description: @@ -316,7 +316,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.3" meta: dependency: transitive description: @@ -337,7 +337,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" plugin_platform_interface: dependency: transitive description: @@ -363,7 +363,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -405,7 +405,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" transparent_image: dependency: "direct main" description: @@ -419,14 +419,14 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" webview_flutter: dependency: transitive description: @@ -440,7 +440,7 @@ packages: name: webview_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.9.5" + version: "2.8.14" webview_flutter_platform_interface: dependency: transitive description: @@ -454,7 +454,7 @@ packages: name: webview_flutter_wkwebview url: "https://pub.dartlang.org" source: hosted - version: "2.9.3" + version: "2.7.5" sdks: - dart: ">=2.17.0 <3.0.0" - flutter: ">=3.0.0" + dart: ">=2.16.0 <3.0.0" + flutter: ">=2.8.0" From 8b2cea9a77be364e2a76938a9994c5bfd20df145 Mon Sep 17 00:00:00 2001 From: Pjunn <89245460+Pjunn@users.noreply.github.com> Date: Tue, 30 Aug 2022 10:22:04 +0900 Subject: [PATCH 04/11] FEAT: create search screen MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 아직 미완 --- lib/page/search_page/search_screen.dart | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/page/search_page/search_screen.dart b/lib/page/search_page/search_screen.dart index e38e19c..2abe404 100644 --- a/lib/page/search_page/search_screen.dart +++ b/lib/page/search_page/search_screen.dart @@ -3,6 +3,7 @@ import 'package:cloud_firestore/cloud_firestore.dart'; import 'package:flutter/material.dart'; import 'package:cafegation/page/detail_page/detailPage.dart'; import 'package:cafegation/services/database.dart'; +import 'package:cafegation/page/list_page/CafeItem.dart'; class SearchScreen extends StatefulWidget { _SearchScreenState createState() => _SearchScreenState(); @@ -52,6 +53,8 @@ class _SearchScreenState extends State { Widget _buildListItem(BuildContext context, DocumentSnapshot data) { final cafe = DataBaseService.instance.cafeBuilder(data); + + return InkWell( child: Image.network(cafe.images), // onTap: () { @@ -67,6 +70,7 @@ class _SearchScreenState extends State { MaterialPageRoute( builder: (context) => detailPage( cafeName: cafe.name, + likedStatus: cafe. )), ); }, From fae6a6850abceedc05aa4dd30a843d04e056416e Mon Sep 17 00:00:00 2001 From: Pjunn Date: Tue, 30 Aug 2022 17:57:08 +0900 Subject: [PATCH 05/11] FEAT: create search page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 서치 페이지 완성함. 검색결과에서 디테일 페이지로 이어지게 만들기 필요 --- lib/page/search_page/search_screen.dart | 2 +- pubspec.lock | 36 ++++++++++++------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/page/search_page/search_screen.dart b/lib/page/search_page/search_screen.dart index 2abe404..607dbbd 100644 --- a/lib/page/search_page/search_screen.dart +++ b/lib/page/search_page/search_screen.dart @@ -32,7 +32,7 @@ class _SearchScreenState extends State { ); } - Widget _buildList(BuildContext context, List snapshot) { + Widget _buildList(BuildContext context, List snapshot) { List searchResults = []; for (DocumentSnapshot d in snapshot) { final cafe = DataBaseService.instance.cafeBuilder(d); diff --git a/pubspec.lock b/pubspec.lock index 1aa5949..0cb8f2b 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -63,7 +63,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: @@ -77,7 +77,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" favorite_button: dependency: "direct main" description: @@ -91,21 +91,21 @@ packages: name: firebase_auth url: "https://pub.dartlang.org" source: hosted - version: "3.4.2" + version: "3.7.0" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "6.3.2" + version: "6.6.0" firebase_auth_web: dependency: transitive description: name: firebase_auth_web url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.3.0" firebase_core: dependency: "direct main" description: @@ -183,7 +183,7 @@ packages: name: geolocator_android url: "https://pub.dartlang.org" source: hosted - version: "3.1.8" + version: "3.2.1" geolocator_apple: dependency: transitive description: @@ -225,7 +225,7 @@ packages: name: google_maps_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.1.10" + version: "2.2.0" google_maps_flutter_ios: dependency: transitive description: @@ -267,7 +267,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" kakaomap_webview: dependency: "direct main" description: @@ -316,7 +316,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -337,7 +337,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" plugin_platform_interface: dependency: transitive description: @@ -363,7 +363,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -405,7 +405,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.9" transparent_image: dependency: "direct main" description: @@ -419,14 +419,14 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" webview_flutter: dependency: transitive description: @@ -440,7 +440,7 @@ packages: name: webview_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.8.14" + version: "2.9.5" webview_flutter_platform_interface: dependency: transitive description: @@ -454,7 +454,7 @@ packages: name: webview_flutter_wkwebview url: "https://pub.dartlang.org" source: hosted - version: "2.7.5" + version: "2.9.3" sdks: - dart: ">=2.16.0 <3.0.0" - flutter: ">=2.8.0" + dart: ">=2.17.0 <3.0.0" + flutter: ">=3.0.0" From 7cee827fa35a9a5ca4a41d60fdc5c8c43059462f Mon Sep 17 00:00:00 2001 From: Pjunn <89245460+Pjunn@users.noreply.github.com> Date: Mon, 5 Sep 2022 23:07:12 +0900 Subject: [PATCH 06/11] FIX: modify search bar design MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 서치바 디자인 보기 좋게 바꾸었음 --- lib/page/search_page/search_screen.dart | 2 +- pubspec.lock | 36 ++++++++++++------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/page/search_page/search_screen.dart b/lib/page/search_page/search_screen.dart index 607dbbd..2abe404 100644 --- a/lib/page/search_page/search_screen.dart +++ b/lib/page/search_page/search_screen.dart @@ -32,7 +32,7 @@ class _SearchScreenState extends State { ); } - Widget _buildList(BuildContext context, List snapshot) { + Widget _buildList(BuildContext context, List snapshot) { List searchResults = []; for (DocumentSnapshot d in snapshot) { final cafe = DataBaseService.instance.cafeBuilder(d); diff --git a/pubspec.lock b/pubspec.lock index 0cb8f2b..1aa5949 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -63,7 +63,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: @@ -77,7 +77,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" favorite_button: dependency: "direct main" description: @@ -91,21 +91,21 @@ packages: name: firebase_auth url: "https://pub.dartlang.org" source: hosted - version: "3.7.0" + version: "3.4.2" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "6.6.0" + version: "6.3.2" firebase_auth_web: dependency: transitive description: name: firebase_auth_web url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "4.0.0" firebase_core: dependency: "direct main" description: @@ -183,7 +183,7 @@ packages: name: geolocator_android url: "https://pub.dartlang.org" source: hosted - version: "3.2.1" + version: "3.1.8" geolocator_apple: dependency: transitive description: @@ -225,7 +225,7 @@ packages: name: google_maps_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.1.10" google_maps_flutter_ios: dependency: transitive description: @@ -267,7 +267,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.4" + version: "0.6.3" kakaomap_webview: dependency: "direct main" description: @@ -316,7 +316,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.3" meta: dependency: transitive description: @@ -337,7 +337,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" plugin_platform_interface: dependency: transitive description: @@ -363,7 +363,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -405,7 +405,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" transparent_image: dependency: "direct main" description: @@ -419,14 +419,14 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" webview_flutter: dependency: transitive description: @@ -440,7 +440,7 @@ packages: name: webview_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.9.5" + version: "2.8.14" webview_flutter_platform_interface: dependency: transitive description: @@ -454,7 +454,7 @@ packages: name: webview_flutter_wkwebview url: "https://pub.dartlang.org" source: hosted - version: "2.9.3" + version: "2.7.5" sdks: - dart: ">=2.17.0 <3.0.0" - flutter: ">=3.0.0" + dart: ">=2.16.0 <3.0.0" + flutter: ">=2.8.0" From fb24c22fcc1f7f80d281431c9859aca5e07ee33d Mon Sep 17 00:00:00 2001 From: Pjunn <89245460+Pjunn@users.noreply.github.com> Date: Fri, 23 Sep 2022 21:32:52 +0900 Subject: [PATCH 07/11] Update search_screen.dart --- lib/page/search_page/search_screen.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/page/search_page/search_screen.dart b/lib/page/search_page/search_screen.dart index 2abe404..6860a27 100644 --- a/lib/page/search_page/search_screen.dart +++ b/lib/page/search_page/search_screen.dart @@ -4,6 +4,7 @@ import 'package:flutter/material.dart'; import 'package:cafegation/page/detail_page/detailPage.dart'; import 'package:cafegation/services/database.dart'; import 'package:cafegation/page/list_page/CafeItem.dart'; +import 'package:cafegation/services/auth.dart'; class SearchScreen extends StatefulWidget { _SearchScreenState createState() => _SearchScreenState(); @@ -53,7 +54,7 @@ class _SearchScreenState extends State { Widget _buildListItem(BuildContext context, DocumentSnapshot data) { final cafe = DataBaseService.instance.cafeBuilder(data); - + final state = false; return InkWell( child: Image.network(cafe.images), @@ -69,8 +70,8 @@ class _SearchScreenState extends State { context, MaterialPageRoute( builder: (context) => detailPage( - cafeName: cafe.name, - likedStatus: cafe. + cafeName: cafe.id, + likedStatus: state, )), ); }, From d3bbb90bba4673dd39f823910baaf812d1fa4474 Mon Sep 17 00:00:00 2001 From: Pjunn <89245460+Pjunn@users.noreply.github.com> Date: Sat, 24 Sep 2022 16:42:46 +0900 Subject: [PATCH 08/11] Update local.properties --- android/local.properties | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/local.properties b/android/local.properties index 0dd7592..dafbf73 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,5 +1,5 @@ -sdk.dir=/Users/jisu/Library/Android/sdk -flutter.sdk=/Users/jisu/flutter +sdk.dir=C:\\Users\\Junseo21\\AppData\\Local\\Android\\sdk +flutter.sdk=C:\\flutter\\flutter_windows_2.10.2-stable\\flutter flutter.buildMode=debug flutter.versionName=1.0.0 flutter.versionCode=1 From ea365e28896316fba31a3cbbd0e97f3cf5255c96 Mon Sep 17 00:00:00 2001 From: Pjunn Date: Tue, 30 Aug 2022 17:57:08 +0900 Subject: [PATCH 09/11] FEAT: create search page MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 서치 페이지 완성함. 검색결과에서 디테일 페이지로 이어지게 만들기 필요 --- lib/page/search_page/search_screen.dart | 2 +- pubspec.lock | 37 +++++++++++++++---------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/lib/page/search_page/search_screen.dart b/lib/page/search_page/search_screen.dart index 6860a27..512bfd8 100644 --- a/lib/page/search_page/search_screen.dart +++ b/lib/page/search_page/search_screen.dart @@ -33,7 +33,7 @@ class _SearchScreenState extends State { ); } - Widget _buildList(BuildContext context, List snapshot) { + Widget _buildList(BuildContext context, List snapshot) { List searchResults = []; for (DocumentSnapshot d in snapshot) { final cafe = DataBaseService.instance.cafeBuilder(d); diff --git a/pubspec.lock b/pubspec.lock index 1aa5949..ec977a6 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -63,7 +63,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.15.0" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: @@ -77,7 +77,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.2.0" + version: "1.3.0" favorite_button: dependency: "direct main" description: @@ -91,21 +91,21 @@ packages: name: firebase_auth url: "https://pub.dartlang.org" source: hosted - version: "3.4.2" + version: "3.7.0" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "6.3.2" + version: "6.6.0" firebase_auth_web: dependency: transitive description: name: firebase_auth_web url: "https://pub.dartlang.org" source: hosted - version: "4.0.0" + version: "4.3.0" firebase_core: dependency: "direct main" description: @@ -183,7 +183,7 @@ packages: name: geolocator_android url: "https://pub.dartlang.org" source: hosted - version: "3.1.8" + version: "3.2.1" geolocator_apple: dependency: transitive description: @@ -225,7 +225,7 @@ packages: name: google_maps_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.1.10" + version: "2.2.0" google_maps_flutter_ios: dependency: transitive description: @@ -267,7 +267,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.3" + version: "0.6.4" kakaomap_webview: dependency: "direct main" description: @@ -316,7 +316,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.3" + version: "0.1.4" meta: dependency: transitive description: @@ -337,7 +337,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.0" + version: "1.8.1" plugin_platform_interface: dependency: transitive description: @@ -363,7 +363,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.2" stack_trace: dependency: transitive description: @@ -405,7 +405,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.8" + version: "0.4.9" transparent_image: dependency: "direct main" description: @@ -419,14 +419,14 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.3.1" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.1" + version: "2.1.2" webview_flutter: dependency: transitive description: @@ -440,7 +440,7 @@ packages: name: webview_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.8.14" + version: "2.9.5" webview_flutter_platform_interface: dependency: transitive description: @@ -454,7 +454,14 @@ packages: name: webview_flutter_wkwebview url: "https://pub.dartlang.org" source: hosted +<<<<<<< HEAD version: "2.7.5" sdks: dart: ">=2.16.0 <3.0.0" flutter: ">=2.8.0" +======= + version: "2.9.3" +sdks: + dart: ">=2.17.0 <3.0.0" + flutter: ">=3.0.0" +>>>>>>> bb9b173 (FEAT: create search page) From 04f42fbb179fb1320b8944d8f34bbfb0ceffc8a3 Mon Sep 17 00:00:00 2001 From: Pjunn <89245460+Pjunn@users.noreply.github.com> Date: Mon, 5 Sep 2022 23:07:12 +0900 Subject: [PATCH 10/11] FIX: modify search bar design MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 서치바 디자인 보기 좋게 바꾸었음 --- lib/page/search_page/search_screen.dart | 2 +- pubspec.lock | 37 +++++++++++++++---------- 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/lib/page/search_page/search_screen.dart b/lib/page/search_page/search_screen.dart index 512bfd8..6860a27 100644 --- a/lib/page/search_page/search_screen.dart +++ b/lib/page/search_page/search_screen.dart @@ -33,7 +33,7 @@ class _SearchScreenState extends State { ); } - Widget _buildList(BuildContext context, List snapshot) { + Widget _buildList(BuildContext context, List snapshot) { List searchResults = []; for (DocumentSnapshot d in snapshot) { final cafe = DataBaseService.instance.cafeBuilder(d); diff --git a/pubspec.lock b/pubspec.lock index ec977a6..0cc86a1 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -63,7 +63,7 @@ packages: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.16.0" + version: "1.15.0" cupertino_icons: dependency: "direct main" description: @@ -77,7 +77,7 @@ packages: name: fake_async url: "https://pub.dartlang.org" source: hosted - version: "1.3.0" + version: "1.2.0" favorite_button: dependency: "direct main" description: @@ -91,21 +91,21 @@ packages: name: firebase_auth url: "https://pub.dartlang.org" source: hosted - version: "3.7.0" + version: "3.4.2" firebase_auth_platform_interface: dependency: transitive description: name: firebase_auth_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "6.6.0" + version: "6.3.2" firebase_auth_web: dependency: transitive description: name: firebase_auth_web url: "https://pub.dartlang.org" source: hosted - version: "4.3.0" + version: "4.0.0" firebase_core: dependency: "direct main" description: @@ -183,7 +183,7 @@ packages: name: geolocator_android url: "https://pub.dartlang.org" source: hosted - version: "3.2.1" + version: "3.1.8" geolocator_apple: dependency: transitive description: @@ -225,7 +225,7 @@ packages: name: google_maps_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.2.0" + version: "2.1.10" google_maps_flutter_ios: dependency: transitive description: @@ -267,7 +267,7 @@ packages: name: js url: "https://pub.dartlang.org" source: hosted - version: "0.6.4" + version: "0.6.3" kakaomap_webview: dependency: "direct main" description: @@ -316,7 +316,7 @@ packages: name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "0.1.4" + version: "0.1.3" meta: dependency: transitive description: @@ -337,7 +337,7 @@ packages: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.8.1" + version: "1.8.0" plugin_platform_interface: dependency: transitive description: @@ -363,7 +363,7 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.8.2" + version: "1.8.1" stack_trace: dependency: transitive description: @@ -405,7 +405,7 @@ packages: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.4.9" + version: "0.4.8" transparent_image: dependency: "direct main" description: @@ -419,14 +419,14 @@ packages: name: typed_data url: "https://pub.dartlang.org" source: hosted - version: "1.3.1" + version: "1.3.0" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.1.2" + version: "2.1.1" webview_flutter: dependency: transitive description: @@ -440,7 +440,7 @@ packages: name: webview_flutter_android url: "https://pub.dartlang.org" source: hosted - version: "2.9.5" + version: "2.8.14" webview_flutter_platform_interface: dependency: transitive description: @@ -454,6 +454,7 @@ packages: name: webview_flutter_wkwebview url: "https://pub.dartlang.org" source: hosted +<<<<<<< HEAD <<<<<<< HEAD version: "2.7.5" sdks: @@ -465,3 +466,9 @@ sdks: dart: ">=2.17.0 <3.0.0" flutter: ">=3.0.0" >>>>>>> bb9b173 (FEAT: create search page) +======= + version: "2.7.5" +sdks: + dart: ">=2.16.0 <3.0.0" + flutter: ">=2.8.0" +>>>>>>> 31a9305 (FIX: modify search bar design) From 89ae9761b9cf43838dbc7bba6f6217be4ae2aa2e Mon Sep 17 00:00:00 2001 From: Pjunn Date: Wed, 28 Sep 2022 14:44:13 +0900 Subject: [PATCH 11/11] FEAT: link search screen done --- android/local.properties | 4 ++-- lib/page/detail_page/detailPage.dart | 3 +-- lib/page/favorites_page/favorite_cafe_item.dart | 1 - lib/page/list_page/CafeItem.dart | 1 - lib/page/search_page/search_screen.dart | 2 -- 5 files changed, 3 insertions(+), 8 deletions(-) diff --git a/android/local.properties b/android/local.properties index 9d11218..b7b8aeb 100644 --- a/android/local.properties +++ b/android/local.properties @@ -1,5 +1,5 @@ -sdk.dir=C:\\Users\\Junseo21\\AppData\\Local\\Android\\sdk -flutter.sdk=C:\\flutter\\flutter_windows_2.10.2-stable\\flutter +sdk.dir=/Users/parkjunseo/Library/Android/sdk +flutter.sdk=/Users/parkjunseo/Developer/flutter flutter.buildMode=debug flutter.versionName=1.0.0 flutter.versionCode=1 diff --git a/lib/page/detail_page/detailPage.dart b/lib/page/detail_page/detailPage.dart index d7be196..a4a2039 100644 --- a/lib/page/detail_page/detailPage.dart +++ b/lib/page/detail_page/detailPage.dart @@ -7,11 +7,10 @@ import 'package:cafegation/models/cafe.dart'; class detailPage extends StatefulWidget { const detailPage( - {Key? key, required this.cafeName, required this.likedStatus}) + {Key? key, required this.cafeName}) : super(key: key); final String cafeName; - final bool likedStatus; @override _detailPageState createState() => _detailPageState(); } diff --git a/lib/page/favorites_page/favorite_cafe_item.dart b/lib/page/favorites_page/favorite_cafe_item.dart index 79bfc41..87a84d9 100644 --- a/lib/page/favorites_page/favorite_cafe_item.dart +++ b/lib/page/favorites_page/favorite_cafe_item.dart @@ -27,7 +27,6 @@ class _FavoriteCafeItemState extends State { MaterialPageRoute( builder: (context) => detailPage( cafeName: widget.cafe.id, - likedStatus: true, )), ); }, diff --git a/lib/page/list_page/CafeItem.dart b/lib/page/list_page/CafeItem.dart index 0cc401b..93df61b 100644 --- a/lib/page/list_page/CafeItem.dart +++ b/lib/page/list_page/CafeItem.dart @@ -37,7 +37,6 @@ class _CafeItemState extends State { MaterialPageRoute( builder: (context) => detailPage( cafeName: widget.cafe.id, - likedStatus: state, )), ); }, diff --git a/lib/page/search_page/search_screen.dart b/lib/page/search_page/search_screen.dart index 6860a27..04fa1d5 100644 --- a/lib/page/search_page/search_screen.dart +++ b/lib/page/search_page/search_screen.dart @@ -54,7 +54,6 @@ class _SearchScreenState extends State { Widget _buildListItem(BuildContext context, DocumentSnapshot data) { final cafe = DataBaseService.instance.cafeBuilder(data); - final state = false; return InkWell( child: Image.network(cafe.images), @@ -71,7 +70,6 @@ class _SearchScreenState extends State { MaterialPageRoute( builder: (context) => detailPage( cafeName: cafe.id, - likedStatus: state, )), ); },