Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix merge conflict #9

Merged
merged 2 commits into from
May 19, 2022
Merged

fix merge conflict #9

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8418933
provider + firestore ing..
forseaest May 19, 2022
40a18ef
provider ing..
forseaest May 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
provider ing..
  • Loading branch information
@forseaest
forseaest committed May 19, 2022
commit 40a18efa1a0b9ba2a21554721ceca3491088982f
3 changes: 3 additions & 0 deletions lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ import 'package:capstone_2022_48/pages/Signin_screen.dart';
// import 'package:flutter_event_calendar/flutter_event_calendar.dart';
import 'package:intl/date_symbol_data_local.dart';
import 'package:capstone_2022_48/model/DataModel.dart';
import 'package:capstone_2022_48/pages/MainScreen.dart';
import 'package:firebase_core/firebase_core.dart';

// void main() {
// runApp(MyApp());
Expand Down Expand Up @@ -147,6 +149,7 @@ class MyApp extends StatelessWidget {
],
child: MainScreen(),
),
// home: SignInScreen(),
);
}
}
21 changes: 0 additions & 21 deletions lib/pages/HomeCalendar.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,12 @@ class HomeCalendar extends StatefulWidget {
}

class _HomeCalendarState extends State<HomeCalendar> {
// Icon iconFronList(int index) {
// if (index == 0) {
// return Icon(Icons.sentiment_satisfied, color: Color(0xffbbbbbb));
// } else if (index == 1) {
// return Icon(Icons.sentiment_very_satisfied, color: Color(0xffFFCD00));
// } else if (index == 2) {
// return Icon(Icons.sentiment_satisfied, color: Color(0xff4675C0));
// } else if (index == 3) {
// return Icon(Icons.mood_bad, color: Color(0xffB8BFD6));
// }
// }

Map<String, Icon> iconList = {
'good': Icon(Icons.sentiment_very_satisfied, color: Color(0xffFFCD00)),
'soso': Icon(Icons.sentiment_satisfied, color: Color(0xff4675C0)),
'bad': Icon(Icons.mood_bad, color: Color(0xffB8BFD6)),
'default': Icon(Icons.sentiment_satisfied, color: Color(0xffbbbbbb)),
};

DateTime _selectedDay = DateTime.now();
DateTime _focusedDay = DateTime.now();

Expand Down Expand Up @@ -253,14 +240,6 @@ class _HomeCalendarState extends State<HomeCalendar> {
// mainAxisSize: MainAxisSize.min,
mainAxisAlignment: MainAxisAlignment.center,
children: [
// Icon(Icons.sentiment_satisfied,
// color: Color(0xffbbbbbb)),
// Icon(Icons.sentiment_satisfied,
// color: Color(0xffbbbbbb)),
// Icon(Icons.sentiment_satisfied,
// color: Color(0xffbbbbbb)),
// Icon(Icons.sentiment_satisfied,
// color: Color(0xffbbbbbb)),
IconButton(
constraints: BoxConstraints(maxWidth: 30),
padding: EdgeInsets.zero,
Expand Down
2 changes: 2 additions & 0 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,8 @@ dependencies:
charts_flutter: ^0.12.0
syncfusion_flutter_gauges: ^20.1.55
cloud_firestore: ^3.1.15
firebase_core: ^1.17.0
firebase_auth: ^3.3.18

dev_dependencies:
flutter_test:
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.