Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ios/Runner.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -584,4 +584,4 @@
/* End XCConfigurationList section */
};
rootObject = 97C146E61CF9000F007C117D /* Project object */;
}
}
2 changes: 2 additions & 0 deletions lib/pages/login/login_state.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ abstract class LoginState with _$LoginState {
@Default(false) bool isLogin,
User currentUser,
@Default(<Organization>[]) List<Organization> orgs,
// TODO: streamに完全対応できたら削除
@Default(Organization()) Organization selectedOrg,
@Default(null) @nullable Stream<Organization> selectedOrgStream,
}) = _LoginState;
}
52 changes: 40 additions & 12 deletions lib/pages/login/login_state.freezed.dart

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 12 additions & 3 deletions lib/pages/login/login_state_controller.dart
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@ class LoginStateController extends StateNotifier<LoginState> with LocatorMixin {
super.initState();
fetchLoginState();
if (state.selectedOrg == null && state.currentUser != null) {
state = state.copyWith(selectedOrg: state.orgs.first);
state = state.copyWith(
selectedOrg: state.orgs.first,
selectedOrgStream: orgRepository.getOrgStream(state.orgs.first.id),
);
}
}

Expand All @@ -38,7 +41,10 @@ class LoginStateController extends StateNotifier<LoginState> with LocatorMixin {
logger.info('fetchLoginState: selectedOrg = ${state.selectedOrg}');
if (state.selectedOrg.id == null && state.orgs.isNotEmpty) {
logger.info('fetchLoginState: set selectedOrg');
state = state.copyWith(selectedOrg: state.orgs.first);
state = state.copyWith(
selectedOrg: state.orgs.first,
selectedOrgStream: orgRepository.getOrgStream(state.orgs.first.id),
);
logger.info('fetchLoginState: selectedOrg = ${state.selectedOrg}');
}
} else {
Expand Down Expand Up @@ -66,7 +72,10 @@ class LoginStateController extends StateNotifier<LoginState> with LocatorMixin {
}

Future<void> selectOrg(Organization newOrg) async {
state = state.copyWith(selectedOrg: newOrg);
state = state.copyWith(
selectedOrg: newOrg,
selectedOrgStream: orgRepository.getOrgStream(newOrg.id),
);
logger.info('selectOrg: ${state.selectedOrg}');
}

Expand Down
7 changes: 2 additions & 5 deletions lib/pages/member/member_item.dart
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ import 'widgets/level_stars_widget.dart';

class MemberItem extends StatelessWidget {
const MemberItem({
this.id,
this.member,
});

final String id;
final Member member;

@override
Widget build(BuildContext context) {
final member = context
.select<MemberState, List<Member>>((state) => state.members)
.firstWhere((m) => m.user.id == id);
logger.info('MemberItem build: ${member.user.id}');
return ListTile(
onTap: () {
Expand Down
32 changes: 20 additions & 12 deletions lib/pages/member/member_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ class MemberPage extends StatelessWidget {
@override
Widget build(BuildContext context) {
logger.info('MemberPage build');
final memberStream = context.select<MemberState, Stream<List<Member>>>(
(state) => state.membersStream);
return Scaffold(
appBar: AppBar(
backgroundColor: Colors.white,
Expand All @@ -19,18 +21,24 @@ class MemberPage extends StatelessWidget {
style: TextStyle(color: Colors.black),
),
),
body: ListView.builder(
itemCount:
context.select<MemberState, int>((state) => state.members.length),
itemBuilder: (_, index) => Builder(
builder: (context) => MemberItem(
id: context
.select<MemberState, Member>((state) => state.members[index])
.user
.id,
),
),
),
body: (memberStream == null)
? const Text('組織を選択してください.')
: StreamBuilder(
stream: memberStream,
builder: (BuildContext _, AsyncSnapshot<List<Member>> snapshot) {
if (!snapshot.hasData) {
return const Text('Loading...');
}
return ListView.builder(
itemCount: snapshot.data.length,
itemBuilder: (_, index) => Builder(
builder: (context) => MemberItem(
member: snapshot.data[index],
),
),
);
},
),
);
}
}
1 change: 1 addition & 0 deletions lib/pages/member/member_state.dart
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ part 'member_state.freezed.dart';
abstract class MemberState with _$MemberState {
const factory MemberState({
List<Member> members,
Stream<List<Member>> membersStream,
}) = _MemberState;
}
Loading