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

Jump to bottom

Refactor menstruation directory #431

Merged
merged 2 commits into from
Nov 15, 2021
Merged

Refactor menstruation directory #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
499259e
:recycle: Rename to edit page
bannzai Nov 15, 2021
6087139
:recyle: Extract to components
bannzai Nov 15, 2021
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
96 changes: 96 additions & 0 deletions lib/domain/menstruation/components/calendar/menstruation_calendar_header.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart';
import 'package:pilll/analytics.dart';
import 'package:pilll/components/molecules/shadow_container.dart';
import 'package:pilll/components/organisms/calendar/band/calendar_band_model.dart';
import 'package:pilll/domain/menstruation/components/calendar/menstruation_single_line_state.dart';
import 'package:pilll/components/organisms/calendar/weekly/weekly_calendar.dart';
import 'package:pilll/domain/calendar/date_range.dart';
import 'package:pilll/components/organisms/calendar/utility.dart';
import 'package:pilll/domain/menstruation/menstruation_page.dart';
import 'package:pilll/domain/menstruation/menstruation_state.dart';
import 'package:pilll/domain/record/weekday_badge.dart';
import 'package:pilll/entity/weekday.dart';

const double _horizontalPadding = 10;

class MenstruationCalendarHeader extends StatelessWidget {
const MenstruationCalendarHeader({
Key? key,
required this.state,
required this.pageController,
}) : super(key: key);

final MenstruationState state;
final PageController pageController;

@override
Widget build(BuildContext context) {
return ShadowContainer(
child: Container(
padding: const EdgeInsets.only(
left: _horizontalPadding,
right: _horizontalPadding,
),
width: MediaQuery.of(context).size.width,
height: MenstruationPageConst.calendarHeaderHeight,
child: Column(
children: [
_WeekdayLine(),
LimitedBox(
maxHeight: MenstruationPageConst.tileHeight,
child: PageView.builder(
controller: pageController,
physics: PageScrollPhysics(),
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) {
final days = state.calendarDataSource[index];
return Container(
width: MediaQuery.of(context).size.width -
_horizontalPadding * 2,
height: MenstruationPageConst.tileHeight,
child: CalendarWeekdayLine(
calendarState: MenstruationSinglelineWeeklyCalendarState(
dateRange: DateRange(days.first, days.last),
diariesForMonth: state.diariesForMonth,
allBandModels: buildBandModels(
state.latestPillSheetGroup,
state.setting,
state.entities,
12)
.where((element) =>
!(element is CalendarNextPillSheetBandModel))
.toList(),
),
horizontalPadding: _horizontalPadding,
onTap: (weeklyCalendarState, date) {
analytics.logEvent(
name: "did_select_day_tile_on_menstruation");
transitionToPostDiary(
context, date, state.diariesForMonth);
},
),
);
},
),
),
],
),
),
);
}
}

class _WeekdayLine extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.start,
children: List.generate(
Weekday.values.length,
(index) =>
Expanded(child: WeekdayBadge(weekday: Weekday.values[index]))),
);
}
}
90 changes: 1 addition & 89 deletions lib/domain/menstruation/menstruation_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,26 +8,18 @@ import 'package:pilll/components/atoms/buttons.dart';
import 'package:pilll/components/atoms/color.dart';
import 'package:pilll/components/atoms/text_color.dart';
import 'package:pilll/components/molecules/indicator.dart';
import 'package:pilll/components/molecules/shadow_container.dart';
import 'package:pilll/components/organisms/calendar/monthly/monthly_calendar_layout.dart';
import 'package:pilll/components/organisms/calendar/band/calendar_band_model.dart';
import 'package:pilll/domain/menstruation/components/calendar/menstruation_single_line_state.dart';
import 'package:pilll/components/organisms/calendar/weekly/weekly_calendar.dart';
import 'package:pilll/domain/calendar/date_range.dart';
import 'package:pilll/components/organisms/calendar/utility.dart';
import 'package:pilll/domain/menstruation/components/calendar/menstruation_calendar_header.dart';
import 'package:pilll/domain/menstruation/menstruation_card.dart';
import 'package:pilll/domain/menstruation/menstruation_state.dart';
import 'package:pilll/domain/menstruation_edit/menstruation_edit_page.dart';
import 'package:pilll/domain/menstruation/menstruation_history_card.dart';
import 'package:pilll/domain/menstruation/menstruation_select_modify_type_sheet.dart';
import 'package:pilll/domain/record/weekday_badge.dart';
import 'package:pilll/entity/weekday.dart';
import 'package:pilll/domain/menstruation/menstruation_store.dart';
import 'package:pilll/util/datetime/day.dart';
import 'package:pilll/util/formatter/date_time_formatter.dart';

const double _horizontalPadding = 10;

abstract class MenstruationPageConst {
static const double calendarHeaderDropShadowOffset = 2;
static final double tileHeight =
Expand Down Expand Up @@ -198,83 +190,3 @@ class MenstruationCardList extends StatelessWidget {
);
}
}

class MenstruationCalendarHeader extends StatelessWidget {
const MenstruationCalendarHeader({
Key? key,
required this.state,
required this.pageController,
}) : super(key: key);

final MenstruationState state;
final PageController pageController;

@override
Widget build(BuildContext context) {
return ShadowContainer(
child: Container(
padding: const EdgeInsets.only(
left: _horizontalPadding,
right: _horizontalPadding,
),
width: MediaQuery.of(context).size.width,
height: MenstruationPageConst.calendarHeaderHeight,
child: Column(
children: [
_WeekdayLine(),
LimitedBox(
maxHeight: MenstruationPageConst.tileHeight,
child: PageView.builder(
controller: pageController,
physics: PageScrollPhysics(),
scrollDirection: Axis.horizontal,
itemBuilder: (context, index) {
final days = state.calendarDataSource[index];
return Container(
width: MediaQuery.of(context).size.width -
_horizontalPadding * 2,
height: MenstruationPageConst.tileHeight,
child: CalendarWeekdayLine(
calendarState: MenstruationSinglelineWeeklyCalendarState(
dateRange: DateRange(days.first, days.last),
diariesForMonth: state.diariesForMonth,
allBandModels: buildBandModels(
state.latestPillSheetGroup,
state.setting,
state.entities,
12)
.where((element) =>
!(element is CalendarNextPillSheetBandModel))
.toList(),
),
horizontalPadding: _horizontalPadding,
onTap: (weeklyCalendarState, date) {
analytics.logEvent(
name: "did_select_day_tile_on_menstruation");
transitionToPostDiary(
context, date, state.diariesForMonth);
},
),
);
},
),
),
],
),
),
);
}
}

class _WeekdayLine extends StatelessWidget {
@override
Widget build(BuildContext context) {
return Row(
mainAxisAlignment: MainAxisAlignment.start,
children: List.generate(
Weekday.values.length,
(index) =>
Expanded(child: WeekdayBadge(weekday: Weekday.values[index]))),
);
}
}
0 ...onents/calendar/calendar_date_header.dart → ...onents/calendar/calendar_date_header.dart
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/domain/menstruation_edit/menstruation_edit_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:pilll/components/atoms/font.dart';
import 'package:pilll/components/atoms/text_color.dart';
import 'package:pilll/components/page/discard_dialog.dart';
import 'package:pilll/components/organisms/calendar/monthly/monthly_calendar_layout.dart';
import 'package:pilll/domain/menstruation/components/calendar/calendar_date_header.dart';
import 'package:pilll/domain/menstruation_edit/components/calendar/calendar_date_header.dart';
import 'package:pilll/components/organisms/calendar/weekly/weekly_calendar.dart';
import 'package:pilll/domain/menstruation_edit/components/calendar/weekly_calendar_state.dart';
import 'package:pilll/domain/menstruation_edit/components/monthly_calendar_state.dart';
Expand Down