From 9e4914a5ada77896754a61bf3af4ddbdfe350df7 Mon Sep 17 00:00:00 2001 From: asha-ndf Date: Fri, 11 Nov 2022 23:38:41 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E5=A4=89=E6=9B=B4=E7=AE=87=E6=89=80?= =?UTF-8?q?=E3=82=92=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AwardApp/lib/backend/backend.dart | 44 - .../lib/backend/schema/firestore.indexes.json | 14 - AwardApp/lib/backend/schema/firestore.rules | 12 +- AwardApp/lib/backend/schema/serializers.dart | 2 - .../lib/backend/schema/serializers.g.dart | 1 - .../lib/components/review_trip_widget.dart | 299 +++ AwardApp/lib/flutter_flow/nav/nav.dart | 13 - AwardApp/lib/index.dart | 2 - AwardApp/lib/maps/maps_widget.dart | 8 +- .../search_properties_widget.dart | 9 +- AwardApp/lib/starmaps/starmaps_widget.dart | 570 ++--- AwardApp/lib/want/want_widget.dart | 1921 ++++------------- AwardApp/pubspec.lock | 572 +++-- AwardApp/pubspec.yaml | 1 - 14 files changed, 1352 insertions(+), 2116 deletions(-) create mode 100644 AwardApp/lib/components/review_trip_widget.dart diff --git a/AwardApp/lib/backend/backend.dart b/AwardApp/lib/backend/backend.dart index 05811a8..a18a11b 100644 --- a/AwardApp/lib/backend/backend.dart +++ b/AwardApp/lib/backend/backend.dart @@ -10,7 +10,6 @@ import 'schema/reviews_record.dart'; import 'schema/amenitities_record.dart'; import 'schema/favorites_record.dart'; import 'schema/collected_stamps_record.dart'; -import 'schema/constellation_record.dart'; import 'schema/serializers.dart'; export 'dart:async' show StreamSubscription; @@ -24,7 +23,6 @@ export 'schema/reviews_record.dart'; export 'schema/amenitities_record.dart'; export 'schema/favorites_record.dart'; export 'schema/collected_stamps_record.dart'; -export 'schema/constellation_record.dart'; /// Functions to query PropertiesRecords (as a Stream and as a Future). Stream> queryPropertiesRecord({ @@ -281,48 +279,6 @@ Future> queryCollectedStampsRecordPage({ isStream: isStream, ); -/// Functions to query ConstellationRecords (as a Stream and as a Future). -Stream> queryConstellationRecord({ - Query Function(Query)? queryBuilder, - int limit = -1, - bool singleRecord = false, -}) => - queryCollection( - ConstellationRecord.collection, - ConstellationRecord.serializer, - queryBuilder: queryBuilder, - limit: limit, - singleRecord: singleRecord, - ); - -Future> queryConstellationRecordOnce({ - Query Function(Query)? queryBuilder, - int limit = -1, - bool singleRecord = false, -}) => - queryCollectionOnce( - ConstellationRecord.collection, - ConstellationRecord.serializer, - queryBuilder: queryBuilder, - limit: limit, - singleRecord: singleRecord, - ); - -Future> queryConstellationRecordPage({ - Query Function(Query)? queryBuilder, - DocumentSnapshot? nextPageMarker, - required int pageSize, - required bool isStream, -}) => - queryCollectionPage( - ConstellationRecord.collection, - ConstellationRecord.serializer, - queryBuilder: queryBuilder, - nextPageMarker: nextPageMarker, - pageSize: pageSize, - isStream: isStream, - ); - Stream> queryCollection(Query collection, Serializer serializer, {Query Function(Query)? queryBuilder, int limit = -1, diff --git a/AwardApp/lib/backend/schema/firestore.indexes.json b/AwardApp/lib/backend/schema/firestore.indexes.json index 0dfcf5b..be6aa35 100644 --- a/AwardApp/lib/backend/schema/firestore.indexes.json +++ b/AwardApp/lib/backend/schema/firestore.indexes.json @@ -14,20 +14,6 @@ } ] }, - { - "collectionGroup": "favorites", - "queryScope": "COLLECTION", - "fields": [ - { - "fieldPath": "userRef", - "order": "ASCENDING" - }, - { - "fieldPath": "visited", - "order": "ASCENDING" - } - ] - }, { "collectionGroup": "favorites", "queryScope": "COLLECTION", diff --git a/AwardApp/lib/backend/schema/firestore.rules b/AwardApp/lib/backend/schema/firestore.rules index 8b807b9..ead62a2 100644 --- a/AwardApp/lib/backend/schema/firestore.rules +++ b/AwardApp/lib/backend/schema/firestore.rules @@ -37,17 +37,15 @@ service cloud.firestore { } match /users/{parent}/CollectedStamps/{document} { - allow create: if request.auth.uid == parent; + allow create: if true; allow read: if true; - allow write: if request.auth.uid == parent; - allow delete: if false; + allow write: if true; + allow delete: if true; } - match /constellation/{document} { - allow create: if true; + match /{path=**}/CollectedStamps/{document} { allow read: if true; - allow write: if false; - allow delete: if false; } + } } diff --git a/AwardApp/lib/backend/schema/serializers.dart b/AwardApp/lib/backend/schema/serializers.dart index 29a7987..f9bf4af 100644 --- a/AwardApp/lib/backend/schema/serializers.dart +++ b/AwardApp/lib/backend/schema/serializers.dart @@ -7,7 +7,6 @@ import 'reviews_record.dart'; import 'amenitities_record.dart'; import 'favorites_record.dart'; import 'collected_stamps_record.dart'; -import 'constellation_record.dart'; import 'index.dart'; @@ -24,7 +23,6 @@ const kDocumentReferenceField = 'Document__Reference__Field'; AmenititiesRecord, FavoritesRecord, CollectedStampsRecord, - ConstellationRecord, ]) final Serializers serializers = (_$serializers.toBuilder() ..add(DocumentReferenceSerializer()) diff --git a/AwardApp/lib/backend/schema/serializers.g.dart b/AwardApp/lib/backend/schema/serializers.g.dart index 766816c..1ba9f1a 100644 --- a/AwardApp/lib/backend/schema/serializers.g.dart +++ b/AwardApp/lib/backend/schema/serializers.g.dart @@ -9,7 +9,6 @@ part of 'serializers.dart'; Serializers _$serializers = (new Serializers().toBuilder() ..add(AmenititiesRecord.serializer) ..add(CollectedStampsRecord.serializer) - ..add(ConstellationRecord.serializer) ..add(FavoritesRecord.serializer) ..add(PropertiesRecord.serializer) ..add(ReviewsRecord.serializer) diff --git a/AwardApp/lib/components/review_trip_widget.dart b/AwardApp/lib/components/review_trip_widget.dart new file mode 100644 index 0000000..2ff232f --- /dev/null +++ b/AwardApp/lib/components/review_trip_widget.dart @@ -0,0 +1,299 @@ +import '../auth/auth_util.dart'; +import '../backend/backend.dart'; +import '../flutter_flow/flutter_flow_animations.dart'; +import '../flutter_flow/flutter_flow_theme.dart'; +import '../flutter_flow/flutter_flow_util.dart'; +import '../flutter_flow/flutter_flow_widgets.dart'; +import 'package:cloud_firestore/cloud_firestore.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter/scheduler.dart'; +import 'package:flutter_animate/flutter_animate.dart'; +import 'package:flutter_rating_bar/flutter_rating_bar.dart'; +import 'package:google_fonts/google_fonts.dart'; + +class ReviewTripWidget extends StatefulWidget { + const ReviewTripWidget({ + Key? key, + this.propertyReference, + this.favotitesDetails, + }) : super(key: key); + + final PropertiesRecord? propertyReference; + final FavoritesRecord? favotitesDetails; + + @override + _ReviewTripWidgetState createState() => _ReviewTripWidgetState(); +} + +class _ReviewTripWidgetState extends State + with TickerProviderStateMixin { + final animationsMap = { + 'buttonOnPageLoadAnimation': AnimationInfo( + trigger: AnimationTrigger.onPageLoad, + effects: [ + FadeEffect( + curve: Curves.easeInOut, + delay: 350.ms, + duration: 600.ms, + begin: 0, + end: 1, + ), + MoveEffect( + curve: Curves.easeInOut, + delay: 350.ms, + duration: 600.ms, + begin: Offset(0, 50), + end: Offset(0, 0), + ), + ScaleEffect( + curve: Curves.easeInOut, + delay: 350.ms, + duration: 600.ms, + begin: 0.6, + end: 1, + ), + ], + ), + }; + TextEditingController? textController; + double? ratingBarValue; + + @override + void initState() { + super.initState(); + setupAnimations( + animationsMap.values.where((anim) => + anim.trigger == AnimationTrigger.onActionTrigger || + !anim.applyInitialState), + this, + ); + + textController = TextEditingController(); + WidgetsBinding.instance.addPostFrameCallback((_) => setState(() {})); + } + + @override + void dispose() { + textController?.dispose(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + return Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 16, 0, 0), + child: Container( + width: double.infinity, + height: double.infinity, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context).secondaryBackground, + boxShadow: [ + BoxShadow( + blurRadius: 6, + color: Color(0x35000000), + offset: Offset(0, -2), + ) + ], + borderRadius: BorderRadius.only( + bottomLeft: Radius.circular(0), + bottomRight: Radius.circular(0), + topLeft: Radius.circular(16), + topRight: Radius.circular(16), + ), + ), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB(16, 12, 16, 16), + child: SingleChildScrollView( + child: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 0, 0, 12), + child: Container( + width: 60, + height: 4, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context).lineGray, + borderRadius: BorderRadius.circular(4), + ), + ), + ), + Row( + mainAxisSize: MainAxisSize.max, + children: [ + Expanded( + child: Text( + 'Rate Your Trip', + textAlign: TextAlign.start, + style: FlutterFlowTheme.of(context).title3, + ), + ), + ], + ), + Row( + mainAxisSize: MainAxisSize.max, + children: [ + Expanded( + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 4, 0, 0), + child: Text( + 'Let us know what you thought of the place below!', + textAlign: TextAlign.start, + style: FlutterFlowTheme.of(context).bodyText1, + ), + ), + ), + ], + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 12, 0, 0), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Expanded( + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 4, 0, 0), + child: Text( + 'How would you rate it?', + textAlign: TextAlign.start, + style: FlutterFlowTheme.of(context).bodyText2, + ), + ), + ), + ], + ), + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 16, 0, 0), + child: RatingBar.builder( + onRatingUpdate: (newValue) => + setState(() => ratingBarValue = newValue), + itemBuilder: (context, index) => Icon( + Icons.star_rounded, + color: FlutterFlowTheme.of(context).primaryColor, + ), + direction: Axis.horizontal, + initialRating: ratingBarValue ??= 0, + unratedColor: FlutterFlowTheme.of(context).lineGray, + itemCount: 5, + itemSize: 48, + glowColor: FlutterFlowTheme.of(context).primaryColor, + ), + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 16, 0, 0), + child: TextFormField( + controller: textController, + obscureText: false, + decoration: InputDecoration( + hintText: 'Please leave a description of the place...', + hintStyle: FlutterFlowTheme.of(context).bodyText1, + enabledBorder: OutlineInputBorder( + borderSide: BorderSide( + color: FlutterFlowTheme.of(context).lineGray, + width: 2, + ), + borderRadius: BorderRadius.circular(8), + ), + focusedBorder: OutlineInputBorder( + borderSide: BorderSide( + color: FlutterFlowTheme.of(context).lineGray, + width: 2, + ), + borderRadius: BorderRadius.circular(8), + ), + errorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 2, + ), + borderRadius: BorderRadius.circular(8), + ), + focusedErrorBorder: OutlineInputBorder( + borderSide: BorderSide( + color: Color(0x00000000), + width: 2, + ), + borderRadius: BorderRadius.circular(8), + ), + ), + style: FlutterFlowTheme.of(context).bodyText2, + maxLines: 4, + ), + ), + Padding( + padding: EdgeInsetsDirectional.fromSTEB(0, 32, 0, 0), + child: FFButtonWidget( + onPressed: () async { + final reviewsCreateData = createReviewsRecordData( + propertyRef: widget.propertyReference!.reference, + userRef: currentUserReference, + rating: ratingBarValue, + ratingDescription: textController!.text, + ratingCreated: getCurrentTimestamp, + ); + await ReviewsRecord.collection + .doc() + .set(reviewsCreateData); + + final propertiesUpdateData = { + 'ratingSummary': FieldValue.increment(1.0), + }; + await widget.propertyReference!.reference + .update(propertiesUpdateData); + + context.pushNamed( + 'Want', + extra: { + kTransitionInfoKey: TransitionInfo( + hasTransition: true, + transitionType: PageTransitionType.leftToRight, + duration: Duration(milliseconds: 240), + ), + }, + ); + + ScaffoldMessenger.of(context).showSnackBar( + SnackBar( + content: Text( + 'Your review was submitted succesffuly!', + style: + FlutterFlowTheme.of(context).bodyText1.override( + fontFamily: 'Urbanist', + color: FlutterFlowTheme.of(context) + .tertiaryColor, + ), + ), + duration: Duration(milliseconds: 4000), + backgroundColor: + FlutterFlowTheme.of(context).turquoise, + ), + ); + }, + text: 'Submit Review', + options: FFButtonOptions( + width: 300, + height: 60, + color: FlutterFlowTheme.of(context).primaryColor, + textStyle: FlutterFlowTheme.of(context).title3.override( + fontFamily: 'Urbanist', + color: FlutterFlowTheme.of(context).tertiaryColor, + ), + elevation: 3, + borderSide: BorderSide( + color: Colors.transparent, + width: 1, + ), + borderRadius: BorderRadius.circular(40), + ), + ).animateOnPageLoad( + animationsMap['buttonOnPageLoadAnimation']!), + ), + ], + ), + ), + ), + ), + ); + } +} diff --git a/AwardApp/lib/flutter_flow/nav/nav.dart b/AwardApp/lib/flutter_flow/nav/nav.dart index dc33db7..5ce17eb 100644 --- a/AwardApp/lib/flutter_flow/nav/nav.dart +++ b/AwardApp/lib/flutter_flow/nav/nav.dart @@ -118,19 +118,6 @@ GoRouter createRouter(AppStateNotifier appStateNotifier) => GoRouter( ? NavBarPage(initialPage: 'Want') : WantWidget(), ), - FFRoute( - name: 'WantSpotDetails', - path: 'WantSpotDetails', - asyncParams: { - 'propertyRef': - getDoc('properties', PropertiesRecord.serializer), - }, - builder: (context, params) => WantSpotDetailsWidget( - propertyRef: params.getParam('propertyRef', ParamType.Document), - favotityRef: params.getParam('favotityRef', - ParamType.DocumentReference, false, 'favorites'), - ), - ), FFRoute( name: 'Maps', path: 'maps', diff --git a/AwardApp/lib/index.dart b/AwardApp/lib/index.dart index f26dbae..79823cf 100644 --- a/AwardApp/lib/index.dart +++ b/AwardApp/lib/index.dart @@ -7,8 +7,6 @@ export 'spot_details/spot_details_widget.dart' show SpotDetailsWidget; export 'search_properties/search_properties_widget.dart' show SearchPropertiesWidget; export 'want/want_widget.dart' show WantWidget; -export 'want_spot_details/want_spot_details_widget.dart' - show WantSpotDetailsWidget; export 'maps/maps_widget.dart' show MapsWidget; export 'starmaps/starmaps_widget.dart' show StarmapsWidget; export 'spot_review/spot_review_widget.dart' show SpotReviewWidget; diff --git a/AwardApp/lib/maps/maps_widget.dart b/AwardApp/lib/maps/maps_widget.dart index 2c19508..39118a4 100644 --- a/AwardApp/lib/maps/maps_widget.dart +++ b/AwardApp/lib/maps/maps_widget.dart @@ -117,7 +117,7 @@ class _MapsWidgetState extends State { //マップの初期位置を指定 zoom: 17, //ズーム target: GoogleMaps.LatLng( - 34.54919625630112, 135.5063116098694), //経度,緯度 + 35.69263135901164, 139.7582491687784), //経度,緯度 bearing: 0.0), myLocationEnabled: true, //現在位置をマップ上に表示 onMapCreated: (GoogleMaps.GoogleMapController controller) { @@ -127,9 +127,9 @@ class _MapsWidgetState extends State { GoogleMaps.Marker( markerId: (GoogleMaps.MarkerId('marker1')), position: GoogleMaps.LatLng( - 34.54919625630112, 135.5063116098694), - infoWindow: - GoogleMaps.InfoWindow(title: '日本のヘソ', snippet: 'ハム大'), + 35.69263135901164, 139.7582491687784), + infoWindow: GoogleMaps.InfoWindow( + title: 'JPhacks', snippet: '一橋講堂'), ) }, diff --git a/AwardApp/lib/search_properties/search_properties_widget.dart b/AwardApp/lib/search_properties/search_properties_widget.dart index 1f71bae..70a6f71 100644 --- a/AwardApp/lib/search_properties/search_properties_widget.dart +++ b/AwardApp/lib/search_properties/search_properties_widget.dart @@ -192,10 +192,7 @@ class _SearchPropertiesWidgetState extends State { Padding( padding: EdgeInsetsDirectional.fromSTEB(0, 12, 0, 0), child: StreamBuilder>( - stream: queryPropertiesRecord( - queryBuilder: (propertiesRecord) => propertiesRecord - .where('propertyAddress', isEqualTo: widget.searchTerm), - ), + stream: queryPropertiesRecord(), builder: (context, snapshot) { // Customize what your widget looks like when it's loading. if (!snapshot.hasData) { @@ -259,7 +256,7 @@ class _SearchPropertiesWidgetState extends State { Hero( tag: valueOrDefault( listViewPropertiesRecord.mainImage, - 'https://drive.google.com/uc?id=13aJ-EtZ_AxJqCh_caOc9pvvQ93D0IOrr&.JPG' + + 'https://jphacks.github.io/D_2201/data/cc0images/publicdomainq-0066232.png' + '$listViewIndex', ), transitionOnUserGestures: true, @@ -273,7 +270,7 @@ class _SearchPropertiesWidgetState extends State { child: CachedNetworkImage( imageUrl: valueOrDefault( listViewPropertiesRecord.mainImage, - 'https://drive.google.com/uc?id=13aJ-EtZ_AxJqCh_caOc9pvvQ93D0IOrr&.JPG', + 'https://jphacks.github.io/D_2201/data/cc0images/publicdomainq-0066232.png', ), width: double.infinity, height: 190, diff --git a/AwardApp/lib/starmaps/starmaps_widget.dart b/AwardApp/lib/starmaps/starmaps_widget.dart index 17944cc..dae2172 100644 --- a/AwardApp/lib/starmaps/starmaps_widget.dart +++ b/AwardApp/lib/starmaps/starmaps_widget.dart @@ -1,13 +1,11 @@ import '../flutter_flow/flutter_flow_icon_button.dart'; -import '../backend/backend.dart'; import '../flutter_flow/flutter_flow_theme.dart'; import '../flutter_flow/flutter_flow_util.dart'; +import '../flutter_flow/flutter_flow_web_view.dart'; import 'package:auto_size_text/auto_size_text.dart'; import 'package:flutter/material.dart'; import 'package:google_fonts/google_fonts.dart'; import 'dart:math'; -import 'package:flutter/foundation.dart'; -import 'package:flutter_datetime_picker/flutter_datetime_picker.dart'; class StarmapsWidget extends StatefulWidget { const StarmapsWidget({Key? key}) : super(key: key); @@ -17,7 +15,6 @@ class StarmapsWidget extends StatefulWidget { } class _StarmapsWidgetState extends State { - DateTime? datePicked; final scaffoldKey = GlobalKey(); @override @@ -35,397 +32,262 @@ class _StarmapsWidgetState extends State { appBar: AppBar( backgroundColor: FlutterFlowTheme.of(context).dark600, automaticallyImplyLeading: false, + leading: FlutterFlowIconButton( + borderColor: Colors.transparent, + borderRadius: 30, + borderWidth: 1, + buttonSize: 60, + icon: Icon( + Icons.arrow_back_rounded, + color: FlutterFlowTheme.of(context).primaryText, + size: 30, + ), + onPressed: () async { + context.pop(); + }, + ), title: Text( - 'Astronomical observation', - style: FlutterFlowTheme.of(context).title2.override( - fontFamily: 'Urbanist', - color: FlutterFlowTheme.of(context).tertiaryColor, - fontWeight: FontWeight.bold, - ), + 'starmaps', + style: FlutterFlowTheme.of(context).title2, ), actions: [], centerTitle: false, - elevation: 2, + elevation: 0, ), - body: SafeArea( - child: Stack( - children: [ - DefaultTabController( + body: Column( + mainAxisSize: MainAxisSize.max, + children: [ + Expanded( + child: DefaultTabController( length: 2, initialIndex: 0, child: Column( children: [ TabBar( - labelColor: FlutterFlowTheme.of(context).primaryColor, - labelStyle: FlutterFlowTheme.of(context).bodyText1, - indicatorColor: FlutterFlowTheme.of(context).secondaryColor, + labelColor: FlutterFlowTheme.of(context).turquoise, + unselectedLabelColor: FlutterFlowTheme.of(context).grayIcon, + labelStyle: FlutterFlowTheme.of(context).subtitle2.override( + fontFamily: 'Urbanist', + fontWeight: FontWeight.w500, + ), + indicatorColor: FlutterFlowTheme.of(context).turquoise, + indicatorWeight: 4, tabs: [ Tab( - text: 'Planisphere', + text: 'starmap', ), Tab( - text: 'List', + text: '星座(constellation)', ), ], ), Expanded( child: TabBarView( children: [ - Column( - mainAxisSize: MainAxisSize.max, - children: [ - Stack( - children: [ - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 16, 16, 16, 0), - child: InkWell( - onTap: () async { - if (kIsWeb) { - final _datePickedDate = - await showDatePicker( - context: context, - initialDate: getCurrentTimestamp, - firstDate: DateTime(1900), - lastDate: DateTime(2050), - ); - - TimeOfDay? _datePickedTime; - if (_datePickedDate != null) { - _datePickedTime = - await showTimePicker( - context: context, - initialTime: TimeOfDay.fromDateTime( - getCurrentTimestamp), - ); - } - - if (_datePickedDate != null && - _datePickedTime != null) { - setState( - () => datePicked = DateTime( - _datePickedDate.year, - _datePickedDate.month, - _datePickedDate.day, - _datePickedTime!.hour, - _datePickedTime.minute, - ), - ); - } - } else { - await DatePicker.showDateTimePicker( - context, - showTitleActions: true, - onConfirm: (date) { - setState(() => datePicked = date); - }, - currentTime: getCurrentTimestamp, - minTime: DateTime(0, 0, 0), - ); - } - }, - child: Container( - width: MediaQuery.of(context).size.width * - 0.92, - height: 50, - decoration: BoxDecoration( - color: Colors.white, - borderRadius: BorderRadius.circular(8), - border: Border.all( - color: FlutterFlowTheme.of(context) - .primaryBackground, - width: 1, - ), - ), - child: Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 16, 0, 0, 0), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Text( - dateTimeFormat( - 'M/d H:mm', datePicked), - style: - FlutterFlowTheme.of(context) - .bodyText1 - .override( - fontFamily: 'Urbanist', - color: Colors.black, - ), - ), - ], - ), - ), + SingleChildScrollView( + child: Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context) + .primaryBackground, + ), + child: Stack(children: [ + Column( + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Transform.rotate( + angle: 45 * pi / 180, + child: Image.asset( + 'assets/images/EveryStarryNightPlanisphere_Jewelry_Disk_4000px.png'), ), - ), + SelectionArea( + child: Text( + '星座早見盤:Every Starry Night Planisphere ( hoshifuru.jp )', + style: FlutterFlowTheme.of(context) + .bodyText1, + )), + ], ), - Row( + Column( mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.start, children: [ - Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0, 10, 0, 0), - child: Text( - ' adjust Time', - style: FlutterFlowTheme.of(context) - .bodyText1 - .override( - fontFamily: 'Urbanist', - color: Colors.black, - fontSize: 10, - ), - ), + Transform.rotate( + angle: 0 * pi / 180, + child: Image.asset( + 'assets/images/EveryStarryNightPlanisphere_Jewelry_Window_4000px.png'), ), + SelectionArea( + child: Text( + '星座早見盤:Every Starry Night Planisphere ( hoshifuru.jp )', + style: FlutterFlowTheme.of(context) + .bodyText1, + )), ], ), - ], - ), - Stack(children: [ - Column( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Transform.rotate( - angle: (-(double.parse(valueOrDefault(dateTimeFormat('MM/dd hh:mm a', datePicked), dateTimeFormat('MM/dd hh:mm a', getCurrentTimestamp)).replaceAll(RegExp(r"[^0-9]"), "").substring(0, 2)) * 30 + - double.parse(valueOrDefault(dateTimeFormat('MM/dd hh:mm a', datePicked), dateTimeFormat('MM/dd hh:mm a', getCurrentTimestamp)) - .replaceAll( - RegExp(r"[^0-9]"), "") - .substring(2, 4)) - - 30 - - 267) + - (double.parse(valueOrDefault( - dateTimeFormat( - 'MM/dd hh:mm', - datePicked), - dateTimeFormat('MM/dd hh:mm', getCurrentTimestamp)) - .replaceAll(RegExp(r"[^0-9]"), "") - .substring(4, 6)) + - double.parse(valueOrDefault(dateTimeFormat('MM/dd hh:mm', datePicked), dateTimeFormat('MM/dd hh:mm', getCurrentTimestamp)).replaceAll(RegExp(r"[^0-9]"), "").substring(6, 8)) / 60) * - 15) * - pi / - 180, - child: Image.asset( - 'assets/images/EveryStarryNightPlanisphere_Jewelry_Disk_4000px.png'), - ), - ], - ), - Column( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Transform.rotate( - angle: 0 * pi / 180, - child: Image.asset( - 'assets/images/EveryStarryNightPlanisphere_Jewelry_Window_4000px.png'), - ), - SelectionArea( - child: Text( - '星座早見盤:Every Starry Night Planisphere ( hoshifuru.jp )', - style: - FlutterFlowTheme.of(context).bodyText1, - )), - ], - ), - ]) - ], + ])), ), - Container( - width: MediaQuery.of(context).size.width, - height: MediaQuery.of(context).size.height * 1, - decoration: BoxDecoration( - color: FlutterFlowTheme.of(context) - .secondaryBackground, - ), - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ - StreamBuilder>( - stream: queryConstellationRecord(), - builder: (context, snapshot) { - // Customize what your widget looks like when it's loading. - if (!snapshot.hasData) { - return Center( - child: SizedBox( - width: 50, - height: 50, - child: CircularProgressIndicator( - color: FlutterFlowTheme.of(context) - .primaryColor, - ), + SingleChildScrollView( + child: Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context) + .primaryBackground, + ), + child: Column( + mainAxisSize: MainAxisSize.max, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SelectionArea( + child: Text( + '星座早見盤:Every Starry Night Planisphere ( hoshifuru.jp )', + style: FlutterFlowTheme.of(context).bodyText1, + )), + ListView( + padding: EdgeInsets.zero, + shrinkWrap: true, + scrollDirection: Axis.vertical, + children: [ + Container( + width: MediaQuery.of(context).size.width, + height: 100, + decoration: BoxDecoration( + color: Colors.white, + boxShadow: [ + BoxShadow( + blurRadius: 3, + color: Color(0x411D2429), + offset: Offset(0, 1), + ) + ], + borderRadius: BorderRadius.circular(16), ), - ); - } - List - listViewConstellationRecordList = - snapshot.data!; - return ListView.builder( - padding: EdgeInsets.zero, - shrinkWrap: true, - scrollDirection: Axis.vertical, - itemCount: - listViewConstellationRecordList.length, - itemBuilder: (context, listViewIndex) { - final listViewConstellationRecord = - listViewConstellationRecordList[ - listViewIndex]; - return Container( - width: - MediaQuery.of(context).size.width, - height: 100, - decoration: BoxDecoration( - color: Colors.white, - boxShadow: [ - BoxShadow( - blurRadius: 3, - color: Color(0x411D2429), - offset: Offset(0, 1), - ) - ], - borderRadius: - BorderRadius.circular(16), - ), - child: Padding( - padding: - EdgeInsetsDirectional.fromSTEB( - 8, 8, 8, 8), - child: Row( - mainAxisSize: MainAxisSize.max, - children: [ - Padding( - padding: EdgeInsetsDirectional - .fromSTEB(0, 1, 1, 1), - child: ClipRRect( - borderRadius: - BorderRadius.circular(12), - child: Image.network( - 'https://images.unsplash.com/photo-1574914629385-46448b767aec?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8NHx8bGF0dGV8ZW58MHx8MHx8&auto=format&fit=crop&w=800&q=60', - width: 70, - height: 100, - fit: BoxFit.cover, - ), - ), - ), - Expanded( - child: Padding( - padding: EdgeInsetsDirectional - .fromSTEB(8, 8, 4, 0), - child: Column( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - crossAxisAlignment: - CrossAxisAlignment - .start, - children: [ - Text( - listViewConstellationRecord - .jpName!, - style: - FlutterFlowTheme.of( - context) - .subtitle1 - .override( - fontFamily: - 'Outfit', - color: Color( - 0xFF090F13), - fontSize: 20, - fontWeight: - FontWeight - .w500, - ), - ), - Expanded( - child: Padding( - padding: - EdgeInsetsDirectional - .fromSTEB(0, - 4, 8, 0), - child: AutoSizeText( - listViewConstellationRecord - .content! - .maybeHandleOverflow( - maxChars: 70, - replacement: '…', - ), - textAlign: - TextAlign.start, - style: FlutterFlowTheme - .of(context) - .bodyText2 - .override( - fontFamily: - 'Outfit', - color: Color( - 0xFF7C8791), - fontSize: 14, - fontWeight: - FontWeight - .normal, - ), - ), - ), - ), - ], - ), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 8, 8, 8, 8), + child: Row( + mainAxisSize: MainAxisSize.max, + children: [ + Padding( + padding: EdgeInsetsDirectional + .fromSTEB(0, 1, 1, 1), + child: ClipRRect( + borderRadius: + BorderRadius.circular(12), + child: Image.network( + 'https://images.unsplash.com/photo-1574914629385-46448b767aec?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxzZWFyY2h8NHx8bGF0dGV8ZW58MHx8MHx8&auto=format&fit=crop&w=800&q=60', + width: 70, + height: 100, + fit: BoxFit.cover, ), ), - Column( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .spaceBetween, - crossAxisAlignment: - CrossAxisAlignment.end, - children: [ - Padding( - padding: - EdgeInsetsDirectional - .fromSTEB( - 0, 4, 0, 0), - child: Icon( - Icons.north_east_sharp, - color: Color(0xFF57636C), - size: 48, - ), - ), - Padding( - padding: - EdgeInsetsDirectional - .fromSTEB( - 0, 0, 4, 8), - child: Text( - listViewConstellationRecord - .direction!, - textAlign: TextAlign.end, + ), + Expanded( + child: Padding( + padding: EdgeInsetsDirectional + .fromSTEB(8, 8, 4, 0), + child: Column( + mainAxisSize: + MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment.center, + crossAxisAlignment: + CrossAxisAlignment.start, + children: [ + Text( + '[星座名]', style: FlutterFlowTheme .of(context) - .bodyText1 + .subtitle1 .override( fontFamily: 'Outfit', color: Color( - 0xFF4B39EF), - fontSize: 14, + 0xFF090F13), + fontSize: 20, fontWeight: FontWeight.w500, ), ), - ), - ], + Expanded( + child: Padding( + padding: + EdgeInsetsDirectional + .fromSTEB( + 0, 4, 8, 0), + child: AutoSizeText( + '解説', + textAlign: + TextAlign.start, + style: FlutterFlowTheme + .of(context) + .bodyText2 + .override( + fontFamily: + 'Outfit', + color: Color( + 0xFF7C8791), + fontSize: 14, + fontWeight: + FontWeight + .normal, + ), + ), + ), + ), + ], + ), ), - ], - ), + ), + Column( + mainAxisSize: MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + crossAxisAlignment: + CrossAxisAlignment.end, + children: [ + Padding( + padding: EdgeInsetsDirectional + .fromSTEB(0, 4, 0, 0), + child: Icon( + Icons.north_east_sharp, + color: Color(0xFF57636C), + size: 48, + ), + ), + Padding( + padding: EdgeInsetsDirectional + .fromSTEB(0, 0, 4, 8), + child: Text( + '[方角]', + textAlign: TextAlign.end, + style: FlutterFlowTheme.of( + context) + .bodyText1 + .override( + fontFamily: 'Outfit', + color: + Color(0xFF4B39EF), + fontSize: 14, + fontWeight: + FontWeight.w500, + ), + ), + ), + ], + ), + ], ), - ); - }, - ); - }, - ), - ], + ), + ), + ], + ), + ], + ), ), ), ], @@ -434,8 +296,8 @@ class _StarmapsWidgetState extends State { ], ), ), - ], - ), + ), + ], ), ); } diff --git a/AwardApp/lib/want/want_widget.dart b/AwardApp/lib/want/want_widget.dart index d92ba42..02ba66d 100644 --- a/AwardApp/lib/want/want_widget.dart +++ b/AwardApp/lib/want/want_widget.dart @@ -1,11 +1,10 @@ import '../auth/auth_util.dart'; import '../backend/backend.dart'; -import '../components/review_property_widget.dart'; +import '../components/review_trip_widget.dart'; import '../flutter_flow/flutter_flow_theme.dart'; import '../flutter_flow/flutter_flow_util.dart'; import '../flutter_flow/flutter_flow_widgets.dart'; import 'package:flutter/material.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:google_fonts/google_fonts.dart'; class WantWidget extends StatefulWidget { @@ -29,6 +28,7 @@ class _WantWidgetState extends State { Widget build(BuildContext context) { return Scaffold( key: scaffoldKey, + backgroundColor: FlutterFlowTheme.of(context).dark600, appBar: AppBar( backgroundColor: FlutterFlowTheme.of(context).dark600, automaticallyImplyLeading: false, @@ -83,1355 +83,76 @@ class _WantWidgetState extends State { children: [ Container( width: MediaQuery.of(context).size.width, - height: - MediaQuery.of(context).size.width * 0.4 + - 26.5, - decoration: BoxDecoration( - color: Color(0xFFACCFF7), - ), - child: Column( - mainAxisSize: MainAxisSize.max, - crossAxisAlignment: - CrossAxisAlignment.start, - children: [ - Row( - mainAxisSize: MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment.spaceBetween, - children: [ - Icon( - Icons.arrow_left, - color: Colors.black, - size: 24, - ), - SelectionArea( - child: Text( - 'Stamps Card 1', - textAlign: TextAlign.start, - style: FlutterFlowTheme.of(context) - .bodyText1 - .override( - fontFamily: 'Open Sans', - color: Colors.black, - ), - )), - Icon( - Icons.arrow_right, - color: Colors.black, - size: 24, - ), - ], - ), - Stack( - children: [ - Container( - width: MediaQuery.of(context) - .size - .width, - height: MediaQuery.of(context) - .size - .width * - 0.4, - decoration: BoxDecoration( - color: - FlutterFlowTheme.of(context) - .secondaryBackground, - ), - child: GridView( - padding: EdgeInsets.zero, - gridDelegate: - SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, - crossAxisSpacing: 0, - mainAxisSpacing: 0, - childAspectRatio: 1, - ), - scrollDirection: Axis.horizontal, - children: [ - Container( - width: MediaQuery.of(context) - .size - .width * - 0.2, - height: 100, - child: Stack( - children: [ - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - SelectionArea( - child: - Text( - '1', - textAlign: - TextAlign - .center, - style: FlutterFlowTheme.of( - context) - .bodyText1 - .override( - fontFamily: - 'Urbanist', - color: - Colors.black, - fontSize: - 32, - fontWeight: - FontWeight.w900, - ), - )), - ], - ), - ], - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - FaIcon( - FontAwesomeIcons - .circle, - color: Colors - .black, - size: 48, - ), - ], - ), - ], - ), - ], - ), - ], - ), - ), - Container( - width: MediaQuery.of(context) - .size - .width * - 0.2, - height: 100, - child: Stack( - children: [ - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - SelectionArea( - child: - Text( - '2', - textAlign: - TextAlign - .center, - style: FlutterFlowTheme.of( - context) - .bodyText1 - .override( - fontFamily: - 'Urbanist', - color: - Colors.black, - fontSize: - 32, - fontWeight: - FontWeight.w900, - ), - )), - ], - ), - ], - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - FaIcon( - FontAwesomeIcons - .circle, - color: Colors - .black, - size: 48, - ), - ], - ), - ], - ), - ], - ), - ], - ), - ), - Container( - width: MediaQuery.of(context) - .size - .width * - 0.2, - height: 100, - child: Stack( - children: [ - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - SelectionArea( - child: - Text( - '3', - textAlign: - TextAlign - .center, - style: FlutterFlowTheme.of( - context) - .bodyText1 - .override( - fontFamily: - 'Urbanist', - color: - Colors.black, - fontSize: - 32, - fontWeight: - FontWeight.w900, - ), - )), - ], - ), - ], - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - FaIcon( - FontAwesomeIcons - .circle, - color: Colors - .black, - size: 48, - ), - ], - ), - ], - ), - ], - ), - ], - ), - ), - Container( - width: MediaQuery.of(context) - .size - .width * - 0.2, - height: 100, - child: Stack( - children: [ - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - SelectionArea( - child: - Text( - '4', - textAlign: - TextAlign - .center, - style: FlutterFlowTheme.of( - context) - .bodyText1 - .override( - fontFamily: - 'Urbanist', - color: - Colors.black, - fontSize: - 32, - fontWeight: - FontWeight.w900, - ), - )), - ], - ), - ], - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - FaIcon( - FontAwesomeIcons - .circle, - color: Colors - .black, - size: 48, - ), - ], - ), - ], - ), - ], - ), - ], - ), - ), - Container( - width: MediaQuery.of(context) - .size - .width * - 0.2, - height: 100, - child: Stack( - children: [ - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - SelectionArea( - child: - Text( - '5', - textAlign: - TextAlign - .center, - style: FlutterFlowTheme.of( - context) - .bodyText1 - .override( - fontFamily: - 'Urbanist', - color: - Colors.black, - fontSize: - 32, - fontWeight: - FontWeight.w900, - ), - )), - ], - ), - ], - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - FaIcon( - FontAwesomeIcons - .circle, - color: Colors - .black, - size: 48, - ), - ], - ), - ], - ), - ], - ), - ], - ), - ), - Container( - width: MediaQuery.of(context) - .size - .width * - 0.2, - height: 100, - child: Stack( - children: [ - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - SelectionArea( - child: - Text( - '6', - textAlign: - TextAlign - .center, - style: FlutterFlowTheme.of( - context) - .bodyText1 - .override( - fontFamily: - 'Urbanist', - color: - Colors.black, - fontSize: - 32, - fontWeight: - FontWeight.w900, - ), - )), - ], - ), - ], - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - FaIcon( - FontAwesomeIcons - .circle, - color: Colors - .black, - size: 48, - ), - ], - ), - ], - ), - ], - ), - ], - ), - ), - Container( - width: MediaQuery.of(context) - .size - .width * - 0.2, - height: 100, - child: Stack( - children: [ - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - SelectionArea( - child: - Text( - '7', - textAlign: - TextAlign - .center, - style: FlutterFlowTheme.of( - context) - .bodyText1 - .override( - fontFamily: - 'Urbanist', - color: - Colors.black, - fontSize: - 32, - fontWeight: - FontWeight.w900, - ), - )), - ], - ), - ], - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - FaIcon( - FontAwesomeIcons - .circle, - color: Colors - .black, - size: 48, - ), - ], - ), - ], - ), - ], - ), - ], - ), - ), - Container( - width: MediaQuery.of(context) - .size - .width * - 0.2, - height: 100, - child: Stack( - children: [ - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - SelectionArea( - child: - Text( - '8', - textAlign: - TextAlign - .center, - style: FlutterFlowTheme.of( - context) - .bodyText1 - .override( - fontFamily: - 'Urbanist', - color: - Colors.black, - fontSize: - 32, - fontWeight: - FontWeight.w900, - ), - )), - ], - ), - ], - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - FaIcon( - FontAwesomeIcons - .circle, - color: Colors - .black, - size: 48, - ), - ], - ), - ], - ), - ], - ), - ], - ), - ), - Container( - width: MediaQuery.of(context) - .size - .width * - 0.2, - height: 100, - child: Stack( - children: [ - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - SelectionArea( - child: - Text( - '9', - textAlign: - TextAlign - .center, - style: FlutterFlowTheme.of( - context) - .bodyText1 - .override( - fontFamily: - 'Urbanist', - color: - Colors.black, - fontSize: - 32, - fontWeight: - FontWeight.w900, - ), - )), - ], - ), - ], - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - FaIcon( - FontAwesomeIcons - .circle, - color: Colors - .black, - size: 48, - ), - ], - ), - ], - ), - ], - ), - ], - ), - ), - Container( - width: MediaQuery.of(context) - .size - .width * - 0.2, - height: 100, - child: Stack( - children: [ - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - SelectionArea( - child: - Text( - '10', - textAlign: - TextAlign - .center, - style: FlutterFlowTheme.of( - context) - .bodyText1 - .override( - fontFamily: - 'Urbanist', - color: - Colors.black, - fontSize: - 32, - fontWeight: - FontWeight.w900, - ), - )), - ], - ), - ], - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize.max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - FaIcon( - FontAwesomeIcons - .circle, - color: Colors - .black, - size: 48, - ), - ], - ), - ], - ), - ], - ), - ], - ), - ), - ], - ), - ), - Container( - width: MediaQuery.of(context) - .size - .width, - height: MediaQuery.of(context) - .size - .width * - 0.4, - decoration: BoxDecoration(), - child: StreamBuilder< - List>( - stream: - queryCollectedStampsRecord( - parent: currentUserReference, - ), - builder: (context, snapshot) { - // Customize what your widget looks like when it's loading. - if (!snapshot.hasData) { - return Center( - child: SizedBox( - width: 50, - height: 50, - child: - CircularProgressIndicator( - color: - FlutterFlowTheme.of( - context) - .primaryColor, - ), - ), - ); - } - List - gridViewCollectedStampsRecordList = - snapshot.data!; - return GridView.builder( - padding: EdgeInsets.zero, - gridDelegate: - SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 2, - crossAxisSpacing: 0, - mainAxisSpacing: 0, - childAspectRatio: 1, - ), - shrinkWrap: true, - scrollDirection: - Axis.horizontal, - itemCount: - gridViewCollectedStampsRecordList - .length, - itemBuilder: - (context, gridViewIndex) { - final gridViewCollectedStampsRecord = - gridViewCollectedStampsRecordList[ - gridViewIndex]; - return Container( - width: - MediaQuery.of(context) - .size - .width * - 0.2, - height: 100, - child: Stack( - children: [ - Row( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - Stack( - children: [ - Align( - alignment: AlignmentDirectional( - 0, - 0), - child: - Container( - width: - MediaQuery.of(context).size.width * 0.15, - height: - MediaQuery.of(context).size.width * 0.15, - clipBehavior: - Clip.antiAlias, - decoration: - BoxDecoration( - shape: - BoxShape.circle, - ), - child: - Image.network( - gridViewCollectedStampsRecord.stampmage!, - ), - ), - ), - ], - ), - ], - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .center, - children: [ - SelectionArea( - child: Text( - gridViewCollectedStampsRecord - .stampName!, - style: FlutterFlowTheme.of( - context) - .bodyText1, - )), - ], - ), - ], - ), - ); - }, - ); - }, - ), - ), - ], - ), - ], - ), - ), - Container( - width: MediaQuery.of(context).size.width, - height: - MediaQuery.of(context).size.height * 1, - decoration: BoxDecoration( - color: FlutterFlowTheme.of(context) - .primaryBackground, - ), - child: Padding( - padding: EdgeInsetsDirectional.fromSTEB( - 0, 8, 0, 0), - child: StreamBuilder>( - stream: queryFavoritesRecord( - queryBuilder: (favoritesRecord) => - favoritesRecord.where('userRef', - isEqualTo: - currentUserReference)), - builder: (context, snapshot) { - // Customize what your widget looks like when it's loading. - if (!snapshot.hasData) { - return Center( - child: SizedBox( - width: 50, - height: 50, - child: CircularProgressIndicator( - color: - FlutterFlowTheme.of(context) - .primaryColor, - ), - ), - ); - } - List - listViewFavoritesRecordList = - snapshot.data!; - if (listViewFavoritesRecordList - .isEmpty) { - return Center( - child: Image.asset( - 'assets/images/noTrips@2x.png', - width: 300, - ), - ); - } - return ListView.builder( - padding: EdgeInsets.zero, - primary: false, - shrinkWrap: true, - scrollDirection: Axis.vertical, - itemCount: listViewFavoritesRecordList - .length, - itemBuilder: - (context, listViewIndex) { - final listViewFavoritesRecord = - listViewFavoritesRecordList[ - listViewIndex]; - return Padding( - padding: EdgeInsetsDirectional - .fromSTEB(16, 0, 16, 12), - child: Container( - width: double.infinity, - decoration: BoxDecoration( - color: FlutterFlowTheme.of( - context) - .secondaryBackground, - boxShadow: [ - BoxShadow( - blurRadius: 4, - color: Color(0x32000000), - offset: Offset(0, 2), - ) - ], - borderRadius: - BorderRadius.circular(8), - ), - child: StreamBuilder< - PropertiesRecord>( - stream: PropertiesRecord - .getDocument( - listViewFavoritesRecord - .propatyRef!), - builder: (context, snapshot) { - // Customize what your widget looks like when it's loading. - if (!snapshot.hasData) { - return Center( - child: SizedBox( - width: 50, - height: 50, - child: - CircularProgressIndicator( - color: FlutterFlowTheme - .of(context) - .primaryColor, - ), - ), - ); - } - final columnPropertiesRecord = - snapshot.data!; - return InkWell( - onTap: () async { - context.pushNamed( - 'WantSpotDetails', - queryParams: { - 'propertyRef': - serializeParam( - columnPropertiesRecord, - ParamType - .Document, - ), - 'favotityRef': - serializeParam( - listViewFavoritesRecord - .reference, - ParamType - .DocumentReference, - ), - }.withoutNulls, - extra: { - 'propertyRef': - columnPropertiesRecord, - }, - ); - }, - child: Column( - mainAxisSize: - MainAxisSize.max, - children: [ - Stack( - children: [ - ClipRRect( - borderRadius: - BorderRadius - .only( - bottomLeft: Radius - .circular( - 0), - bottomRight: Radius - .circular( - 0), - topLeft: Radius - .circular( - 8), - topRight: Radius - .circular( - 8), - ), - child: Image - .network( - valueOrDefault< - String>( - columnPropertiesRecord - .mainImage, - 'https://drive.google.com/uc?id=13aJ-EtZ_AxJqCh_caOc9pvvQ93D0IOrr&.JPG', - ), - width: double - .infinity, - height: 140, - fit: BoxFit - .cover, - ), - ), - ], - ), - Padding( - padding: - EdgeInsetsDirectional - .fromSTEB( - 16, - 12, - 16, - 8), - child: Row( - mainAxisSize: - MainAxisSize - .max, - children: [ - Text( - valueOrDefault< - String>( - columnPropertiesRecord - .propertyName, - 'NoName', - ), - style: FlutterFlowTheme.of( - context) - .title3 - .override( - fontFamily: - 'Urbanist', - color: FlutterFlowTheme.of(context) - .darkText, - fontWeight: - FontWeight.bold, - ), - ), - ], - ), - ), - Padding( - padding: - EdgeInsetsDirectional - .fromSTEB( - 16, - 0, - 16, - 12), - child: Row( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .spaceBetween, - children: [ - Column( - mainAxisSize: - MainAxisSize - .max, - children: [ - Row( - mainAxisSize: - MainAxisSize - .max, - children: [ - Text( - valueOrDefault< - String>( - columnPropertiesRecord.propertyDescription, - 'NoDeta', - ), - style: - FlutterFlowTheme.of(context).bodyText1, - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize - .max, - children: [ - Text( - valueOrDefault< - String>( - columnPropertiesRecord.propertyAddress, - 'NoDeta', - ), - style: - FlutterFlowTheme.of(context).bodyText1, - ), - ], - ), - ], - ), - Padding( - padding: EdgeInsetsDirectional - .fromSTEB( - 16, - 4, - 16, - 12), - child: Row( - mainAxisSize: - MainAxisSize - .max, - mainAxisAlignment: - MainAxisAlignment - .end, - crossAxisAlignment: - CrossAxisAlignment - .end, - children: [ - Text( - '15km', - style: FlutterFlowTheme.of(context) - .subtitle1, - ), - ], - ), - ), - ], - ), - ), - ], + height: 200, + decoration: BoxDecoration( + color: Color(0xFFF1F4F8), + ), + child: Padding( + padding: EdgeInsetsDirectional.fromSTEB( + 0, 0, 0, 10), + child: StreamBuilder< + List>( + stream: queryCollectedStampsRecord(), + builder: (context, snapshot) { + // Customize what your widget looks like when it's loading. + if (!snapshot.hasData) { + return Center( + child: SizedBox( + width: 50, + height: 50, + child: CircularProgressIndicator( + color: + FlutterFlowTheme.of(context) + .primaryColor, + ), + ), + ); + } + List + gridViewCollectedStampsRecordList = + snapshot.data!; + return GridView.builder( + padding: EdgeInsets.zero, + gridDelegate: + SliverGridDelegateWithFixedCrossAxisCount( + crossAxisCount: 5, + crossAxisSpacing: 12, + mainAxisSpacing: 10, + childAspectRatio: 1, + ), + shrinkWrap: true, + scrollDirection: Axis.vertical, + itemCount: + gridViewCollectedStampsRecordList + .length, + itemBuilder: + (context, gridViewIndex) { + final gridViewCollectedStampsRecord = + gridViewCollectedStampsRecordList[ + gridViewIndex]; + return Container( + width: 100, + height: 100, + child: Stack( + children: [ + Align( + alignment: + AlignmentDirectional( + 0, 0), + child: Container( + width: 90, + height: 90, + clipBehavior: + Clip.antiAlias, + decoration: BoxDecoration( + shape: BoxShape.circle, ), - ); - }, - ), + child: Image.network( + 'https://picsum.photos/seed/199/400', + ), + ), + ), + ], ), ); }, @@ -1440,13 +161,6 @@ class _WantWidgetState extends State { ), ), ), - ], - ), - ), - SingleChildScrollView( - child: Column( - mainAxisSize: MainAxisSize.max, - children: [ Container( width: MediaQuery.of(context).size.width, height: @@ -1461,13 +175,9 @@ class _WantWidgetState extends State { child: StreamBuilder>( stream: queryFavoritesRecord( queryBuilder: (favoritesRecord) => - favoritesRecord - .where('userRef', - isEqualTo: - currentUserReference) - .where('visited', - isEqualTo: true) - .orderBy('checkDate'), + favoritesRecord.where('userRef', + isEqualTo: + currentUserReference), ), builder: (context, snapshot) { // Customize what your widget looks like when it's loading. @@ -1491,7 +201,7 @@ class _WantWidgetState extends State { .isEmpty) { return Center( child: Image.asset( - 'assets/images/noTripsCompleted@2x.png', + 'assets/images/noTrips@2x.png', width: 300, ), ); @@ -1599,7 +309,7 @@ class _WantWidgetState extends State { String>( columnPropertiesRecord .mainImage, - 'https://drive.google.com/uc?id=13aJ-EtZ_AxJqCh_caOc9pvvQ93D0IOrr&.JPG', + 'https://jphacks.github.io/D_2201/data/cc0images/publicdomainq-0066232.png', ), width: double .infinity, @@ -1624,8 +334,12 @@ class _WantWidgetState extends State { .max, children: [ Text( - columnPropertiesRecord - .propertyName!, + valueOrDefault< + String>( + columnPropertiesRecord + .propertyName, + 'NoName', + ), style: FlutterFlowTheme.of( context) .title3 @@ -1657,114 +371,71 @@ class _WantWidgetState extends State { MainAxisAlignment .spaceBetween, children: [ - Container( - width: MediaQuery.of( - context) - .size - .width * - 0.5, - height: 40, - decoration: - BoxDecoration( - color: FlutterFlowTheme.of( - context) - .secondaryBackground, - ), - child: Column( + Column( + mainAxisSize: + MainAxisSize + .max, + children: [ + Row( + mainAxisSize: + MainAxisSize + .max, + children: [ + Text( + valueOrDefault< + String>( + columnPropertiesRecord.propertyDescription, + 'NoDeta', + ), + style: + FlutterFlowTheme.of(context).bodyText1, + ), + ], + ), + Row( + mainAxisSize: + MainAxisSize + .max, + children: [ + Text( + valueOrDefault< + String>( + columnPropertiesRecord.propertyAddress, + 'NoDeta', + ), + style: + FlutterFlowTheme.of(context).bodyText1, + ), + ], + ), + ], + ), + Padding( + padding: EdgeInsetsDirectional + .fromSTEB( + 16, + 4, + 16, + 12), + child: Row( mainAxisSize: MainAxisSize .max, + mainAxisAlignment: + MainAxisAlignment + .end, + crossAxisAlignment: + CrossAxisAlignment + .end, children: [ - Row( - mainAxisSize: - MainAxisSize.max, - children: [ - Text( - columnPropertiesRecord.propertyDescription!, - style: - FlutterFlowTheme.of(context).bodyText1, - ), - ], - ), - Row( - mainAxisSize: - MainAxisSize.max, - children: [ - Text( - columnPropertiesRecord.propertyAddress!, - style: - FlutterFlowTheme.of(context).bodyText1, - ), - ], + Text( + '15km', + style: FlutterFlowTheme.of(context) + .subtitle1, ), ], ), ), - FFButtonWidget( - onPressed: - () async { - await showModalBottomSheet( - isScrollControlled: - true, - backgroundColor: - Colors - .transparent, - barrierColor: - Color( - 0xB316202A), - context: - context, - builder: - (context) { - return Padding( - padding: - MediaQuery.of(context).viewInsets, - child: - Container( - height: - 450, - child: - ReviewPropertyWidget( - propertyReference: columnPropertiesRecord, - ), - ), - ); - }, - ).then((value) => - setState( - () {})); - }, - text: - 'Review', - options: - FFButtonOptions( - width: 130, - height: 44, - color: FlutterFlowTheme.of( - context) - .primaryColor, - textStyle: FlutterFlowTheme.of( - context) - .subtitle2 - .override( - fontFamily: - 'Urbanist', - color: - Colors.white, - ), - elevation: - 2, - borderSide: - BorderSide( - color: Colors - .transparent, - width: 1, - ), - borderRadius: - BorderRadius.circular( - 30), - ), - ), ], ), ), @@ -1784,6 +455,320 @@ class _WantWidgetState extends State { ], ), ), + SingleChildScrollView( + child: Container( + width: MediaQuery.of(context).size.width, + height: MediaQuery.of(context).size.height, + decoration: BoxDecoration( + color: FlutterFlowTheme.of(context) + .primaryBackground, + ), + child: Padding( + padding: + EdgeInsetsDirectional.fromSTEB(0, 8, 0, 0), + child: StreamBuilder>( + stream: queryFavoritesRecord( + queryBuilder: (favoritesRecord) => + favoritesRecord + .where('userRef', + isEqualTo: currentUserReference) + .where('visited', isEqualTo: true) + .orderBy('checkDate'), + ), + builder: (context, snapshot) { + // Customize what your widget looks like when it's loading. + if (!snapshot.hasData) { + return Center( + child: SizedBox( + width: 50, + height: 50, + child: CircularProgressIndicator( + color: FlutterFlowTheme.of(context) + .primaryColor, + ), + ), + ); + } + List + listViewFavoritesRecordList = + snapshot.data!; + if (listViewFavoritesRecordList.isEmpty) { + return Center( + child: Image.asset( + 'assets/images/noTripsCompleted@2x.png', + width: 300, + ), + ); + } + return ListView.builder( + padding: EdgeInsets.zero, + primary: false, + shrinkWrap: true, + scrollDirection: Axis.vertical, + itemCount: + listViewFavoritesRecordList.length, + itemBuilder: (context, listViewIndex) { + final listViewFavoritesRecord = + listViewFavoritesRecordList[ + listViewIndex]; + return Padding( + padding: + EdgeInsetsDirectional.fromSTEB( + 16, 0, 16, 12), + child: Container( + width: double.infinity, + decoration: BoxDecoration( + color: + FlutterFlowTheme.of(context) + .secondaryBackground, + boxShadow: [ + BoxShadow( + blurRadius: 4, + color: Color(0x32000000), + offset: Offset(0, 2), + ) + ], + borderRadius: + BorderRadius.circular(8), + ), + child: + StreamBuilder( + stream: + PropertiesRecord.getDocument( + listViewFavoritesRecord + .propatyRef!), + builder: (context, snapshot) { + // Customize what your widget looks like when it's loading. + if (!snapshot.hasData) { + return Center( + child: SizedBox( + width: 50, + height: 50, + child: + CircularProgressIndicator( + color: + FlutterFlowTheme.of( + context) + .primaryColor, + ), + ), + ); + } + final columnPropertiesRecord = + snapshot.data!; + return InkWell( + onTap: () async { + context.pushNamed( + 'SpotDetails', + queryParams: { + 'propertyRef': + serializeParam( + columnPropertiesRecord, + ParamType.Document, + ), + }.withoutNulls, + extra: { + 'propertyRef': + columnPropertiesRecord, + }, + ); + }, + child: Column( + mainAxisSize: + MainAxisSize.max, + children: [ + Stack( + children: [ + ClipRRect( + borderRadius: + BorderRadius + .only( + bottomLeft: Radius + .circular(0), + bottomRight: + Radius + .circular( + 0), + topLeft: Radius + .circular(8), + topRight: Radius + .circular(8), + ), + child: + Image.network( + valueOrDefault< + String>( + columnPropertiesRecord + .mainImage, + 'https://jphacks.github.io/D_2201/data/cc0images/publicdomainq-0066232.png', + ), + width: double + .infinity, + height: 140, + fit: BoxFit.cover, + ), + ), + ], + ), + Padding( + padding: + EdgeInsetsDirectional + .fromSTEB(16, + 12, 16, 8), + child: Row( + mainAxisSize: + MainAxisSize.max, + children: [ + Text( + columnPropertiesRecord + .propertyName!, + style: FlutterFlowTheme + .of(context) + .title3 + .override( + fontFamily: + 'Urbanist', + color: FlutterFlowTheme.of( + context) + .darkText, + fontWeight: + FontWeight + .bold, + ), + ), + ], + ), + ), + Padding( + padding: + EdgeInsetsDirectional + .fromSTEB(16, 0, + 16, 12), + child: Row( + mainAxisSize: + MainAxisSize.max, + mainAxisAlignment: + MainAxisAlignment + .spaceBetween, + children: [ + Column( + mainAxisSize: + MainAxisSize + .max, + children: [ + Row( + mainAxisSize: + MainAxisSize + .max, + children: [ + Text( + columnPropertiesRecord + .propertyDescription!, + style: FlutterFlowTheme.of( + context) + .bodyText1, + ), + ], + ), + Row( + mainAxisSize: + MainAxisSize + .max, + children: [ + Text( + columnPropertiesRecord + .propertyAddress!, + style: FlutterFlowTheme.of( + context) + .bodyText1, + ), + ], + ), + ], + ), + FFButtonWidget( + onPressed: + () async { + await showModalBottomSheet( + isScrollControlled: + true, + backgroundColor: + Colors + .transparent, + barrierColor: + Color( + 0xB316202A), + context: + context, + builder: + (context) { + return Padding( + padding: MediaQuery.of( + context) + .viewInsets, + child: + Container( + height: + 450, + child: + ReviewTripWidget( + propertyReference: + columnPropertiesRecord, + ), + ), + ); + }, + ).then((value) => + setState( + () {})); + }, + text: 'Review', + options: + FFButtonOptions( + width: 130, + height: 44, + color: FlutterFlowTheme.of( + context) + .primaryColor, + textStyle: FlutterFlowTheme.of( + context) + .subtitle2 + .override( + fontFamily: + 'Urbanist', + color: Colors + .white, + ), + elevation: 2, + borderSide: + BorderSide( + color: Colors + .transparent, + width: 1, + ), + borderRadius: + BorderRadius + .circular( + 30), + ), + ), + ], + ), + ), + ], + ), + ); + }, + ), + ), + ); + }, + ); + }, + ), + ), + ), + ), ], ), ), diff --git a/AwardApp/pubspec.lock b/AwardApp/pubspec.lock index 03867e9..234f2e0 100644 --- a/AwardApp/pubspec.lock +++ b/AwardApp/pubspec.lock @@ -5,329 +5,376 @@ packages: dependency: transitive description: name: _fe_analyzer_shared - url: "https://pub.dartlang.org" + sha256: "4897882604d919befd350648c7f91926a9d5de99e67b455bf0917cc2362f4bb8" + url: "https://pub.dev" source: hosted version: "47.0.0" analyzer: dependency: transitive description: name: analyzer - url: "https://pub.dartlang.org" + sha256: "690e335554a8385bc9d787117d9eb52c0c03ee207a607e593de3c9d71b1cfe80" + url: "https://pub.dev" source: hosted version: "4.7.0" archive: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: "80e5141fafcb3361653ce308776cfd7d45e6e9fbb429e14eec571382c0c5fecb" + url: "https://pub.dev" source: hosted version: "3.3.2" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: b003c3098049a51720352d219b0bb5f219b60fbfb68e7a4748139a06a5676515 + url: "https://pub.dev" source: hosted version: "2.3.1" async: 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" auto_size_text: dependency: "direct main" description: name: auto_size_text - url: "https://pub.dartlang.org" + sha256: "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599" + url: "https://pub.dev" source: hosted version: "3.0.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" build: dependency: transitive description: name: build - url: "https://pub.dartlang.org" + sha256: "3fbda25365741f8251b39f3917fb3c8e286a96fd068a5a242e11c2012d495777" + url: "https://pub.dev" source: hosted version: "2.3.1" build_config: dependency: transitive description: name: build_config - url: "https://pub.dartlang.org" + sha256: bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1 + url: "https://pub.dev" source: hosted version: "1.1.1" build_daemon: dependency: transitive description: name: build_daemon - url: "https://pub.dartlang.org" + sha256: "6bc5544ea6ce4428266e7ea680e945c68806c4aae2da0eb5e9ccf38df8d6acbf" + url: "https://pub.dev" source: hosted version: "3.1.0" build_resolvers: dependency: transitive description: name: build_resolvers - url: "https://pub.dartlang.org" + sha256: "687cf90a3951affac1bd5f9ecb5e3e90b60487f3d9cdc359bb310f8876bb02a6" + url: "https://pub.dev" source: hosted version: "2.0.10" build_runner: dependency: "direct dev" description: name: build_runner - url: "https://pub.dartlang.org" + sha256: "56942f8114731d1e79942cd981cfef29501937ff1bccf4dbdce0273f31f13640" + url: "https://pub.dev" source: hosted version: "2.2.0" build_runner_core: dependency: transitive description: name: build_runner_core - url: "https://pub.dartlang.org" + sha256: "14febe0f5bac5ae474117a36099b4de6f1dbc52df6c5e55534b3da9591bf4292" + url: "https://pub.dev" source: hosted version: "7.2.7" built_collection: dependency: "direct main" description: name: built_collection - url: "https://pub.dartlang.org" + sha256: "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100" + url: "https://pub.dev" source: hosted version: "5.1.1" built_value: dependency: "direct main" description: name: built_value - url: "https://pub.dartlang.org" + sha256: "8f4772ec1e72822da7213627a0db16029085a8d709a9032e77b9a049209b6cb2" + url: "https://pub.dev" source: hosted version: "8.4.0" built_value_generator: dependency: "direct dev" description: name: built_value_generator - url: "https://pub.dartlang.org" + sha256: "6d7a132780b43940406325c3fffa66633db9a4b11ea84ad69d2fbc6e87e2fb73" + url: "https://pub.dev" source: hosted version: "8.4.0" cached_network_image: dependency: "direct main" description: name: cached_network_image - url: "https://pub.dartlang.org" + sha256: e764e48ef036cabdf84319ba7b8b5871b6b43266e14de787cb43f77639089ae5 + url: "https://pub.dev" source: hosted version: "3.2.1" cached_network_image_platform_interface: dependency: transitive description: name: cached_network_image_platform_interface - url: "https://pub.dartlang.org" + sha256: "8e2b5befefec5063bee8f209fda21751f6328d405d4237c70f21104568b2fee7" + url: "https://pub.dev" source: hosted version: "1.0.0" cached_network_image_web: dependency: transitive description: name: cached_network_image_web - url: "https://pub.dartlang.org" + sha256: d4351c7eb16767df129b0474a5ebc4e028870379c063e8ba265a56aa00831e70 + url: "https://pub.dev" source: hosted version: "1.0.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c + url: "https://pub.dev" source: hosted version: "1.2.1" checked_yaml: dependency: transitive description: name: checked_yaml - url: "https://pub.dartlang.org" + sha256: dd007e4fb8270916820a0d66e24f619266b60773cddd082c6439341645af2659 + url: "https://pub.dev" source: hosted version: "2.0.1" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" cloud_firestore: dependency: "direct main" description: name: cloud_firestore - url: "https://pub.dartlang.org" + sha256: "1e8c8ffca5a543cf26dea2d5b408d0df9783e02415bfec2405e7ddd08ba93016" + url: "https://pub.dev" source: hosted version: "3.2.1" cloud_firestore_platform_interface: dependency: "direct main" description: name: cloud_firestore_platform_interface - url: "https://pub.dartlang.org" + sha256: "72cdaa9ca869725d4370c59175d0264d66f2cd1e02f972de92a6cd30fe677264" + url: "https://pub.dev" source: hosted version: "5.5.10" cloud_firestore_web: dependency: "direct main" description: name: cloud_firestore_web - url: "https://pub.dartlang.org" + sha256: "62868db09f6cb6e5c68f73124d80fb33395d6ec76076d6a5b122427e55f058a5" + url: "https://pub.dev" source: hosted version: "2.6.19" code_builder: dependency: transitive description: name: code_builder - url: "https://pub.dartlang.org" + sha256: "02ce3596b459c666530f045ad6f96209474e8fee6e4855940a3cee65fb872ec5" + url: "https://pub.dev" source: hosted version: "4.3.0" 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" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" source: hosted version: "3.1.1" cross_file: dependency: transitive description: name: cross_file - url: "https://pub.dartlang.org" + sha256: f71079978789bc2fe78d79227f1f8cfe195b31bbd8db2399b0d15a4b96fb843b + url: "https://pub.dev" source: hosted version: "0.3.3+2" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: aa274aa7774f8964e4f4f38cc994db7b6158dd36e9187aaceaddc994b35c6c67 + url: "https://pub.dev" source: hosted version: "3.0.2" csslib: dependency: transitive description: name: csslib - url: "https://pub.dartlang.org" + sha256: b36c7f7e24c0bdf1bf9a3da461c837d1de64b9f8beb190c9011d8c72a3dfd745 + url: "https://pub.dev" source: hosted version: "0.17.2" 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" dart_style: dependency: transitive description: name: dart_style - url: "https://pub.dartlang.org" + sha256: "7a03456c3490394c8e7665890333e91ae8a49be43542b616e414449ac358acd4" + url: "https://pub.dev" source: hosted version: "2.2.4" 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" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: "13a6ccf6a459a125b3fcdb6ec73bd5ff90822e071207c663bfd1f70062d51d18" + url: "https://pub.dev" source: hosted version: "1.2.1" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted version: "6.1.4" file_picker: dependency: "direct main" description: name: file_picker - url: "https://pub.dartlang.org" + sha256: "06375c7312d69fc577b2d4cea315f781386bb2ae9544aca5b248467ec88f8968" + url: "https://pub.dev" source: hosted version: "4.5.1" firebase_auth: dependency: "direct main" description: name: firebase_auth - url: "https://pub.dartlang.org" + sha256: f60f19dc91aacaac2f0c1f8ada801f0630a1ef036cd8c582329dc91a8235165a + url: "https://pub.dev" source: hosted version: "3.4.1" firebase_auth_platform_interface: dependency: "direct main" description: name: firebase_auth_platform_interface - url: "https://pub.dartlang.org" + sha256: "981c4840d063531b9fbd0df1cbbae6c7a1de6d6ca3317bc80448b6a685bb4fcb" + url: "https://pub.dev" source: hosted version: "6.3.1" firebase_auth_web: dependency: "direct main" description: name: firebase_auth_web - url: "https://pub.dartlang.org" + sha256: "2569fb466a015fe944dd71927f8ddc09fc11a577dc45a480cc68ac1cee9930a4" + url: "https://pub.dev" source: hosted version: "3.3.19" firebase_core: dependency: "direct main" description: name: firebase_core - url: "https://pub.dartlang.org" + sha256: "8259baf5006a2ea052b8477637c31b880997ed6d88f34c7d0155cf85ef4dfebc" + url: "https://pub.dev" source: hosted version: "1.19.1" firebase_core_platform_interface: dependency: "direct main" description: name: firebase_core_platform_interface - url: "https://pub.dartlang.org" + sha256: "195560eedebc480157aa60fc75d1a81e881a5c417482387ff60be2ca4a2fe645" + url: "https://pub.dev" source: hosted version: "4.4.3" firebase_core_web: dependency: "direct main" description: name: firebase_core_web - url: "https://pub.dartlang.org" + sha256: f4585d76e82c165d38f7dac2d8fbc5d8a10e11423149d3deba41865a07107595 + url: "https://pub.dev" source: hosted version: "1.6.6" firebase_storage: dependency: "direct main" description: name: firebase_storage - url: "https://pub.dartlang.org" + sha256: "855f7e9f54d0bf841555dfb25dda931df736e46056650cd0a05830d9ba0264d6" + url: "https://pub.dev" source: hosted version: "10.3.1" firebase_storage_platform_interface: dependency: "direct main" description: name: firebase_storage_platform_interface - url: "https://pub.dartlang.org" + sha256: a515673de3d1e3d374a5e4fb5d9f1c2a55c9125ea2c8484427823d93409b1294 + url: "https://pub.dev" source: hosted version: "4.1.10" firebase_storage_web: dependency: "direct main" description: name: firebase_storage_web - url: "https://pub.dartlang.org" + sha256: "6978f2b1aa56005c391a1828dd8433b2d7c8ec3195e14f8abb3253a62c07de17" + url: "https://pub.dev" source: hosted version: "3.2.19" fixnum: dependency: transitive description: name: fixnum - url: "https://pub.dartlang.org" + sha256: "04be3e934c52e082558cc9ee21f42f5c1cd7a1262f4c63cd0357c08d5bba81ec" + url: "https://pub.dev" source: hosted version: "1.0.1" flutter: @@ -339,35 +386,32 @@ packages: dependency: "direct main" description: name: flutter_animate - url: "https://pub.dartlang.org" + sha256: "1f6fdee1f63eda3c35e04c07664593c31b7fdae290b6b0dc513d2fdfb2d27c76" + url: "https://pub.dev" source: hosted version: "1.0.0" flutter_blurhash: dependency: transitive description: name: flutter_blurhash - url: "https://pub.dartlang.org" + sha256: "05001537bd3fac7644fa6558b09ec8c0a3f2eba78c0765f88912882b1331a5c6" + url: "https://pub.dev" source: hosted version: "0.7.0" flutter_cache_manager: dependency: transitive description: name: flutter_cache_manager - url: "https://pub.dartlang.org" + sha256: "32cd900555219333326a2d0653aaaf8671264c29befa65bbd9856d204a4c9fb3" + url: "https://pub.dev" source: hosted version: "3.3.0" - flutter_datetime_picker: - dependency: "direct main" - description: - name: flutter_datetime_picker - url: "https://pub.dartlang.org" - source: hosted - version: "1.5.1" flutter_launcher_icons: dependency: "direct dev" description: name: flutter_launcher_icons - url: "https://pub.dartlang.org" + sha256: "559c600f056e7c704bd843723c21e01b5fba47e8824bd02422165bcc02a5de1d" + url: "https://pub.dev" source: hosted version: "0.9.3" flutter_localizations: @@ -379,14 +423,16 @@ packages: dependency: transitive description: name: flutter_plugin_android_lifecycle - url: "https://pub.dartlang.org" + sha256: "60fc7b78455b94e6de2333d2f95196d32cf5c22f4b0b0520a628804cb463503b" + url: "https://pub.dev" source: hosted version: "2.0.7" flutter_rating_bar: dependency: "direct main" description: name: flutter_rating_bar - url: "https://pub.dartlang.org" + sha256: d2af03469eac832c591a1eba47c91ecc871fe5708e69967073c043b2d775ed93 + url: "https://pub.dev" source: hosted version: "4.0.1" flutter_test: @@ -403,623 +449,712 @@ packages: dependency: "direct main" description: name: font_awesome_flutter - url: "https://pub.dartlang.org" + sha256: "7811c8b4e7455d2f60ef30022a6a07376de2858b47aecbe2861965b348fe2016" + url: "https://pub.dev" source: hosted version: "10.1.0" from_css_color: dependency: "direct main" description: name: from_css_color - url: "https://pub.dartlang.org" + sha256: "5e4d1795c8d10af94e51dd97636b2a29170a132be1aceba103e9866028d20823" + url: "https://pub.dev" source: hosted version: "2.0.0" frontend_server_client: dependency: transitive description: name: frontend_server_client - url: "https://pub.dartlang.org" + sha256: "4f4a162323c86ffc1245765cfe138872b8f069deb42f7dbb36115fa27f31469b" + url: "https://pub.dev" source: hosted version: "2.1.3" geolocator: dependency: "direct main" description: name: geolocator - url: "https://pub.dartlang.org" + sha256: "5c23f3613f50586c0bbb2b8f970240ae66b3bd992088cf60dd5ee2e6f7dde3a8" + url: "https://pub.dev" source: hosted version: "9.0.2" geolocator_android: dependency: transitive description: name: geolocator_android - url: "https://pub.dartlang.org" + sha256: fe90565c3a8789dc3b433d8f95cdb18343f9bde298a419d978337ba1ae1037d3 + url: "https://pub.dev" source: hosted version: "4.1.4" geolocator_apple: dependency: transitive description: name: geolocator_apple - url: "https://pub.dartlang.org" + sha256: "567cf6d9879b4c33b2bd8bbfff0995e75c62a14f87b1480c8522c5dca5d3b166" + url: "https://pub.dev" source: hosted version: "2.2.3" geolocator_platform_interface: dependency: transitive description: name: geolocator_platform_interface - url: "https://pub.dartlang.org" + sha256: af4d69231452f9620718588f41acc4cb58312368716bfff2e92e770b46ce6386 + url: "https://pub.dev" source: hosted version: "4.0.7" geolocator_web: dependency: "direct main" description: name: geolocator_web - url: "https://pub.dartlang.org" + sha256: f68a122da48fcfff68bbc9846bb0b74ef651afe84a1b1f6ec20939de4d6860e1 + url: "https://pub.dev" source: hosted version: "2.1.6" geolocator_windows: dependency: transitive description: name: geolocator_windows - url: "https://pub.dartlang.org" + sha256: f5911c88e23f48b598dd506c7c19eff0e001645bdc03bb6fecb9f4549208354d + url: "https://pub.dev" source: hosted version: "0.1.1" glob: dependency: transitive description: name: glob - url: "https://pub.dartlang.org" + sha256: "4515b5b6ddb505ebdd242a5f2cc5d22d3d6a80013789debfbda7777f47ea308c" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" go_router: dependency: "direct main" description: name: go_router - url: "https://pub.dartlang.org" + sha256: "403e9b492dbde0962b0f86a8c3519a4725a85dc5f56248fa1ec44dcbfad2d972" + url: "https://pub.dev" source: hosted version: "3.1.0" google_fonts: dependency: "direct main" description: name: google_fonts - url: "https://pub.dartlang.org" + sha256: "8f099045e2f2a30e4d4d0a35f40c6bc941a8f2ca0e10ad9d214ee9edd3f37483" + url: "https://pub.dev" source: hosted version: "3.0.1" google_maps: dependency: transitive description: name: google_maps - url: "https://pub.dartlang.org" + sha256: eb20a162d642599a05179e2d155b9e803899cb377764fdec9044fa7fa474bfb8 + url: "https://pub.dev" source: hosted version: "6.2.0" google_maps_flutter: dependency: "direct main" description: name: google_maps_flutter - url: "https://pub.dartlang.org" + sha256: "460b8c3318c5be1346e7182b848e3c2b83fe65f2f5d404c871ac7e134ee59801" + url: "https://pub.dev" source: hosted version: "2.2.1" google_maps_flutter_android: dependency: transitive description: name: google_maps_flutter_android - url: "https://pub.dartlang.org" + sha256: "09e7e7fa642ea105bd507bb0c184c3d2fa9f9ad08f55bd8c8d609388d9078328" + url: "https://pub.dev" source: hosted version: "2.3.3" google_maps_flutter_ios: dependency: transitive description: name: google_maps_flutter_ios - url: "https://pub.dartlang.org" + sha256: "43a71553d9973af6886b6984e246dac18b8a62dc59581904d8d1292388b05ea5" + url: "https://pub.dev" source: hosted version: "2.1.12" google_maps_flutter_platform_interface: dependency: transitive description: name: google_maps_flutter_platform_interface - url: "https://pub.dartlang.org" + sha256: cde5d8713fd61f48ba675190be5ab294a022eec966748a2f83063f487d076fbc + url: "https://pub.dev" source: hosted version: "2.2.4" google_maps_flutter_web: dependency: "direct main" description: name: google_maps_flutter_web - url: "https://pub.dartlang.org" + sha256: f83e2d9a0c6b30cb48d8d0fc31699fb607b06590d4fb70dc698236da85cdce20 + url: "https://pub.dev" source: hosted version: "0.4.0+3" google_sign_in: dependency: "direct main" description: name: google_sign_in - url: "https://pub.dartlang.org" + sha256: a8a411a395935e0cef56172298dfeaa7f3556babc56912d98a3b761106a470c2 + url: "https://pub.dev" source: hosted version: "5.4.0" google_sign_in_android: dependency: "direct main" description: name: google_sign_in_android - url: "https://pub.dartlang.org" + sha256: "23f5f2ac9c007bf0cf02380baaa67fff039efbf38b7a2a285c376c753f9767fa" + url: "https://pub.dev" source: hosted version: "6.0.1" google_sign_in_ios: dependency: "direct main" description: name: google_sign_in_ios - url: "https://pub.dartlang.org" + sha256: "8b80074ccda41b62553010b311506f5022f7d2701e4f22765546b3125450f9f3" + url: "https://pub.dev" source: hosted version: "5.4.0" google_sign_in_platform_interface: dependency: "direct main" description: name: google_sign_in_platform_interface - url: "https://pub.dartlang.org" + sha256: "252d0fadcd1e7939f1e00602eca1020b585d448aaa4b87c33137ca8717cd9e87" + url: "https://pub.dev" source: hosted version: "2.2.0" google_sign_in_web: dependency: "direct main" description: name: google_sign_in_web - url: "https://pub.dartlang.org" + sha256: "5b35c221169a7b3e0fc15043ac09102ef542300ef92f2e1f05d5d8efde263af5" + url: "https://pub.dev" source: hosted version: "0.10.2" graphs: dependency: transitive description: name: graphs - url: "https://pub.dartlang.org" + sha256: f9e130f3259f52d26f0cfc0e964513796dafed572fa52e45d2f8d6ca14db39b2 + url: "https://pub.dev" source: hosted version: "2.2.0" html: dependency: transitive description: name: html - url: "https://pub.dartlang.org" + sha256: d9793e10dbe0e6c364f4c59bf3e01fb33a9b2a674bc7a1081693dba0614b6269 + url: "https://pub.dev" source: hosted version: "0.15.1" http: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + sha256: "6aa2946395183537c8b880962d935877325d6a09a2867c3970c05c0fed6ac482" + url: "https://pub.dev" source: hosted version: "0.13.5" http_multi_server: dependency: transitive description: name: http_multi_server - url: "https://pub.dartlang.org" + sha256: "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b" + url: "https://pub.dev" source: hosted version: "3.2.1" 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" image: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + sha256: f6ffe2895e3c86c6ad5a27e6302cf807403463e397cb2f0c580f619ac2fa588b + url: "https://pub.dev" source: hosted version: "3.2.2" image_picker: dependency: "direct main" description: name: image_picker - url: "https://pub.dartlang.org" + sha256: f3712cd190227fb92e0960cb0ce22928ba042c7183b16864ade83b259adf8ea6 + url: "https://pub.dev" source: hosted version: "0.8.5+3" image_picker_android: dependency: transitive description: name: image_picker_android - url: "https://pub.dartlang.org" + sha256: "822f71a53336bf1e638dbf955047080ca49ba0197f52c4fece9cf584c368648a" + url: "https://pub.dev" source: hosted version: "0.8.5+3" image_picker_for_web: dependency: transitive description: name: image_picker_for_web - url: "https://pub.dartlang.org" + sha256: "7d319fb74955ca46d9bf7011497860e3923bb67feebcf068f489311065863899" + url: "https://pub.dev" source: hosted version: "2.1.10" image_picker_ios: dependency: transitive description: name: image_picker_ios - url: "https://pub.dartlang.org" + sha256: "1768087441bd69ca632249d212c26fa8d530552d37b4896a4dd8d6781435c147" + url: "https://pub.dev" source: hosted version: "0.8.6+1" image_picker_platform_interface: dependency: transitive description: name: image_picker_platform_interface - url: "https://pub.dartlang.org" + sha256: "7cef2f28f4f2fef99180f636c3d446b4ccbafd6ba0fad2adc9a80c4040f656b8" + url: "https://pub.dev" source: hosted version: "2.6.2" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91" + url: "https://pub.dev" source: hosted version: "0.17.0" io: dependency: transitive description: name: io - url: "https://pub.dartlang.org" + sha256: "0d4c73c3653ab85bf696d51a9657604c900a370549196a91f33e4c39af760852" + url: "https://pub.dev" source: hosted version: "1.0.3" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7" + url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.5" js_wrapping: dependency: transitive description: name: js_wrapping - url: "https://pub.dartlang.org" + sha256: e385980f7c76a8c1c9a560dfb623b890975841542471eade630b2871d243851c + url: "https://pub.dev" source: hosted version: "0.7.4" json_annotation: dependency: transitive description: name: json_annotation - url: "https://pub.dartlang.org" + sha256: cb314f00b2488de7bc575207e54402cd2f92363f333a7933fd1b0631af226baa + url: "https://pub.dev" source: hosted version: "4.6.0" json_path: dependency: "direct main" description: name: json_path - url: "https://pub.dartlang.org" + sha256: e1ff18e87737fd5bee5d3408a58c51452b3351ab1292fdcf4ee597ab480123e2 + url: "https://pub.dev" source: hosted version: "0.4.1" json_serializable: dependency: "direct main" description: name: json_serializable - url: "https://pub.dartlang.org" + sha256: "0cec7060459254cf1ff980c08dedca6fa50917724a3c3ec8c5026cb88dee8238" + url: "https://pub.dev" source: hosted version: "6.3.1" latlng: dependency: "direct main" description: name: latlng - url: "https://pub.dartlang.org" + sha256: "0ec744cc1bcf20eeb4fac8c081864d55c988474eec6ae5d55cf866312fc7dfb4" + url: "https://pub.dev" source: hosted version: "0.2.0" latlong2: dependency: "direct main" description: name: latlong2 - url: "https://pub.dartlang.org" + sha256: "408993a0e3f46e79ce1f129e4cb0386eef6d48dfa6394939ecacfbd7049154ec" + url: "https://pub.dev" source: hosted version: "0.8.1" logging: dependency: transitive description: name: logging - url: "https://pub.dartlang.org" + sha256: c0bbfe94d46aedf9b8b3e695cf3bd48c8e14b35e3b2c639e0aa7755d589ba946 + 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" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: dab22e92b41aa1255ea90ddc4bc2feaf35544fd0728e209638cad041a6e3928a + url: "https://pub.dev" source: hosted version: "1.0.2" mime_type: dependency: "direct main" description: name: mime_type - url: "https://pub.dartlang.org" + sha256: "2ad6e67d3d2de9ac0f8ef5352d998fd103cb21351ae8c02fb0c78b079b37d275" + url: "https://pub.dev" source: hosted version: "1.0.0" nested: dependency: transitive description: name: nested - url: "https://pub.dartlang.org" + sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20" + url: "https://pub.dev" source: hosted version: "1.0.0" octo_image: dependency: transitive description: name: octo_image - url: "https://pub.dartlang.org" + sha256: "107f3ed1330006a3bea63615e81cf637433f5135a52466c7caa0e7152bca9143" + url: "https://pub.dev" source: hosted version: "1.0.2" package_config: dependency: transitive description: name: package_config - url: "https://pub.dartlang.org" + sha256: "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd" + url: "https://pub.dev" source: hosted version: "2.1.0" page_transition: dependency: "direct main" description: name: page_transition - url: "https://pub.dartlang.org" + sha256: "12776be3ffb2d080095e912fc4e820a85be8846913a93261148b75256b9c7691" + url: "https://pub.dev" source: hosted version: "2.0.4" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b + url: "https://pub.dev" source: hosted version: "1.8.2" path_provider: dependency: transitive description: name: path_provider - url: "https://pub.dartlang.org" + sha256: "050e8e85e4b7fecdf2bb3682c1c64c4887a183720c802d323de8a5fd76d372dd" + url: "https://pub.dev" source: hosted version: "2.0.11" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: "1dab723dd8feeb80afb39c7be894f09df1457243d930010f6f328fb8c660c5e1" + url: "https://pub.dev" source: hosted version: "2.0.21" path_provider_ios: dependency: transitive description: name: path_provider_ios - url: "https://pub.dartlang.org" + sha256: "03d639406f5343478352433f00d3c4394d52dac8df3d847869c5e2333e0bbce8" + url: "https://pub.dev" source: hosted version: "2.0.11" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: ab0987bf95bc591da42dffb38c77398fc43309f0b9b894dcc5d6f40c4b26c379 + url: "https://pub.dev" source: hosted version: "2.1.7" path_provider_macos: dependency: transitive description: name: path_provider_macos - url: "https://pub.dartlang.org" + sha256: "2a97e7fbb7ae9dcd0dfc1220a78e9ec3e71da691912e617e8715ff2a13086ae8" + url: "https://pub.dev" source: hosted version: "2.0.6" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: f0abc8ebd7253741f05488b4813d936b4d07c6bae3e86148a09e342ee4b08e76 + url: "https://pub.dev" source: hosted version: "2.0.5" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: a34ecd7fb548f8e57321fd8e50d865d266941b54e6c3b7758cf8f37c24116905 + url: "https://pub.dev" source: hosted version: "2.0.7" pedantic: dependency: transitive description: name: pedantic - url: "https://pub.dartlang.org" + sha256: "67fc27ed9639506c856c840ccce7594d0bdcd91bc8d53d6e52359449a1d50602" + url: "https://pub.dev" source: hosted version: "1.11.1" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: "49392a45ced973e8d94a85fdb21293fbb40ba805fc49f2965101ae748a3683b4" + url: "https://pub.dev" source: hosted version: "5.1.0" photo_view: dependency: "direct main" description: name: photo_view - url: "https://pub.dartlang.org" + sha256: "8036802a00bae2a78fc197af8a158e3e2f7b500561ed23b4c458107685e645bb" + url: "https://pub.dev" source: hosted version: "0.14.0" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76" + url: "https://pub.dev" source: hosted version: "3.1.0" plugin_platform_interface: dependency: "direct main" description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: "075f927ebbab4262ace8d0b283929ac5410c0ac4e7fc123c76429564facfb757" + url: "https://pub.dev" source: hosted version: "2.1.2" pointer_interceptor: dependency: transitive description: name: pointer_interceptor - url: "https://pub.dartlang.org" + sha256: fee6ba42b910637465bc0d367ba27066c6eccfbc3bc0ceb14831915acc600db0 + url: "https://pub.dev" source: hosted version: "0.9.3+3" pool: dependency: transitive description: name: pool - url: "https://pub.dartlang.org" + sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + url: "https://pub.dev" source: hosted version: "1.5.1" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" source: hosted version: "4.2.4" provider: dependency: "direct main" description: name: provider - url: "https://pub.dartlang.org" + sha256: e1e7413d70444ea3096815a60fe5da1b11bda8a9dc4769252cc82c53536f8bcc + url: "https://pub.dev" source: hosted version: "6.0.4" pub_semver: dependency: transitive description: name: pub_semver - url: "https://pub.dartlang.org" + sha256: b959af0a045c3484c4a8f4997731f5bfe4cac60d732fd8ce35b351f2d6a459fe + url: "https://pub.dev" source: hosted version: "2.1.2" pubspec_parse: dependency: transitive description: name: pubspec_parse - url: "https://pub.dartlang.org" + sha256: "75f6614d6dde2dc68948dffbaa4fe5dae32cd700eb9fb763fe11dfb45a3c4d0a" + url: "https://pub.dev" source: hosted version: "1.2.1" quiver: dependency: transitive description: name: quiver - url: "https://pub.dartlang.org" + sha256: "93982981971e812c94d4a6fa3a57b89f9ec12b38b6380cd3c1370c3b01e4580e" + url: "https://pub.dev" source: hosted version: "3.1.0" rfc_6901: dependency: transitive description: name: rfc_6901 - url: "https://pub.dartlang.org" + sha256: "8d97680dada633146cf75ab9382f2ce2b7e4bd63ceecd867416cf43b5832b988" + url: "https://pub.dev" source: hosted version: "0.1.1" rxdart: dependency: "direct main" description: name: rxdart - url: "https://pub.dartlang.org" + sha256: "933db29250b286ecfe08a552f991f0e9f245f3f8ba1e5fb37f2f55d1f82888cb" + url: "https://pub.dev" source: hosted version: "0.27.4" sanitize_html: dependency: transitive description: name: sanitize_html - url: "https://pub.dartlang.org" + sha256: "0a445f19bbaa196f5a4f93461aa066b94e6e025622eb1e9bc77872a5e25233a5" + url: "https://pub.dev" source: hosted version: "2.0.0" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: "76917b7d4b9526b2ba416808a7eb9fb2863c1a09cf63ec85f1453da240fa818a" + url: "https://pub.dev" source: hosted version: "2.0.15" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + sha256: "8e251f3c986002b65fed6396bce81f379fb63c27317d49743cf289fd0fd1ab97" + url: "https://pub.dev" source: hosted version: "2.0.14" shared_preferences_ios: dependency: transitive description: name: shared_preferences_ios - url: "https://pub.dartlang.org" + sha256: "585a14cefec7da8c9c2fb8cd283a3bb726b4155c0952afe6a0caaa7b2272de34" + url: "https://pub.dev" source: hosted version: "2.1.1" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + sha256: "28aefc1261746e7bad3d09799496054beb84e8c4ffcdfed7734e17b4ada459a5" + url: "https://pub.dev" source: hosted version: "2.1.1" shared_preferences_macos: dependency: transitive description: name: shared_preferences_macos - url: "https://pub.dartlang.org" + sha256: fbb94bf296576f49be37a1496d5951796211a8db0aa22cc0d68c46440dad808c + url: "https://pub.dev" source: hosted version: "2.0.4" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: da9431745ede5ece47bc26d5d73a9d3c6936ef6945c101a5aca46f62e52c1cf3 + url: "https://pub.dev" source: hosted version: "2.1.0" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: a4b5bc37fe1b368bbc81f953197d55e12f49d0296e7e412dfe2d2d77d6929958 + url: "https://pub.dev" source: hosted version: "2.0.4" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: "97f7ab9a7da96d9cf19581f5de520ceb529548498bd6b5e0ccd02d68a0d15eba" + url: "https://pub.dev" source: hosted version: "2.1.1" shelf: dependency: transitive description: name: shelf - url: "https://pub.dartlang.org" + sha256: c24a96135a2ccd62c64b69315a14adc5c3419df63b4d7c05832a346fdb73682c + url: "https://pub.dev" source: hosted version: "1.4.0" shelf_web_socket: dependency: transitive description: name: shelf_web_socket - url: "https://pub.dartlang.org" + sha256: a988c0e8d8ffbdb8a28aa7ec8e449c260f3deb808781fe1284d22c5bba7156e8 + url: "https://pub.dev" source: hosted version: "1.0.3" sign_in_with_apple: dependency: "direct main" description: name: sign_in_with_apple - url: "https://pub.dartlang.org" + sha256: "425cf29f6c8730314d08d62a3193319b84f40940f1f6f0d9cea703aaf3205a03" + url: "https://pub.dev" source: hosted version: "4.1.0" sign_in_with_apple_platform_interface: dependency: "direct main" description: name: sign_in_with_apple_platform_interface - url: "https://pub.dartlang.org" + sha256: a5883edee09ed6be19de19e7d9f618a617fe41a6fa03f76d082dfb787e9ea18d + url: "https://pub.dev" source: hosted version: "1.0.0" sign_in_with_apple_web: dependency: "direct main" description: name: sign_in_with_apple_web - url: "https://pub.dartlang.org" + sha256: "44b66528f576e77847c14999d5e881e17e7223b7b0625a185417829e5306f47a" + url: "https://pub.dev" source: hosted version: "1.0.1" sky_engine: @@ -1031,261 +1166,298 @@ packages: dependency: "direct main" description: name: smooth_page_indicator - url: "https://pub.dartlang.org" + sha256: "49e9b6a265790454c39bd4a447a02f398c02b44b2602e7c5e3a381dc2e3b4102" + url: "https://pub.dev" source: hosted version: "1.0.0+2" source_gen: dependency: transitive description: name: source_gen - url: "https://pub.dartlang.org" + sha256: "2d79738b6bbf38a43920e2b8d189e9a3ce6cc201f4b8fc76be5e4fe377b1c38d" + url: "https://pub.dev" source: hosted version: "1.2.6" source_helper: dependency: transitive description: name: source_helper - url: "https://pub.dartlang.org" + sha256: "3b67aade1d52416149c633ba1bb36df44d97c6b51830c2198e934e3fca87ca1f" + url: "https://pub.dev" source: hosted version: "1.3.3" source_span: 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" sqflite: dependency: transitive description: name: sqflite - url: "https://pub.dartlang.org" + sha256: d21c022832f139b89922738e200c07387a49c549bf36c35654418e19ff76d161 + url: "https://pub.dev" source: hosted version: "2.2.0+3" sqflite_common: dependency: transitive description: name: sqflite_common - url: "https://pub.dartlang.org" + sha256: "0c21a187d645aa65da5be6997c0c713eed61e049158870ae2de157e6897067ab" + url: "https://pub.dev" source: hosted version: "2.4.0+2" 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" 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" stream_transform: dependency: transitive description: name: stream_transform - url: "https://pub.dartlang.org" + sha256: "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f" + url: "https://pub.dev" source: hosted version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "862015c5db1f3f3c4ea3b94dc2490363a84262994b88902315ed74be1155612f" + url: "https://pub.dev" source: hosted version: "1.1.1" synchronized: dependency: transitive description: name: synchronized - url: "https://pub.dartlang.org" + sha256: "7b530acd9cb7c71b0019a1e7fa22c4105e675557a4400b6a401c71c5e0ade1ac" + url: "https://pub.dev" source: hosted version: "3.0.0+3" 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: c9aba3b3dbfe8878845dfab5fa096eb8de7b62231baeeb1cea8e3ee81ca8c6d8 + url: "https://pub.dev" source: hosted - version: "0.4.12" + version: "0.4.15" timeago: dependency: "direct main" description: name: timeago - url: "https://pub.dartlang.org" + sha256: "3a38963615f1178531afa7177199e37522cf8dcbd93a144b597e32ec6d84bd9f" + url: "https://pub.dev" source: hosted version: "3.2.2" timing: dependency: transitive description: name: timing - url: "https://pub.dartlang.org" + sha256: c386d07d7f5efc613479a7c4d9d64b03710b03cfaa7e8ad5f2bfb295a1f0dfad + url: "https://pub.dev" source: hosted version: "1.0.0" 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" url_launcher: dependency: "direct main" description: name: url_launcher - url: "https://pub.dartlang.org" + sha256: "4f0d5f9bf7efba3da5a7ff03bd33cc898c84bac978c068e1c94483828e709592" + url: "https://pub.dev" source: hosted version: "6.1.5" url_launcher_android: dependency: transitive description: name: url_launcher_android - url: "https://pub.dartlang.org" + sha256: "2514dc16ac169adf55159268d7bf70317d9f2fc9ef5bb02020bb7ad710c0aeb4" + url: "https://pub.dev" source: hosted version: "6.0.21" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - url: "https://pub.dartlang.org" + sha256: "6ba7dddee26c9fae27c9203c424631109d73c8fa26cfa7bc3e35e751cb87f62e" + url: "https://pub.dev" source: hosted version: "6.0.17" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + sha256: "360fa359ab06bcb4f7c5cd3123a2a9a4d3364d4575d27c4b33468bd4497dd094" + url: "https://pub.dev" source: hosted version: "3.0.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + sha256: a9b3ea9043eabfaadfa3fb89de67a11210d85569086d22b3854484beab8b3978 + url: "https://pub.dev" source: hosted version: "3.0.1" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + sha256: "4eae912628763eb48fc214522e58e942fd16ce195407dbf45638239523c759a6" + url: "https://pub.dev" source: hosted version: "2.1.1" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + sha256: "5669882643b96bb6d5786637cac727c6e918a790053b09245fd4513b8a07df2a" + url: "https://pub.dev" source: hosted version: "2.0.13" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + sha256: e3c3b16d3104260c10eea3b0e34272aaa57921f83148b0619f74c2eced9b7ef1 + url: "https://pub.dev" source: hosted version: "3.0.1" uuid: dependency: transitive description: name: uuid - url: "https://pub.dartlang.org" + sha256: "2469694ad079893e3b434a627970c33f2fa5adc46dfe03c9617546969a9a8afc" + url: "https://pub.dev" source: hosted version: "3.0.6" 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" watcher: dependency: transitive description: name: watcher - url: "https://pub.dartlang.org" + sha256: "6a7f46926b01ce81bfc339da6a7f20afbe7733eff9846f6d6a5466aa4c6667c0" + url: "https://pub.dev" source: hosted version: "1.0.2" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + sha256: "3a969ddcc204a3e34e863d204b29c0752716f78b6f9cc8235083208d268a4ccd" + url: "https://pub.dev" source: hosted version: "2.2.0" webview_flutter: dependency: transitive description: name: webview_flutter - url: "https://pub.dartlang.org" + sha256: "6886b3ceef1541109df5001054aade5ee3c36b5780302e41701c78357233721c" + url: "https://pub.dev" source: hosted version: "2.8.0" webview_flutter_android: dependency: "direct overridden" description: name: webview_flutter_android - url: "https://pub.dartlang.org" + sha256: f463704e765eb3480d3e0f79bf0fbc41cb1746c2301c510643a2d049b82fed09 + url: "https://pub.dev" source: hosted version: "2.10.3" webview_flutter_platform_interface: dependency: "direct overridden" description: name: webview_flutter_platform_interface - url: "https://pub.dartlang.org" + sha256: "812165e4e34ca677bdfbfa58c01e33b27fd03ab5fa75b70832d4b7d4ca1fa8cf" + url: "https://pub.dev" source: hosted version: "1.9.5" webview_flutter_wkwebview: dependency: "direct overridden" description: name: webview_flutter_wkwebview - url: "https://pub.dartlang.org" + sha256: a5364369c758892aa487cbf59ea41d9edd10f9d9baf06a94e80f1bd1b4c7bbc0 + url: "https://pub.dev" source: hosted version: "2.9.5" webviewx: dependency: "direct main" description: name: webviewx - url: "https://pub.dartlang.org" + sha256: d7a7b73e0270c9e48d211dfc4174d19212134de7e8733cdda3d6dea13d7e0177 + url: "https://pub.dev" source: hosted version: "0.2.1" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: c0e3a4f7be7dae51d8f152230b86627e3397c1ba8c3fa58e63d44a9f3edc9cef + url: "https://pub.dev" source: hosted version: "2.6.1" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: "11541eedefbcaec9de35aa82650b695297ce668662bbd6e3911a7fabdbde589f" + url: "https://pub.dev" source: hosted version: "0.2.0+2" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: "979ee37d622dec6365e2efa4d906c37470995871fe9ae080d967e192d88286b5" + url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.2.2" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "23812a9b125b48d4007117254bca50abb6c712352927eece9e155207b1db2370" + url: "https://pub.dev" source: hosted version: "3.1.1" sdks: - dart: ">=2.18.0 <3.0.0" + dart: ">=2.18.0 <4.0.0" flutter: ">=3.3.0" diff --git a/AwardApp/pubspec.yaml b/AwardApp/pubspec.yaml index 1d87429..cc9cf53 100644 --- a/AwardApp/pubspec.yaml +++ b/AwardApp/pubspec.yaml @@ -82,7 +82,6 @@ dependencies: geolocator: ^9.0.2 geolocator_web: ^2.1.6 google_maps_flutter_web: ^0.4.0+3 - flutter_datetime_picker: ^1.5.1 dependency_overrides: webview_flutter_android: 2.10.3 From 934c880e3eedd2b7158c9341366d066347d773ca Mon Sep 17 00:00:00 2001 From: asha-ndf Date: Sat, 12 Nov 2022 00:33:09 +0900 Subject: [PATCH 2/2] add starlist.csv --- docs/data/starlist.csv | 89 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 docs/data/starlist.csv diff --git a/docs/data/starlist.csv b/docs/data/starlist.csv new file mode 100644 index 0000000..97ceee7 --- /dev/null +++ b/docs/data/starlist.csv @@ -0,0 +1,89 @@ +id,name +1,アンドロメダ +2,ポンプ +3,ふうちょう +4,わし +5,みずがめ +6,さいだん +7,おひつじ +8,ぎょしゃ +9,うしかい +10,ちょうこくぐ +11,きりん +12,やぎ +13,りゅうこつ +14,カシオペヤ +15,ケンタウルス +16,ケフェウス +17,くじら +18,カメレオン +19,コンパス +20,おおいぬ +21,こいぬ +22,かに +23,はと +24,かみのけ +25,みなみのかんむり +26,かんむり +27,コップ +28,みなみじゅうじ +29,からす +30,りょうけん +31,はくちょう +32,いるか +33,かじき +34,りゅう +35,こうま +36,エリダヌス +37,ろ +38,ふたご +39,つる +40,ヘルクレス +41,とけい +42,うみへび +43,みずへび +44,インディアン +45,とかげ +46,しし +47,うさぎ +48,てんびん +49,こじし +50,おおかみ +51,やまねこ +52,こと +53,テーブルさん +54,けんびきょう +55,いっかくじゅう +56,はえ +57,じょうぎ +58,はちぶんぎ +59,へびつかい +60,オリオン +61,くじゃく +62,ペガスス +63,ペルセウス +64,ほうおう +65,がか +66,みなみのうお +67,うお +68,とも +69,らしんばん +70,レチクル +71,ちょうこくしつ +72,さそり +73,たて +74,へび +75,ろくぶんぎ +76,や +77,いて +78,おうし +79,ぼうえんきょう +80,みなみのさんかく +81,さんかく +82,きょしちょう +83,おおぐま +84,こぐま +85,ほ +86,おとめ +87,とびうお +88,こぎつね \ No newline at end of file