diff --git a/app/backend/lib/graphql/__generated__/schema.schema.gql.g.dart b/app/backend/lib/graphql/__generated__/schema.schema.gql.g.dart index 27727390..c8aa2590 100644 --- a/app/backend/lib/graphql/__generated__/schema.schema.gql.g.dart +++ b/app/backend/lib/graphql/__generated__/schema.schema.gql.g.dart @@ -7709,14 +7709,15 @@ class GAchievementsBoolExpBuilder try { _$result = _$v ?? new _$GAchievementsBoolExp._( - G_and: _G_and?.build(), - G_not: _G_not?.build(), - G_or: _G_or?.build(), - createdAt: _createdAt?.build(), - description: _description?.build(), - id: _id?.build(), - name: _name?.build(), - updatedAt: _updatedAt?.build()); + G_and: _G_and?.build(), + G_not: _G_not?.build(), + G_or: _G_or?.build(), + createdAt: _createdAt?.build(), + description: _description?.build(), + id: _id?.build(), + name: _name?.build(), + updatedAt: _updatedAt?.build(), + ); } catch (_) { late String _$failedField; try { @@ -7867,11 +7868,12 @@ class GAchievementsOrderByBuilder _$GAchievementsOrderBy _build() { final _$result = _$v ?? new _$GAchievementsOrderBy._( - createdAt: createdAt, - description: description, - id: id, - name: name, - updatedAt: updatedAt); + createdAt: createdAt, + description: description, + id: id, + name: name, + updatedAt: updatedAt, + ); replace(_$result); return _$result; } @@ -7976,7 +7978,9 @@ class GAchievementsStreamCursorInputBuilder try { _$result = _$v ?? new _$GAchievementsStreamCursorInput._( - initialValue: initialValue.build(), ordering: ordering); + initialValue: initialValue.build(), + ordering: ordering, + ); } catch (_) { late String _$failedField; try { @@ -8119,11 +8123,12 @@ class GAchievementsStreamCursorValueInputBuilder _$GAchievementsStreamCursorValueInput _build() { final _$result = _$v ?? new _$GAchievementsStreamCursorValueInput._( - createdAt: createdAt, - description: description, - id: id, - name: name, - updatedAt: updatedAt); + createdAt: createdAt, + description: description, + id: id, + name: name, + updatedAt: updatedAt, + ); replace(_$result); return _$result; } @@ -8298,15 +8303,16 @@ class GIntComparisonExpBuilder try { _$result = _$v ?? new _$GIntComparisonExp._( - G_eq: G_eq, - G_gt: G_gt, - G_gte: G_gte, - G_in: _G_in?.build(), - G_isNull: G_isNull, - G_lt: G_lt, - G_lte: G_lte, - G_neq: G_neq, - G_nin: _G_nin?.build()); + G_eq: G_eq, + G_gt: G_gt, + G_gte: G_gte, + G_in: _G_in?.build(), + G_isNull: G_isNull, + G_lt: G_lt, + G_lte: G_lte, + G_neq: G_neq, + G_nin: _G_nin?.build(), + ); } catch (_) { late String _$failedField; try { @@ -8462,11 +8468,12 @@ class GMainQuestRelationsBoolExpBuilder try { _$result = _$v ?? new _$GMainQuestRelationsBoolExp._( - G_and: _G_and?.build(), - G_not: _G_not?.build(), - G_or: _G_or?.build(), - childQuestId: _childQuestId?.build(), - parentQuestId: _parentQuestId?.build()); + G_and: _G_and?.build(), + G_not: _G_not?.build(), + G_or: _G_or?.build(), + childQuestId: _childQuestId?.build(), + parentQuestId: _parentQuestId?.build(), + ); } catch (_) { late String _$failedField; try { @@ -8583,7 +8590,9 @@ class GMainQuestRelationsInsertInputBuilder _$GMainQuestRelationsInsertInput _build() { final _$result = _$v ?? new _$GMainQuestRelationsInsertInput._( - childQuestId: childQuestId, parentQuestId: parentQuestId); + childQuestId: childQuestId, + parentQuestId: parentQuestId, + ); replace(_$result); return _$result; } @@ -8704,10 +8713,11 @@ class GMainQuestRelationsOnConflictBuilder try { _$result = _$v ?? new _$GMainQuestRelationsOnConflict._( - constraint: BuiltValueNullFieldError.checkNotNull( - constraint, r'GMainQuestRelationsOnConflict', 'constraint'), - updateColumns: updateColumns.build(), - where: _where?.build()); + constraint: BuiltValueNullFieldError.checkNotNull( + constraint, r'GMainQuestRelationsOnConflict', 'constraint'), + updateColumns: updateColumns.build(), + where: _where?.build(), + ); } catch (_) { late String _$failedField; try { @@ -8818,7 +8828,9 @@ class GMainQuestRelationsOrderByBuilder _$GMainQuestRelationsOrderBy _build() { final _$result = _$v ?? new _$GMainQuestRelationsOrderBy._( - childQuestId: childQuestId, parentQuestId: parentQuestId); + childQuestId: childQuestId, + parentQuestId: parentQuestId, + ); replace(_$result); return _$result; } @@ -8925,10 +8937,11 @@ class GMainQuestRelationsPkColumnsInputBuilder _$GMainQuestRelationsPkColumnsInput _build() { final _$result = _$v ?? new _$GMainQuestRelationsPkColumnsInput._( - childQuestId: BuiltValueNullFieldError.checkNotNull(childQuestId, - r'GMainQuestRelationsPkColumnsInput', 'childQuestId'), - parentQuestId: BuiltValueNullFieldError.checkNotNull(parentQuestId, - r'GMainQuestRelationsPkColumnsInput', 'parentQuestId')); + childQuestId: BuiltValueNullFieldError.checkNotNull(childQuestId, + r'GMainQuestRelationsPkColumnsInput', 'childQuestId'), + parentQuestId: BuiltValueNullFieldError.checkNotNull(parentQuestId, + r'GMainQuestRelationsPkColumnsInput', 'parentQuestId'), + ); replace(_$result); return _$result; } @@ -9026,7 +9039,9 @@ class GMainQuestRelationsSetInputBuilder _$GMainQuestRelationsSetInput _build() { final _$result = _$v ?? new _$GMainQuestRelationsSetInput._( - childQuestId: childQuestId, parentQuestId: parentQuestId); + childQuestId: childQuestId, + parentQuestId: parentQuestId, + ); replace(_$result); return _$result; } @@ -9137,7 +9152,9 @@ class GMainQuestRelationsStreamCursorInputBuilder try { _$result = _$v ?? new _$GMainQuestRelationsStreamCursorInput._( - initialValue: initialValue.build(), ordering: ordering); + initialValue: initialValue.build(), + ordering: ordering, + ); } catch (_) { late String _$failedField; try { @@ -9256,7 +9273,9 @@ class GMainQuestRelationsStreamCursorValueInputBuilder _$GMainQuestRelationsStreamCursorValueInput _build() { final _$result = _$v ?? new _$GMainQuestRelationsStreamCursorValueInput._( - childQuestId: childQuestId, parentQuestId: parentQuestId); + childQuestId: childQuestId, + parentQuestId: parentQuestId, + ); replace(_$result); return _$result; } @@ -9359,7 +9378,9 @@ class GMainQuestRelationsUpdatesBuilder try { _$result = _$v ?? new _$GMainQuestRelationsUpdates._( - G_set: _G_set?.build(), where: where.build()); + G_set: _G_set?.build(), + where: where.build(), + ); } catch (_) { late String _$failedField; try { @@ -9650,22 +9671,23 @@ class GMainQuestsBoolExpBuilder try { _$result = _$v ?? new _$GMainQuestsBoolExp._( - G_and: _G_and?.build(), - G_not: _G_not?.build(), - G_or: _G_or?.build(), - begunAt: _begunAt?.build(), - categoryId: _categoryId?.build(), - coverImageUrl: _coverImageUrl?.build(), - createdAt: _createdAt?.build(), - deletedAt: _deletedAt?.build(), - description: _description?.build(), - endedAt: _endedAt?.build(), - id: _id?.build(), - note: _note?.build(), - status: _status?.build(), - title: _title?.build(), - updatedAt: _updatedAt?.build(), - userId: _userId?.build()); + G_and: _G_and?.build(), + G_not: _G_not?.build(), + G_or: _G_or?.build(), + begunAt: _begunAt?.build(), + categoryId: _categoryId?.build(), + coverImageUrl: _coverImageUrl?.build(), + createdAt: _createdAt?.build(), + deletedAt: _deletedAt?.build(), + description: _description?.build(), + endedAt: _endedAt?.build(), + id: _id?.build(), + note: _note?.build(), + status: _status?.build(), + title: _title?.build(), + updatedAt: _updatedAt?.build(), + userId: _userId?.build(), + ); } catch (_) { late String _$failedField; try { @@ -9925,19 +9947,20 @@ class GMainQuestsInsertInputBuilder _$GMainQuestsInsertInput _build() { final _$result = _$v ?? new _$GMainQuestsInsertInput._( - begunAt: begunAt, - categoryId: categoryId, - coverImageUrl: coverImageUrl, - createdAt: createdAt, - deletedAt: deletedAt, - description: description, - endedAt: endedAt, - id: id, - note: note, - status: status, - title: title, - updatedAt: updatedAt, - userId: userId); + begunAt: begunAt, + categoryId: categoryId, + coverImageUrl: coverImageUrl, + createdAt: createdAt, + deletedAt: deletedAt, + description: description, + endedAt: endedAt, + id: id, + note: note, + status: status, + title: title, + updatedAt: updatedAt, + userId: userId, + ); replace(_$result); return _$result; } @@ -10054,10 +10077,11 @@ class GMainQuestsOnConflictBuilder try { _$result = _$v ?? new _$GMainQuestsOnConflict._( - constraint: BuiltValueNullFieldError.checkNotNull( - constraint, r'GMainQuestsOnConflict', 'constraint'), - updateColumns: updateColumns.build(), - where: _where?.build()); + constraint: BuiltValueNullFieldError.checkNotNull( + constraint, r'GMainQuestsOnConflict', 'constraint'), + updateColumns: updateColumns.build(), + where: _where?.build(), + ); } catch (_) { late String _$failedField; try { @@ -10289,19 +10313,20 @@ class GMainQuestsOrderByBuilder _$GMainQuestsOrderBy _build() { final _$result = _$v ?? new _$GMainQuestsOrderBy._( - begunAt: begunAt, - categoryId: categoryId, - coverImageUrl: coverImageUrl, - createdAt: createdAt, - deletedAt: deletedAt, - description: description, - endedAt: endedAt, - id: id, - note: note, - status: status, - title: title, - updatedAt: updatedAt, - userId: userId); + begunAt: begunAt, + categoryId: categoryId, + coverImageUrl: coverImageUrl, + createdAt: createdAt, + deletedAt: deletedAt, + description: description, + endedAt: endedAt, + id: id, + note: note, + status: status, + title: title, + updatedAt: updatedAt, + userId: userId, + ); replace(_$result); return _$result; } @@ -10388,8 +10413,9 @@ class GMainQuestsPkColumnsInputBuilder _$GMainQuestsPkColumnsInput _build() { final _$result = _$v ?? new _$GMainQuestsPkColumnsInput._( - id: BuiltValueNullFieldError.checkNotNull( - id, r'GMainQuestsPkColumnsInput', 'id')); + id: BuiltValueNullFieldError.checkNotNull( + id, r'GMainQuestsPkColumnsInput', 'id'), + ); replace(_$result); return _$result; } @@ -10608,19 +10634,20 @@ class GMainQuestsSetInputBuilder _$GMainQuestsSetInput _build() { final _$result = _$v ?? new _$GMainQuestsSetInput._( - begunAt: begunAt, - categoryId: categoryId, - coverImageUrl: coverImageUrl, - createdAt: createdAt, - deletedAt: deletedAt, - description: description, - endedAt: endedAt, - id: id, - note: note, - status: status, - title: title, - updatedAt: updatedAt, - userId: userId); + begunAt: begunAt, + categoryId: categoryId, + coverImageUrl: coverImageUrl, + createdAt: createdAt, + deletedAt: deletedAt, + description: description, + endedAt: endedAt, + id: id, + note: note, + status: status, + title: title, + updatedAt: updatedAt, + userId: userId, + ); replace(_$result); return _$result; } @@ -10724,7 +10751,9 @@ class GMainQuestsStreamCursorInputBuilder try { _$result = _$v ?? new _$GMainQuestsStreamCursorInput._( - initialValue: initialValue.build(), ordering: ordering); + initialValue: initialValue.build(), + ordering: ordering, + ); } catch (_) { late String _$failedField; try { @@ -10959,19 +10988,20 @@ class GMainQuestsStreamCursorValueInputBuilder _$GMainQuestsStreamCursorValueInput _build() { final _$result = _$v ?? new _$GMainQuestsStreamCursorValueInput._( - begunAt: begunAt, - categoryId: categoryId, - coverImageUrl: coverImageUrl, - createdAt: createdAt, - deletedAt: deletedAt, - description: description, - endedAt: endedAt, - id: id, - note: note, - status: status, - title: title, - updatedAt: updatedAt, - userId: userId); + begunAt: begunAt, + categoryId: categoryId, + coverImageUrl: coverImageUrl, + createdAt: createdAt, + deletedAt: deletedAt, + description: description, + endedAt: endedAt, + id: id, + note: note, + status: status, + title: title, + updatedAt: updatedAt, + userId: userId, + ); replace(_$result); return _$result; } @@ -11072,7 +11102,9 @@ class GMainQuestsUpdatesBuilder try { _$result = _$v ?? new _$GMainQuestsUpdates._( - G_set: _G_set?.build(), where: where.build()); + G_set: _G_set?.build(), + where: where.build(), + ); } catch (_) { late String _$failedField; try { @@ -11331,20 +11363,21 @@ class GNewsBoolExpBuilder try { _$result = _$v ?? new _$GNewsBoolExp._( - G_and: _G_and?.build(), - G_not: _G_not?.build(), - G_or: _G_or?.build(), - content: _content?.build(), - coverImageUrl: _coverImageUrl?.build(), - createdAt: _createdAt?.build(), - excerpt: _excerpt?.build(), - id: _id?.build(), - publishedAt: _publishedAt?.build(), - seo: _seo?.build(), - seoId: _seoId?.build(), - slug: _slug?.build(), - title: _title?.build(), - updatedAt: _updatedAt?.build()); + G_and: _G_and?.build(), + G_not: _G_not?.build(), + G_or: _G_or?.build(), + content: _content?.build(), + coverImageUrl: _coverImageUrl?.build(), + createdAt: _createdAt?.build(), + excerpt: _excerpt?.build(), + id: _id?.build(), + publishedAt: _publishedAt?.build(), + seo: _seo?.build(), + seoId: _seoId?.build(), + slug: _slug?.build(), + title: _title?.build(), + updatedAt: _updatedAt?.build(), + ); } catch (_) { late String _$failedField; try { @@ -11577,17 +11610,18 @@ class GNewsOrderByBuilder try { _$result = _$v ?? new _$GNewsOrderBy._( - content: content, - coverImageUrl: coverImageUrl, - createdAt: createdAt, - excerpt: excerpt, - id: id, - publishedAt: publishedAt, - seo: _seo?.build(), - seoId: seoId, - slug: slug, - title: title, - updatedAt: updatedAt); + content: content, + coverImageUrl: coverImageUrl, + createdAt: createdAt, + excerpt: excerpt, + id: id, + publishedAt: publishedAt, + seo: _seo?.build(), + seoId: seoId, + slug: slug, + title: title, + updatedAt: updatedAt, + ); } catch (_) { late String _$failedField; try { @@ -11700,7 +11734,9 @@ class GNewsStreamCursorInputBuilder try { _$result = _$v ?? new _$GNewsStreamCursorInput._( - initialValue: initialValue.build(), ordering: ordering); + initialValue: initialValue.build(), + ordering: ordering, + ); } catch (_) { late String _$failedField; try { @@ -11899,16 +11935,17 @@ class GNewsStreamCursorValueInputBuilder _$GNewsStreamCursorValueInput _build() { final _$result = _$v ?? new _$GNewsStreamCursorValueInput._( - content: content, - coverImageUrl: coverImageUrl, - createdAt: createdAt, - excerpt: excerpt, - id: id, - publishedAt: publishedAt, - seoId: seoId, - slug: slug, - title: title, - updatedAt: updatedAt); + content: content, + coverImageUrl: coverImageUrl, + createdAt: createdAt, + excerpt: excerpt, + id: id, + publishedAt: publishedAt, + seoId: seoId, + slug: slug, + title: title, + updatedAt: updatedAt, + ); replace(_$result); return _$result; } @@ -12148,19 +12185,20 @@ class GNotificationsBoolExpBuilder try { _$result = _$v ?? new _$GNotificationsBoolExp._( - G_and: _G_and?.build(), - G_not: _G_not?.build(), - G_or: _G_or?.build(), - content: _content?.build(), - coverImageUrl: _coverImageUrl?.build(), - createdAt: _createdAt?.build(), - excerpt: _excerpt?.build(), - firstOpenedAt: _firstOpenedAt?.build(), - id: _id?.build(), - publishedAt: _publishedAt?.build(), - title: _title?.build(), - updatedAt: _updatedAt?.build(), - userId: _userId?.build()); + G_and: _G_and?.build(), + G_not: _G_not?.build(), + G_or: _G_or?.build(), + content: _content?.build(), + coverImageUrl: _coverImageUrl?.build(), + createdAt: _createdAt?.build(), + excerpt: _excerpt?.build(), + firstOpenedAt: _firstOpenedAt?.build(), + id: _id?.build(), + publishedAt: _publishedAt?.build(), + title: _title?.build(), + updatedAt: _updatedAt?.build(), + userId: _userId?.build(), + ); } catch (_) { late String _$failedField; try { @@ -12382,16 +12420,17 @@ class GNotificationsOrderByBuilder _$GNotificationsOrderBy _build() { final _$result = _$v ?? new _$GNotificationsOrderBy._( - content: content, - coverImageUrl: coverImageUrl, - createdAt: createdAt, - excerpt: excerpt, - firstOpenedAt: firstOpenedAt, - id: id, - publishedAt: publishedAt, - title: title, - updatedAt: updatedAt, - userId: userId); + content: content, + coverImageUrl: coverImageUrl, + createdAt: createdAt, + excerpt: excerpt, + firstOpenedAt: firstOpenedAt, + id: id, + publishedAt: publishedAt, + title: title, + updatedAt: updatedAt, + userId: userId, + ); replace(_$result); return _$result; } @@ -12498,7 +12537,9 @@ class GNotificationsStreamCursorInputBuilder try { _$result = _$v ?? new _$GNotificationsStreamCursorInput._( - initialValue: initialValue.build(), ordering: ordering); + initialValue: initialValue.build(), + ordering: ordering, + ); } catch (_) { late String _$failedField; try { @@ -12702,16 +12743,17 @@ class GNotificationsStreamCursorValueInputBuilder _$GNotificationsStreamCursorValueInput _build() { final _$result = _$v ?? new _$GNotificationsStreamCursorValueInput._( - content: content, - coverImageUrl: coverImageUrl, - createdAt: createdAt, - excerpt: excerpt, - firstOpenedAt: firstOpenedAt, - id: id, - publishedAt: publishedAt, - title: title, - updatedAt: updatedAt, - userId: userId); + content: content, + coverImageUrl: coverImageUrl, + createdAt: createdAt, + excerpt: excerpt, + firstOpenedAt: firstOpenedAt, + id: id, + publishedAt: publishedAt, + title: title, + updatedAt: updatedAt, + userId: userId, + ); replace(_$result); return _$result; } @@ -12902,15 +12944,16 @@ class GQuestCategoriesBoolExpBuilder try { _$result = _$v ?? new _$GQuestCategoriesBoolExp._( - G_and: _G_and?.build(), - G_not: _G_not?.build(), - G_or: _G_or?.build(), - createdAt: _createdAt?.build(), - description: _description?.build(), - id: _id?.build(), - name: _name?.build(), - sortNumber: _sortNumber?.build(), - updatedAt: _updatedAt?.build()); + G_and: _G_and?.build(), + G_not: _G_not?.build(), + G_or: _G_or?.build(), + createdAt: _createdAt?.build(), + description: _description?.build(), + id: _id?.build(), + name: _name?.build(), + sortNumber: _sortNumber?.build(), + updatedAt: _updatedAt?.build(), + ); } catch (_) { late String _$failedField; try { @@ -13079,12 +13122,13 @@ class GQuestCategoriesOrderByBuilder _$GQuestCategoriesOrderBy _build() { final _$result = _$v ?? new _$GQuestCategoriesOrderBy._( - createdAt: createdAt, - description: description, - id: id, - name: name, - sortNumber: sortNumber, - updatedAt: updatedAt); + createdAt: createdAt, + description: description, + id: id, + name: name, + sortNumber: sortNumber, + updatedAt: updatedAt, + ); replace(_$result); return _$result; } @@ -13194,7 +13238,9 @@ class GQuestCategoriesStreamCursorInputBuilder try { _$result = _$v ?? new _$GQuestCategoriesStreamCursorInput._( - initialValue: initialValue.build(), ordering: ordering); + initialValue: initialValue.build(), + ordering: ordering, + ); } catch (_) { late String _$failedField; try { @@ -13354,12 +13400,13 @@ class GQuestCategoriesStreamCursorValueInputBuilder _$GQuestCategoriesStreamCursorValueInput _build() { final _$result = _$v ?? new _$GQuestCategoriesStreamCursorValueInput._( - createdAt: createdAt, - description: description, - id: id, - name: name, - sortNumber: sortNumber, - updatedAt: updatedAt); + createdAt: createdAt, + description: description, + id: id, + name: name, + sortNumber: sortNumber, + updatedAt: updatedAt, + ); replace(_$result); return _$result; } @@ -13480,10 +13527,11 @@ class GQuestStatusBoolExpBuilder try { _$result = _$v ?? new _$GQuestStatusBoolExp._( - G_and: _G_and?.build(), - G_not: _G_not?.build(), - G_or: _G_or?.build(), - value: _value?.build()); + G_and: _G_and?.build(), + G_not: _G_not?.build(), + G_or: _G_or?.build(), + value: _value?.build(), + ); } catch (_) { late String _$failedField; try { @@ -13632,11 +13680,12 @@ class GQuestStatusEnumComparisonExpBuilder try { _$result = _$v ?? new _$GQuestStatusEnumComparisonExp._( - G_eq: G_eq, - G_in: _G_in?.build(), - G_isNull: G_isNull, - G_neq: G_neq, - G_nin: _G_nin?.build()); + G_eq: G_eq, + G_in: _G_in?.build(), + G_isNull: G_isNull, + G_neq: G_neq, + G_nin: _G_nin?.build(), + ); } catch (_) { late String _$failedField; try { @@ -13731,7 +13780,10 @@ class GQuestStatusOrderByBuilder GQuestStatusOrderBy build() => _build(); _$GQuestStatusOrderBy _build() { - final _$result = _$v ?? new _$GQuestStatusOrderBy._(value: value); + final _$result = _$v ?? + new _$GQuestStatusOrderBy._( + value: value, + ); replace(_$result); return _$result; } @@ -13835,7 +13887,9 @@ class GQuestStatusStreamCursorInputBuilder try { _$result = _$v ?? new _$GQuestStatusStreamCursorInput._( - initialValue: initialValue.build(), ordering: ordering); + initialValue: initialValue.build(), + ordering: ordering, + ); } catch (_) { late String _$failedField; try { @@ -13933,8 +13987,10 @@ class GQuestStatusStreamCursorValueInputBuilder GQuestStatusStreamCursorValueInput build() => _build(); _$GQuestStatusStreamCursorValueInput _build() { - final _$result = - _$v ?? new _$GQuestStatusStreamCursorValueInput._(value: value); + final _$result = _$v ?? + new _$GQuestStatusStreamCursorValueInput._( + value: value, + ); replace(_$result); return _$result; } @@ -14119,15 +14175,16 @@ class GSeosBoolExpBuilder try { _$result = _$v ?? new _$GSeosBoolExp._( - G_and: _G_and?.build(), - G_not: _G_not?.build(), - G_or: _G_or?.build(), - createdAt: _createdAt?.build(), - description: _description?.build(), - id: _id?.build(), - ogImageUrl: _ogImageUrl?.build(), - title: _title?.build(), - updatedAt: _updatedAt?.build()); + G_and: _G_and?.build(), + G_not: _G_not?.build(), + G_or: _G_or?.build(), + createdAt: _createdAt?.build(), + description: _description?.build(), + id: _id?.build(), + ogImageUrl: _ogImageUrl?.build(), + title: _title?.build(), + updatedAt: _updatedAt?.build(), + ); } catch (_) { late String _$failedField; try { @@ -14292,12 +14349,13 @@ class GSeosOrderByBuilder _$GSeosOrderBy _build() { final _$result = _$v ?? new _$GSeosOrderBy._( - createdAt: createdAt, - description: description, - id: id, - ogImageUrl: ogImageUrl, - title: title, - updatedAt: updatedAt); + createdAt: createdAt, + description: description, + id: id, + ogImageUrl: ogImageUrl, + title: title, + updatedAt: updatedAt, + ); replace(_$result); return _$result; } @@ -14399,7 +14457,9 @@ class GSeosStreamCursorInputBuilder try { _$result = _$v ?? new _$GSeosStreamCursorInput._( - initialValue: initialValue.build(), ordering: ordering); + initialValue: initialValue.build(), + ordering: ordering, + ); } catch (_) { late String _$failedField; try { @@ -14553,12 +14613,13 @@ class GSeosStreamCursorValueInputBuilder _$GSeosStreamCursorValueInput _build() { final _$result = _$v ?? new _$GSeosStreamCursorValueInput._( - createdAt: createdAt, - description: description, - id: id, - ogImageUrl: ogImageUrl, - title: title, - updatedAt: updatedAt); + createdAt: createdAt, + description: description, + id: id, + ogImageUrl: ogImageUrl, + title: title, + updatedAt: updatedAt, + ); replace(_$result); return _$result; } @@ -14844,25 +14905,26 @@ class GStringComparisonExpBuilder try { _$result = _$v ?? new _$GStringComparisonExp._( - G_eq: G_eq, - G_gt: G_gt, - G_gte: G_gte, - G_ilike: G_ilike, - G_in: _G_in?.build(), - G_iregex: G_iregex, - G_isNull: G_isNull, - G_like: G_like, - G_lt: G_lt, - G_lte: G_lte, - G_neq: G_neq, - G_nilike: G_nilike, - G_nin: _G_nin?.build(), - G_niregex: G_niregex, - G_nlike: G_nlike, - G_nregex: G_nregex, - G_nsimilar: G_nsimilar, - G_regex: G_regex, - G_similar: G_similar); + G_eq: G_eq, + G_gt: G_gt, + G_gte: G_gte, + G_ilike: G_ilike, + G_in: _G_in?.build(), + G_iregex: G_iregex, + G_isNull: G_isNull, + G_like: G_like, + G_lt: G_lt, + G_lte: G_lte, + G_neq: G_neq, + G_nilike: G_nilike, + G_nin: _G_nin?.build(), + G_niregex: G_niregex, + G_nlike: G_nlike, + G_nregex: G_nregex, + G_nsimilar: G_nsimilar, + G_regex: G_regex, + G_similar: G_similar, + ); } catch (_) { late String _$failedField; try { @@ -15048,14 +15110,15 @@ class GTagsBoolExpBuilder try { _$result = _$v ?? new _$GTagsBoolExp._( - G_and: _G_and?.build(), - G_not: _G_not?.build(), - G_or: _G_or?.build(), - createdAt: _createdAt?.build(), - description: _description?.build(), - id: _id?.build(), - tag: _tag?.build(), - updatedAt: _updatedAt?.build()); + G_and: _G_and?.build(), + G_not: _G_not?.build(), + G_or: _G_or?.build(), + createdAt: _createdAt?.build(), + description: _description?.build(), + id: _id?.build(), + tag: _tag?.build(), + updatedAt: _updatedAt?.build(), + ); } catch (_) { late String _$failedField; try { @@ -15203,11 +15266,12 @@ class GTagsOrderByBuilder _$GTagsOrderBy _build() { final _$result = _$v ?? new _$GTagsOrderBy._( - createdAt: createdAt, - description: description, - id: id, - tag: tag, - updatedAt: updatedAt); + createdAt: createdAt, + description: description, + id: id, + tag: tag, + updatedAt: updatedAt, + ); replace(_$result); return _$result; } @@ -15309,7 +15373,9 @@ class GTagsStreamCursorInputBuilder try { _$result = _$v ?? new _$GTagsStreamCursorInput._( - initialValue: initialValue.build(), ordering: ordering); + initialValue: initialValue.build(), + ordering: ordering, + ); } catch (_) { late String _$failedField; try { @@ -15448,11 +15514,12 @@ class GTagsStreamCursorValueInputBuilder _$GTagsStreamCursorValueInput _build() { final _$result = _$v ?? new _$GTagsStreamCursorValueInput._( - createdAt: createdAt, - description: description, - id: id, - tag: tag, - updatedAt: updatedAt); + createdAt: createdAt, + description: description, + id: id, + tag: tag, + updatedAt: updatedAt, + ); replace(_$result); return _$result; } @@ -15631,15 +15698,16 @@ class GTimestamptzComparisonExpBuilder try { _$result = _$v ?? new _$GTimestamptzComparisonExp._( - G_eq: G_eq, - G_gt: G_gt, - G_gte: G_gte, - G_in: _G_in?.build(), - G_isNull: G_isNull, - G_lt: G_lt, - G_lte: G_lte, - G_neq: G_neq, - G_nin: _G_nin?.build()); + G_eq: G_eq, + G_gt: G_gt, + G_gte: G_gte, + G_in: _G_in?.build(), + G_isNull: G_isNull, + G_lt: G_lt, + G_lte: G_lte, + G_neq: G_neq, + G_nin: _G_nin?.build(), + ); } catch (_) { late String _$failedField; try { @@ -15789,11 +15857,12 @@ class GUserAchievementsBoolExpBuilder try { _$result = _$v ?? new _$GUserAchievementsBoolExp._( - G_and: _G_and?.build(), - G_not: _G_not?.build(), - G_or: _G_or?.build(), - achievementId: _achievementId?.build(), - userId: _userId?.build()); + G_and: _G_and?.build(), + G_not: _G_not?.build(), + G_or: _G_or?.build(), + achievementId: _achievementId?.build(), + userId: _userId?.build(), + ); } catch (_) { late String _$failedField; try { @@ -15908,7 +15977,9 @@ class GUserAchievementsOrderByBuilder _$GUserAchievementsOrderBy _build() { final _$result = _$v ?? new _$GUserAchievementsOrderBy._( - achievementId: achievementId, userId: userId); + achievementId: achievementId, + userId: userId, + ); replace(_$result); return _$result; } @@ -16019,7 +16090,9 @@ class GUserAchievementsStreamCursorInputBuilder try { _$result = _$v ?? new _$GUserAchievementsStreamCursorInput._( - initialValue: initialValue.build(), ordering: ordering); + initialValue: initialValue.build(), + ordering: ordering, + ); } catch (_) { late String _$failedField; try { @@ -16134,7 +16207,9 @@ class GUserAchievementsStreamCursorValueInputBuilder _$GUserAchievementsStreamCursorValueInput _build() { final _$result = _$v ?? new _$GUserAchievementsStreamCursorValueInput._( - achievementId: achievementId, userId: userId); + achievementId: achievementId, + userId: userId, + ); replace(_$result); return _$result; } @@ -16359,18 +16434,19 @@ class GUsersBoolExpBuilder try { _$result = _$v ?? new _$GUsersBoolExp._( - G_and: _G_and?.build(), - G_not: _G_not?.build(), - G_or: _G_or?.build(), - createdAt: _createdAt?.build(), - email: _email?.build(), - id: _id?.build(), - lastSeen: _lastSeen?.build(), - nickname: _nickname?.build(), - picture: _picture?.build(), - updatedAt: _updatedAt?.build(), - username: _username?.build(), - website: _website?.build()); + G_and: _G_and?.build(), + G_not: _G_not?.build(), + G_or: _G_or?.build(), + createdAt: _createdAt?.build(), + email: _email?.build(), + id: _id?.build(), + lastSeen: _lastSeen?.build(), + nickname: _nickname?.build(), + picture: _picture?.build(), + updatedAt: _updatedAt?.build(), + username: _username?.build(), + website: _website?.build(), + ); } catch (_) { late String _$failedField; try { @@ -16574,15 +16650,16 @@ class GUsersOrderByBuilder _$GUsersOrderBy _build() { final _$result = _$v ?? new _$GUsersOrderBy._( - createdAt: createdAt, - email: email, - id: id, - lastSeen: lastSeen, - nickname: nickname, - picture: picture, - updatedAt: updatedAt, - username: username, - website: website); + createdAt: createdAt, + email: email, + id: id, + lastSeen: lastSeen, + nickname: nickname, + picture: picture, + updatedAt: updatedAt, + username: username, + website: website, + ); replace(_$result); return _$result; } @@ -16685,7 +16762,9 @@ class GUsersStreamCursorInputBuilder try { _$result = _$v ?? new _$GUsersStreamCursorInput._( - initialValue: initialValue.build(), ordering: ordering); + initialValue: initialValue.build(), + ordering: ordering, + ); } catch (_) { late String _$failedField; try { @@ -16872,15 +16951,16 @@ class GUsersStreamCursorValueInputBuilder _$GUsersStreamCursorValueInput _build() { final _$result = _$v ?? new _$GUsersStreamCursorValueInput._( - createdAt: createdAt, - email: email, - id: id, - lastSeen: lastSeen, - nickname: nickname, - picture: picture, - updatedAt: updatedAt, - username: username, - website: website); + createdAt: createdAt, + email: email, + id: id, + lastSeen: lastSeen, + nickname: nickname, + picture: picture, + updatedAt: updatedAt, + username: username, + website: website, + ); replace(_$result); return _$result; } @@ -17056,15 +17136,16 @@ class GUuidComparisonExpBuilder try { _$result = _$v ?? new _$GUuidComparisonExp._( - G_eq: G_eq, - G_gt: G_gt, - G_gte: G_gte, - G_in: _G_in?.build(), - G_isNull: G_isNull, - G_lt: G_lt, - G_lte: G_lte, - G_neq: G_neq, - G_nin: _G_nin?.build()); + G_eq: G_eq, + G_gt: G_gt, + G_gte: G_gte, + G_in: _G_in?.build(), + G_isNull: G_isNull, + G_lt: G_lt, + G_lte: G_lte, + G_neq: G_neq, + G_nin: _G_nin?.build(), + ); } catch (_) { late String _$failedField; try { diff --git a/app/backend/lib/graphql/news/__generated__/GetNews.data.gql.g.dart b/app/backend/lib/graphql/news/__generated__/GetNews.data.gql.g.dart index 5c470229..fabc8c84 100644 --- a/app/backend/lib/graphql/news/__generated__/GetNews.data.gql.g.dart +++ b/app/backend/lib/graphql/news/__generated__/GetNews.data.gql.g.dart @@ -241,9 +241,10 @@ class GGetNewsDataBuilder try { _$result = _$v ?? new _$GGetNewsData._( - G__typename: BuiltValueNullFieldError.checkNotNull( - G__typename, r'GGetNewsData', 'G__typename'), - news: news.build()); + G__typename: BuiltValueNullFieldError.checkNotNull( + G__typename, r'GGetNewsData', 'G__typename'), + news: news.build(), + ); } catch (_) { late String _$failedField; try { @@ -404,16 +405,17 @@ class GGetNewsData_newsBuilder _$GGetNewsData_news _build() { final _$result = _$v ?? new _$GGetNewsData_news._( - G__typename: BuiltValueNullFieldError.checkNotNull( - G__typename, r'GGetNewsData_news', 'G__typename'), - title: BuiltValueNullFieldError.checkNotNull( - title, r'GGetNewsData_news', 'title'), - slug: BuiltValueNullFieldError.checkNotNull( - slug, r'GGetNewsData_news', 'slug'), - publishedAt: publishedAt, - excerpt: BuiltValueNullFieldError.checkNotNull( - excerpt, r'GGetNewsData_news', 'excerpt'), - coverImageUrl: coverImageUrl); + G__typename: BuiltValueNullFieldError.checkNotNull( + G__typename, r'GGetNewsData_news', 'G__typename'), + title: BuiltValueNullFieldError.checkNotNull( + title, r'GGetNewsData_news', 'title'), + slug: BuiltValueNullFieldError.checkNotNull( + slug, r'GGetNewsData_news', 'slug'), + publishedAt: publishedAt, + excerpt: BuiltValueNullFieldError.checkNotNull( + excerpt, r'GGetNewsData_news', 'excerpt'), + coverImageUrl: coverImageUrl, + ); replace(_$result); return _$result; } diff --git a/app/backend/lib/graphql/news/__generated__/GetNews.req.gql.g.dart b/app/backend/lib/graphql/news/__generated__/GetNews.req.gql.g.dart index d05efdf2..d1d60b77 100644 --- a/app/backend/lib/graphql/news/__generated__/GetNews.req.gql.g.dart +++ b/app/backend/lib/graphql/news/__generated__/GetNews.req.gql.g.dart @@ -325,18 +325,19 @@ class GGetNewsReqBuilder implements Builder { try { _$result = _$v ?? new _$GGetNewsReq._( - vars: vars.build(), - operation: BuiltValueNullFieldError.checkNotNull( - operation, r'GGetNewsReq', 'operation'), - requestId: requestId, - updateResult: updateResult, - optimisticResponse: _optimisticResponse?.build(), - updateCacheHandlerKey: updateCacheHandlerKey, - updateCacheHandlerContext: updateCacheHandlerContext, - fetchPolicy: fetchPolicy, - executeOnListen: BuiltValueNullFieldError.checkNotNull( - executeOnListen, r'GGetNewsReq', 'executeOnListen'), - context: context); + vars: vars.build(), + operation: BuiltValueNullFieldError.checkNotNull( + operation, r'GGetNewsReq', 'operation'), + requestId: requestId, + updateResult: updateResult, + optimisticResponse: _optimisticResponse?.build(), + updateCacheHandlerKey: updateCacheHandlerKey, + updateCacheHandlerContext: updateCacheHandlerContext, + fetchPolicy: fetchPolicy, + executeOnListen: BuiltValueNullFieldError.checkNotNull( + executeOnListen, r'GGetNewsReq', 'executeOnListen'), + context: context, + ); } catch (_) { late String _$failedField; try { diff --git a/app/backend/lib/graphql/quest/__generated__/GetQuests.data.gql.g.dart b/app/backend/lib/graphql/quest/__generated__/GetQuests.data.gql.g.dart index 768d44c6..c6e86cb4 100644 --- a/app/backend/lib/graphql/quest/__generated__/GetQuests.data.gql.g.dart +++ b/app/backend/lib/graphql/quest/__generated__/GetQuests.data.gql.g.dart @@ -285,9 +285,10 @@ class GGetQuestsDataBuilder try { _$result = _$v ?? new _$GGetQuestsData._( - G__typename: BuiltValueNullFieldError.checkNotNull( - G__typename, r'GGetQuestsData', 'G__typename'), - mainQuests: mainQuests.build()); + G__typename: BuiltValueNullFieldError.checkNotNull( + G__typename, r'GGetQuestsData', 'G__typename'), + mainQuests: mainQuests.build(), + ); } catch (_) { late String _$failedField; try { @@ -500,22 +501,23 @@ class GGetQuestsData_mainQuestsBuilder _$GGetQuestsData_mainQuests _build() { final _$result = _$v ?? new _$GGetQuestsData_mainQuests._( - G__typename: BuiltValueNullFieldError.checkNotNull( - G__typename, r'GGetQuestsData_mainQuests', 'G__typename'), - id: BuiltValueNullFieldError.checkNotNull( - id, r'GGetQuestsData_mainQuests', 'id'), - title: BuiltValueNullFieldError.checkNotNull( - title, r'GGetQuestsData_mainQuests', 'title'), - description: BuiltValueNullFieldError.checkNotNull( - description, r'GGetQuestsData_mainQuests', 'description'), - begunAt: begunAt, - endedAt: endedAt, - categoryId: categoryId, - status: BuiltValueNullFieldError.checkNotNull( - status, r'GGetQuestsData_mainQuests', 'status'), - coverImageUrl: coverImageUrl, - note: BuiltValueNullFieldError.checkNotNull( - note, r'GGetQuestsData_mainQuests', 'note')); + G__typename: BuiltValueNullFieldError.checkNotNull( + G__typename, r'GGetQuestsData_mainQuests', 'G__typename'), + id: BuiltValueNullFieldError.checkNotNull( + id, r'GGetQuestsData_mainQuests', 'id'), + title: BuiltValueNullFieldError.checkNotNull( + title, r'GGetQuestsData_mainQuests', 'title'), + description: BuiltValueNullFieldError.checkNotNull( + description, r'GGetQuestsData_mainQuests', 'description'), + begunAt: begunAt, + endedAt: endedAt, + categoryId: categoryId, + status: BuiltValueNullFieldError.checkNotNull( + status, r'GGetQuestsData_mainQuests', 'status'), + coverImageUrl: coverImageUrl, + note: BuiltValueNullFieldError.checkNotNull( + note, r'GGetQuestsData_mainQuests', 'note'), + ); replace(_$result); return _$result; } diff --git a/app/backend/lib/graphql/quest/__generated__/GetQuests.req.gql.g.dart b/app/backend/lib/graphql/quest/__generated__/GetQuests.req.gql.g.dart index 1acdd981..9a608c75 100644 --- a/app/backend/lib/graphql/quest/__generated__/GetQuests.req.gql.g.dart +++ b/app/backend/lib/graphql/quest/__generated__/GetQuests.req.gql.g.dart @@ -329,18 +329,19 @@ class GGetQuestsReqBuilder try { _$result = _$v ?? new _$GGetQuestsReq._( - vars: vars.build(), - operation: BuiltValueNullFieldError.checkNotNull( - operation, r'GGetQuestsReq', 'operation'), - requestId: requestId, - updateResult: updateResult, - optimisticResponse: _optimisticResponse?.build(), - updateCacheHandlerKey: updateCacheHandlerKey, - updateCacheHandlerContext: updateCacheHandlerContext, - fetchPolicy: fetchPolicy, - executeOnListen: BuiltValueNullFieldError.checkNotNull( - executeOnListen, r'GGetQuestsReq', 'executeOnListen'), - context: context); + vars: vars.build(), + operation: BuiltValueNullFieldError.checkNotNull( + operation, r'GGetQuestsReq', 'operation'), + requestId: requestId, + updateResult: updateResult, + optimisticResponse: _optimisticResponse?.build(), + updateCacheHandlerKey: updateCacheHandlerKey, + updateCacheHandlerContext: updateCacheHandlerContext, + fetchPolicy: fetchPolicy, + executeOnListen: BuiltValueNullFieldError.checkNotNull( + executeOnListen, r'GGetQuestsReq', 'executeOnListen'), + context: context, + ); } catch (_) { late String _$failedField; try { diff --git a/app/backend/lib/graphql/quest/__generated__/GetQuests.var.gql.g.dart b/app/backend/lib/graphql/quest/__generated__/GetQuests.var.gql.g.dart index e1f4f3ba..8f1c818a 100644 --- a/app/backend/lib/graphql/quest/__generated__/GetQuests.var.gql.g.dart +++ b/app/backend/lib/graphql/quest/__generated__/GetQuests.var.gql.g.dart @@ -128,8 +128,9 @@ class GGetQuestsVarsBuilder _$GGetQuestsVars _build() { final _$result = _$v ?? new _$GGetQuestsVars._( - userId: BuiltValueNullFieldError.checkNotNull( - userId, r'GGetQuestsVars', 'userId')); + userId: BuiltValueNullFieldError.checkNotNull( + userId, r'GGetQuestsVars', 'userId'), + ); replace(_$result); return _$result; } diff --git a/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.data.gql.g.dart b/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.data.gql.g.dart index 23399c03..3d361c35 100644 --- a/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.data.gql.g.dart +++ b/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.data.gql.g.dart @@ -298,9 +298,10 @@ class GInsertMainQuestDataBuilder try { _$result = _$v ?? new _$GInsertMainQuestData._( - G__typename: BuiltValueNullFieldError.checkNotNull( - G__typename, r'GInsertMainQuestData', 'G__typename'), - insertMainQuestsOne: _insertMainQuestsOne?.build()); + G__typename: BuiltValueNullFieldError.checkNotNull( + G__typename, r'GInsertMainQuestData', 'G__typename'), + insertMainQuestsOne: _insertMainQuestsOne?.build(), + ); } catch (_) { late String _$failedField; try { @@ -520,22 +521,23 @@ class GInsertMainQuestData_insertMainQuestsOneBuilder _$GInsertMainQuestData_insertMainQuestsOne _build() { final _$result = _$v ?? new _$GInsertMainQuestData_insertMainQuestsOne._( - G__typename: BuiltValueNullFieldError.checkNotNull(G__typename, - r'GInsertMainQuestData_insertMainQuestsOne', 'G__typename'), - id: BuiltValueNullFieldError.checkNotNull( - id, r'GInsertMainQuestData_insertMainQuestsOne', 'id'), - title: BuiltValueNullFieldError.checkNotNull( - title, r'GInsertMainQuestData_insertMainQuestsOne', 'title'), - description: BuiltValueNullFieldError.checkNotNull(description, - r'GInsertMainQuestData_insertMainQuestsOne', 'description'), - begunAt: begunAt, - endedAt: endedAt, - categoryId: categoryId, - status: BuiltValueNullFieldError.checkNotNull( - status, r'GInsertMainQuestData_insertMainQuestsOne', 'status'), - coverImageUrl: coverImageUrl, - note: BuiltValueNullFieldError.checkNotNull( - note, r'GInsertMainQuestData_insertMainQuestsOne', 'note')); + G__typename: BuiltValueNullFieldError.checkNotNull(G__typename, + r'GInsertMainQuestData_insertMainQuestsOne', 'G__typename'), + id: BuiltValueNullFieldError.checkNotNull( + id, r'GInsertMainQuestData_insertMainQuestsOne', 'id'), + title: BuiltValueNullFieldError.checkNotNull( + title, r'GInsertMainQuestData_insertMainQuestsOne', 'title'), + description: BuiltValueNullFieldError.checkNotNull(description, + r'GInsertMainQuestData_insertMainQuestsOne', 'description'), + begunAt: begunAt, + endedAt: endedAt, + categoryId: categoryId, + status: BuiltValueNullFieldError.checkNotNull( + status, r'GInsertMainQuestData_insertMainQuestsOne', 'status'), + coverImageUrl: coverImageUrl, + note: BuiltValueNullFieldError.checkNotNull( + note, r'GInsertMainQuestData_insertMainQuestsOne', 'note'), + ); replace(_$result); return _$result; } diff --git a/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.req.gql.g.dart b/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.req.gql.g.dart index 7e5466d6..044b3853 100644 --- a/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.req.gql.g.dart +++ b/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.req.gql.g.dart @@ -338,18 +338,19 @@ class GInsertMainQuestReqBuilder try { _$result = _$v ?? new _$GInsertMainQuestReq._( - vars: vars.build(), - operation: BuiltValueNullFieldError.checkNotNull( - operation, r'GInsertMainQuestReq', 'operation'), - requestId: requestId, - updateResult: updateResult, - optimisticResponse: _optimisticResponse?.build(), - updateCacheHandlerKey: updateCacheHandlerKey, - updateCacheHandlerContext: updateCacheHandlerContext, - fetchPolicy: fetchPolicy, - executeOnListen: BuiltValueNullFieldError.checkNotNull( - executeOnListen, r'GInsertMainQuestReq', 'executeOnListen'), - context: context); + vars: vars.build(), + operation: BuiltValueNullFieldError.checkNotNull( + operation, r'GInsertMainQuestReq', 'operation'), + requestId: requestId, + updateResult: updateResult, + optimisticResponse: _optimisticResponse?.build(), + updateCacheHandlerKey: updateCacheHandlerKey, + updateCacheHandlerContext: updateCacheHandlerContext, + fetchPolicy: fetchPolicy, + executeOnListen: BuiltValueNullFieldError.checkNotNull( + executeOnListen, r'GInsertMainQuestReq', 'executeOnListen'), + context: context, + ); } catch (_) { late String _$failedField; try { diff --git a/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.var.gql.g.dart b/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.var.gql.g.dart index 8cce77fe..0c094bbc 100644 --- a/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.var.gql.g.dart +++ b/app/backend/lib/graphql/quest/__generated__/InsertMainQuest.var.gql.g.dart @@ -201,7 +201,11 @@ class GInsertMainQuestVarsBuilder _$GInsertMainQuestVars _build() { final _$result = _$v ?? new _$GInsertMainQuestVars._( - userId: userId, title: title, description: description, note: note); + userId: userId, + title: title, + description: description, + note: note, + ); replace(_$result); return _$result; } diff --git a/app/backend/routes/v1/_middleware.dart b/app/backend/routes/v1/_middleware.dart index 7ff2d3a8..ff5a1ad5 100644 --- a/app/backend/routes/v1/_middleware.dart +++ b/app/backend/routes/v1/_middleware.dart @@ -34,7 +34,7 @@ Handler middleware(Handler handler) { ), HttpAuthLink( url: env.backendUrl, - ) + ), ], ), cache: Cache(), diff --git a/app/catalog/lib/feature/auth/page/auth_page.dart b/app/catalog/lib/feature/auth/screen/auth_screen.dart similarity index 68% rename from app/catalog/lib/feature/auth/page/auth_page.dart rename to app/catalog/lib/feature/auth/screen/auth_screen.dart index 6bb6d9d7..54935c24 100644 --- a/app/catalog/lib/feature/auth/page/auth_page.dart +++ b/app/catalog/lib/feature/auth/screen/auth_screen.dart @@ -3,12 +3,12 @@ import 'package:flutter/material.dart'; import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; @widgetbook.UseCase( - name: 'AuthPage', - type: AuthPage, + name: 'AuthScreen', + type: AuthScreen, path: '[Feature]/auth', ) -AuthPage authPageUseCase(BuildContext context) { - return AuthPage( +AuthScreen authScreenUseCase(BuildContext context) { + return AuthScreen( onLoginSuccess: () {}, ); } diff --git a/app/catalog/lib/feature/home/page/home_page.dart b/app/catalog/lib/feature/home/screen/home_screen.dart similarity index 75% rename from app/catalog/lib/feature/home/page/home_page.dart rename to app/catalog/lib/feature/home/screen/home_screen.dart index f420eabd..d9625881 100644 --- a/app/catalog/lib/feature/home/page/home_page.dart +++ b/app/catalog/lib/feature/home/screen/home_screen.dart @@ -3,12 +3,12 @@ import 'package:flutter/material.dart'; import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; @widgetbook.UseCase( - name: 'HomePage', - type: HomePage, + name: 'HomeScreen', + type: HomeScreen, path: '[Feature]/home', ) -HomePage homePageUseCase(BuildContext context) { - return HomePage( +HomeScreen homeScreenUseCase(BuildContext context) { + return HomeScreen( onTapNotification: () {}, onQuickAddButtonPressed: () {}, onTapQuestListItem: (_) {}, diff --git a/app/catalog/lib/feature/my/page/settings_page.dart b/app/catalog/lib/feature/my/screen/settings_screen.dart similarity index 70% rename from app/catalog/lib/feature/my/page/settings_page.dart rename to app/catalog/lib/feature/my/screen/settings_screen.dart index b101033f..c7fbd5b6 100644 --- a/app/catalog/lib/feature/my/page/settings_page.dart +++ b/app/catalog/lib/feature/my/screen/settings_screen.dart @@ -3,12 +3,12 @@ import 'package:flutter/material.dart'; import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; @widgetbook.UseCase( - name: 'SettingsPage', - type: SettingsPage, + name: 'SettingsScreen', + type: SettingsScreen, path: '[Feature]/my', ) -SettingsPage settingsPageUseCase(BuildContext context) { - return SettingsPage( +SettingsScreen settingsScreenUseCase(BuildContext context) { + return SettingsScreen( onTapThemeSetting: () {}, onTapOpenSourceLicense: () {}, onSignOutSuccess: () {}, diff --git a/app/catalog/lib/feature/onboarding/screen/onboarding_screen.dart b/app/catalog/lib/feature/onboarding/screen/onboarding_screen.dart new file mode 100644 index 00000000..8aa42e8b --- /dev/null +++ b/app/catalog/lib/feature/onboarding/screen/onboarding_screen.dart @@ -0,0 +1,15 @@ +import 'package:feature_onboarding/feature_onboarding.dart'; +import 'package:flutter/material.dart'; +import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; + +@widgetbook.UseCase( + name: 'OnboardingScreen', + type: OnboardingScreen, + path: '[Feature]/onboarding', +) +OnboardingScreen onboardingScreenUseCase(BuildContext context) { + return OnboardingScreen( + onPopInvoked: () {}, + onAgreeAndContinue: () {}, + ); +} diff --git a/app/catalog/lib/feature/quest/page/quest_add_page.dart b/app/catalog/lib/feature/quest/screen/quest_add_screen.dart similarity index 65% rename from app/catalog/lib/feature/quest/page/quest_add_page.dart rename to app/catalog/lib/feature/quest/screen/quest_add_screen.dart index e415a9f4..3f3b47c8 100644 --- a/app/catalog/lib/feature/quest/page/quest_add_page.dart +++ b/app/catalog/lib/feature/quest/screen/quest_add_screen.dart @@ -3,12 +3,12 @@ import 'package:flutter/material.dart'; import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; @widgetbook.UseCase( - name: 'QuestAddPage', - type: QuestAddPage, + name: 'QuestAddScreen', + type: QuestAddScreen, path: '[Feature]/quest', ) -QuestAddPage questAddPageUseCase(BuildContext context) { - return QuestAddPage( +QuestAddScreen questAddScreenUseCase(BuildContext context) { + return QuestAddScreen( onAddQuestCompleted: () {}, ); } diff --git a/app/catalog/lib/feature/quest/page/quest_detail_page.dart b/app/catalog/lib/feature/quest/screen/quest_detail_screen.dart similarity index 55% rename from app/catalog/lib/feature/quest/page/quest_detail_page.dart rename to app/catalog/lib/feature/quest/screen/quest_detail_screen.dart index 3f2edb6b..9b6e3e8e 100644 --- a/app/catalog/lib/feature/quest/page/quest_detail_page.dart +++ b/app/catalog/lib/feature/quest/screen/quest_detail_screen.dart @@ -3,10 +3,12 @@ import 'package:flutter/material.dart'; import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; @widgetbook.UseCase( - name: 'QuestDetailPage', - type: QuestDetailPage, + name: 'QuestDetailScreen', + type: QuestDetailScreen, path: '[Feature]/quest', ) -QuestDetailPage questPageUseCase(BuildContext context) { - return const QuestDetailPage(questId: '1'); +QuestDetailScreen questDetailScreenUseCase(BuildContext context) { + return const QuestDetailScreen( + id: 'quest_id', + ); } diff --git a/app/catalog/lib/feature/quest/page/quest_page.dart b/app/catalog/lib/feature/quest/screen/quest_screen.dart similarity index 60% rename from app/catalog/lib/feature/quest/page/quest_page.dart rename to app/catalog/lib/feature/quest/screen/quest_screen.dart index 17bd5624..233dbdfd 100644 --- a/app/catalog/lib/feature/quest/page/quest_page.dart +++ b/app/catalog/lib/feature/quest/screen/quest_screen.dart @@ -3,13 +3,13 @@ import 'package:flutter/material.dart'; import 'package:widgetbook_annotation/widgetbook_annotation.dart' as widgetbook; @widgetbook.UseCase( - name: 'QuestPage', - type: QuestListPage, + name: 'QuestListScreen', + type: QuestListScreen, path: '[Feature]/quest', ) -QuestListPage questPageUseCase(BuildContext context) { - return QuestListPage( - onTapQuestListItem: (quest) {}, +QuestListScreen questListScreenUseCase(BuildContext context) { + return QuestListScreen( + onTapQuestListItem: (_) {}, onTapQuestAddButton: () {}, ); } diff --git a/app/catalog/lib/widgetbook.directories.g.dart b/app/catalog/lib/widgetbook.directories.g.dart index 1d0de524..e9c93fc8 100644 --- a/app/catalog/lib/widgetbook.directories.g.dart +++ b/app/catalog/lib/widgetbook.directories.g.dart @@ -9,16 +9,19 @@ // ************************************************************************** // ignore_for_file: no_leading_underscores_for_library_prefixes -import 'package:app_catalog/designsystem/component/brand_icon.dart' as _i3; -import 'package:app_catalog/designsystem/component/card.dart' as _i4; -import 'package:app_catalog/designsystem/component/scaffold.dart' as _i2; -import 'package:app_catalog/feature/auth/page/auth_page.dart' as _i5; -import 'package:app_catalog/feature/home/page/home_page.dart' as _i6; -import 'package:app_catalog/feature/my/page/settings_page.dart' as _i7; -import 'package:app_catalog/feature/quest/page/quest_add_page.dart' as _i8; -import 'package:app_catalog/feature/quest/page/quest_detail_page.dart' as _i9; -import 'package:app_catalog/feature/quest/page/quest_page.dart' as _i10; -import 'package:app_catalog/ui/component/quest_list_tile.dart' as _i11; +import 'package:app_catalog/designsystem/component/brand_icon.dart' as _i2; +import 'package:app_catalog/designsystem/component/card.dart' as _i3; +import 'package:app_catalog/designsystem/component/scaffold.dart' as _i4; +import 'package:app_catalog/feature/auth/screen/auth_screen.dart' as _i5; +import 'package:app_catalog/feature/home/screen/home_screen.dart' as _i6; +import 'package:app_catalog/feature/my/screen/settings_screen.dart' as _i7; +import 'package:app_catalog/feature/onboarding/screen/onboarding_screen.dart' + as _i8; +import 'package:app_catalog/feature/quest/screen/quest_add_screen.dart' as _i9; +import 'package:app_catalog/feature/quest/screen/quest_detail_screen.dart' + as _i10; +import 'package:app_catalog/feature/quest/screen/quest_screen.dart' as _i11; +import 'package:app_catalog/ui/component/quest_list_tile.dart' as _i12; import 'package:widgetbook/widgetbook.dart' as _i1; final directories = <_i1.WidgetbookNode>[ @@ -29,23 +32,23 @@ final directories = <_i1.WidgetbookNode>[ name: 'components', children: [ _i1.WidgetbookLeafComponent( - name: 'TobeScaffold', + name: 'BrandIcon', useCase: _i1.WidgetbookUseCase( - name: 'TobeScaffold', + name: 'BrandIcon', builder: _i2.tobeScaffoldUseCase, ), ), _i1.WidgetbookLeafComponent( - name: 'BrandIcon', + name: 'TappableCard', useCase: _i1.WidgetbookUseCase( - name: 'BrandIcon', + name: 'TappableCard', builder: _i3.tobeScaffoldUseCase, ), ), _i1.WidgetbookLeafComponent( - name: 'TappableCard', + name: 'TobeScaffold', useCase: _i1.WidgetbookUseCase( - name: 'TappableCard', + name: 'TobeScaffold', builder: _i4.tobeScaffoldUseCase, ), ), @@ -60,10 +63,10 @@ final directories = <_i1.WidgetbookNode>[ name: 'auth', children: [ _i1.WidgetbookLeafComponent( - name: 'AuthPage', + name: 'AuthScreen', useCase: _i1.WidgetbookUseCase( - name: 'AuthPage', - builder: _i5.authPageUseCase, + name: 'AuthScreen', + builder: _i5.authScreenUseCase, ), ) ], @@ -72,10 +75,10 @@ final directories = <_i1.WidgetbookNode>[ name: 'home', children: [ _i1.WidgetbookLeafComponent( - name: 'HomePage', + name: 'HomeScreen', useCase: _i1.WidgetbookUseCase( - name: 'HomePage', - builder: _i6.homePageUseCase, + name: 'HomeScreen', + builder: _i6.homeScreenUseCase, ), ) ], @@ -84,10 +87,22 @@ final directories = <_i1.WidgetbookNode>[ name: 'my', children: [ _i1.WidgetbookLeafComponent( - name: 'SettingsPage', + name: 'SettingsScreen', + useCase: _i1.WidgetbookUseCase( + name: 'SettingsScreen', + builder: _i7.settingsScreenUseCase, + ), + ) + ], + ), + _i1.WidgetbookFolder( + name: 'onboarding', + children: [ + _i1.WidgetbookLeafComponent( + name: 'OnboardingScreen', useCase: _i1.WidgetbookUseCase( - name: 'SettingsPage', - builder: _i7.settingsPageUseCase, + name: 'OnboardingScreen', + builder: _i8.onboardingScreenUseCase, ), ) ], @@ -96,24 +111,24 @@ final directories = <_i1.WidgetbookNode>[ name: 'quest', children: [ _i1.WidgetbookLeafComponent( - name: 'QuestAddPage', + name: 'QuestAddScreen', useCase: _i1.WidgetbookUseCase( - name: 'QuestAddPage', - builder: _i8.questAddPageUseCase, + name: 'QuestAddScreen', + builder: _i9.questAddScreenUseCase, ), ), _i1.WidgetbookLeafComponent( - name: 'QuestDetailPage', + name: 'QuestDetailScreen', useCase: _i1.WidgetbookUseCase( - name: 'QuestDetailPage', - builder: _i9.questPageUseCase, + name: 'QuestDetailScreen', + builder: _i10.questDetailScreenUseCase, ), ), _i1.WidgetbookLeafComponent( - name: 'QuestListPage', + name: 'QuestListScreen', useCase: _i1.WidgetbookUseCase( - name: 'QuestPage', - builder: _i10.questPageUseCase, + name: 'QuestListScreen', + builder: _i11.questListScreenUseCase, ), ), ], @@ -130,7 +145,7 @@ final directories = <_i1.WidgetbookNode>[ name: 'QuestListTile', useCase: _i1.WidgetbookUseCase( name: 'QuestListTile', - builder: _i11.tobeScaffoldUseCase, + builder: _i12.tobeScaffoldUseCase, ), ) ], diff --git a/app/catalog/pubspec.yaml b/app/catalog/pubspec.yaml index fd4122d4..3d0e789a 100644 --- a/app/catalog/pubspec.yaml +++ b/app/catalog/pubspec.yaml @@ -18,6 +18,7 @@ dependencies: feature_auth: any feature_feed: any feature_home: any + feature_onboarding: any feature_quest: any feature_settings: any flutter: diff --git a/app/mobile/lib/app.dart b/app/mobile/lib/app.dart index 8f3e8274..26524db5 100644 --- a/app/mobile/lib/app.dart +++ b/app/mobile/lib/app.dart @@ -1,13 +1,13 @@ -import 'package:core_designsystem/theme.dart'; -import 'package:core_domain/user_settings_use_case.dart'; -import 'package:dynamic_color/dynamic_color.dart'; -import 'package:flutter/material.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:app_mobile/extension/theme.dart'; import 'package:app_mobile/l10n/l10n.dart'; import 'package:app_mobile/router/app_router.dart'; import 'package:app_mobile/ui/app_force_updatable.dart'; import 'package:app_mobile/ui/toast.dart'; +import 'package:core_designsystem/theme.dart'; +import 'package:core_domain/user_settings_use_case.dart'; +import 'package:dynamic_color/dynamic_color.dart'; +import 'package:flutter/material.dart'; +import 'package:hooks_riverpod/hooks_riverpod.dart'; final class TobeApp extends ConsumerWidget { const TobeApp({super.key}); diff --git a/app/mobile/lib/config/remote_config.dart b/app/mobile/lib/config/remote_config.dart index 05e27893..b9de45f0 100644 --- a/app/mobile/lib/config/remote_config.dart +++ b/app/mobile/lib/config/remote_config.dart @@ -25,7 +25,8 @@ UpdateVersion _resolveUpdateVersion(FirebaseRemoteConfig firebaseRemoteConfig) { final updateVersions = jsonDecode( firebaseRemoteConfig.getString(appVersionsKey), - ); + ) as Map; + return UpdateVersion( force: AppVersion.parse(updateVersions['force'] as String), optional: AppVersion.parse(updateVersions['optional'] as String), diff --git a/app/mobile/lib/flavor/flavor.dart b/app/mobile/lib/flavor/flavor.dart index 2942ab8c..8f921d2c 100644 --- a/app/mobile/lib/flavor/flavor.dart +++ b/app/mobile/lib/flavor/flavor.dart @@ -1,8 +1,8 @@ -import 'package:core_model/config.dart'; -import 'package:firebase_core/firebase_core.dart'; import 'package:app_mobile/flavor/dev/firebase_options.dart' as dev; import 'package:app_mobile/flavor/prod//firebase_options.dart' as prod; import 'package:app_mobile/flavor/stg/firebase_options.dart' as stg; +import 'package:core_model/config.dart'; +import 'package:firebase_core/firebase_core.dart'; extension FlavorX on Flavor { FirebaseOptions get firebaseOptions => switch (this) { diff --git a/app/mobile/lib/initializer/app_initializer.dart b/app/mobile/lib/initializer/app_initializer.dart index 56a4fe9f..e3ce0474 100644 --- a/app/mobile/lib/initializer/app_initializer.dart +++ b/app/mobile/lib/initializer/app_initializer.dart @@ -1,9 +1,5 @@ import 'dart:async'; -import 'package:core_model/config.dart'; -import 'package:firebase_analytics/firebase_analytics.dart'; -import 'package:firebase_remote_config/firebase_remote_config.dart'; -import 'package:isar/isar.dart'; import 'package:app_mobile/auth/firebase_authenticator.dart'; import 'package:app_mobile/datastore/preferences_data_store.dart'; import 'package:app_mobile/initializer/app_config_initializer.dart'; @@ -11,6 +7,10 @@ import 'package:app_mobile/initializer/database_initializer.dart'; import 'package:app_mobile/initializer/datastore_initializer.dart'; import 'package:app_mobile/initializer/firebase_initializer.dart'; import 'package:app_mobile/initializer/logger_initializer.dart'; +import 'package:core_model/config.dart'; +import 'package:firebase_analytics/firebase_analytics.dart'; +import 'package:firebase_remote_config/firebase_remote_config.dart'; +import 'package:isar/isar.dart'; typedef InitializedValues = ({ AppConfig appConfig, diff --git a/app/mobile/lib/initializer/firebase_initializer.dart b/app/mobile/lib/initializer/firebase_initializer.dart index ece49899..58953121 100644 --- a/app/mobile/lib/initializer/firebase_initializer.dart +++ b/app/mobile/lib/initializer/firebase_initializer.dart @@ -1,10 +1,10 @@ +import 'package:app_mobile/auth/firebase_authenticator.dart'; +import 'package:app_mobile/flavor/flavor.dart'; import 'package:core_model/config.dart'; import 'package:firebase_analytics/firebase_analytics.dart'; import 'package:firebase_auth/firebase_auth.dart'; import 'package:firebase_core/firebase_core.dart'; import 'package:firebase_remote_config/firebase_remote_config.dart'; -import 'package:app_mobile/auth/firebase_authenticator.dart'; -import 'package:app_mobile/flavor/flavor.dart'; typedef InitializedValues = ({ FirebaseAnalytics firebaseAnalytics, diff --git a/app/mobile/lib/main.dart b/app/mobile/lib/main.dart index 7b689016..74e0f7ba 100644 --- a/app/mobile/lib/main.dart +++ b/app/mobile/lib/main.dart @@ -1,3 +1,7 @@ +import 'package:app_mobile/app.dart'; +import 'package:app_mobile/config/remote_config.dart'; +import 'package:app_mobile/initializer/app_initializer.dart'; +import 'package:app_mobile/ui/toast.dart'; import 'package:core_analytics_firebase/analytics_firebase.dart'; import 'package:core_authenticator/authenticator.dart'; import 'package:core_database_isar/isar.dart'; @@ -7,10 +11,6 @@ import 'package:core_ui/toast.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -import 'package:app_mobile/app.dart'; -import 'package:app_mobile/config/remote_config.dart'; -import 'package:app_mobile/initializer/app_initializer.dart'; -import 'package:app_mobile/ui/toast.dart'; void main() async { WidgetsFlutterBinding.ensureInitialized(); diff --git a/app/mobile/lib/router/app_page_path.dart b/app/mobile/lib/router/app_page_path.dart index edecdd60..f76433dc 100644 --- a/app/mobile/lib/router/app_page_path.dart +++ b/app/mobile/lib/router/app_page_path.dart @@ -1,4 +1,4 @@ -/// アプリ内で使用するページのパス +/// アプリ内で使用する画面のパス final class AppPagePath { static const auth = '/auth'; static const onboarding = '/onboarding'; diff --git a/app/mobile/lib/router/app_router.dart b/app/mobile/lib/router/app_router.dart index 750c2e12..251a204f 100644 --- a/app/mobile/lib/router/app_router.dart +++ b/app/mobile/lib/router/app_router.dart @@ -1,13 +1,11 @@ import 'dart:async'; -import 'package:app_mobile/initializer/app_config_initializer.dart'; import 'package:app_mobile/router/app_navigation_bar.dart'; import 'package:app_mobile/router/app_navigation_key.dart'; import 'package:app_mobile/router/app_page_path.dart'; import 'package:core_authenticator/authenticator.dart'; import 'package:core_domain/legal.dart'; import 'package:core_model/auth.dart'; -import 'package:core_model/config.dart'; import 'package:core_model/feed.dart'; import 'package:core_model/quest.dart'; import 'package:feature_auth/feature_auth.dart'; @@ -20,9 +18,7 @@ import 'package:feature_settings/feature_settings.dart'; import 'package:flutter/foundation.dart'; import 'package:flutter/material.dart'; import 'package:go_router/go_router.dart'; -import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:riverpod_annotation/riverpod_annotation.dart'; -import 'package:url_launcher/url_launcher.dart'; part 'app_router.g.dart'; part 'package:app_mobile/router/routes/app_shell_route.dart'; diff --git a/app/mobile/lib/router/routes/auth_route.dart b/app/mobile/lib/router/routes/auth_route.dart index 0199a003..ac522c65 100644 --- a/app/mobile/lib/router/routes/auth_route.dart +++ b/app/mobile/lib/router/routes/auth_route.dart @@ -8,7 +8,7 @@ final class AuthRoute extends GoRouteData { const AuthRoute(); @override - Widget build(BuildContext context, GoRouterState state) => AuthPage( + Widget build(BuildContext context, GoRouterState state) => AuthScreen( onLoginSuccess: () => const HomeRoute().go(context), ); } diff --git a/app/mobile/lib/router/routes/feed_route.dart b/app/mobile/lib/router/routes/feed_route.dart index 1c1e071e..e8c37f0a 100644 --- a/app/mobile/lib/router/routes/feed_route.dart +++ b/app/mobile/lib/router/routes/feed_route.dart @@ -1,33 +1,20 @@ part of 'package:app_mobile/router/app_router.dart'; -/// お知らせ一覧ページ +/// お知らせ一覧画面 final class FeedListRoute extends GoRouteData { const FeedListRoute(); static final $parentNavigatorKey = rootNavigatorKey; @override - Widget build(BuildContext context, GoRouterState state) => FeedListPage( + Widget build(BuildContext context, GoRouterState state) => FeedListScreen( onTapFeedListItem: (feed) { FeedDetailRoute(feedId: feed.id).go(context); }, - onTapNewsFeedCardItem: (newsFeed) async { - final appConfig = await initializeAppConfig(); - - final websiteUrl = ProviderContainer( - overrides: [ - appConfigProvider.overrideWithValue(appConfig), - ], - ).read(appConfigProvider.select((config) => config.websiteUrl)); - - final uri = Uri.parse('$websiteUrl/news/${newsFeed.slug}'); - await launchUrl(uri, mode: LaunchMode.inAppWebView); - }, - onTapMoreNewsFeed: () {}, ); } -/// お知らせ詳細ページ +/// お知らせ詳細画面 final class FeedDetailRoute extends GoRouteData { const FeedDetailRoute({ required this.feedId, @@ -39,8 +26,8 @@ final class FeedDetailRoute extends GoRouteData { @override Widget build(BuildContext context, GoRouterState state) { - return FeedDetailPage( - feedId: feedId, + return FeedDetailScreen( + id: feedId, ); } } diff --git a/app/mobile/lib/router/routes/home_route.dart b/app/mobile/lib/router/routes/home_route.dart index b9a14a98..03bf5dea 100644 --- a/app/mobile/lib/router/routes/home_route.dart +++ b/app/mobile/lib/router/routes/home_route.dart @@ -1,11 +1,11 @@ part of 'package:app_mobile/router/app_router.dart'; -/// ホームページへのルート +/// ホーム画面へのルート final class HomeRoute extends GoRouteData { const HomeRoute(); @override - Widget build(BuildContext context, GoRouterState state) => HomePage( + Widget build(BuildContext context, GoRouterState state) => HomeScreen( onTapNotification: () { const FeedListRoute().go(context); }, diff --git a/app/mobile/lib/router/routes/quest_route.dart b/app/mobile/lib/router/routes/quest_route.dart index 7f6b4129..b3f26351 100644 --- a/app/mobile/lib/router/routes/quest_route.dart +++ b/app/mobile/lib/router/routes/quest_route.dart @@ -5,7 +5,7 @@ final class QuestListRoute extends GoRouteData { const QuestListRoute(); @override - Widget build(BuildContext context, GoRouterState state) => QuestListPage( + Widget build(BuildContext context, GoRouterState state) => QuestListScreen( onTapQuestListItem: (quest) { QuestDetailRoute(questId: quest.id).go(context); }, @@ -23,8 +23,8 @@ final class QuestDetailRoute extends GoRouteData { @override Widget build(BuildContext context, GoRouterState state) { - return QuestDetailPage( - questId: questId, + return QuestDetailScreen( + id: questId, ); } } @@ -35,7 +35,7 @@ final class QuestAddRoute extends GoRouteData { @override Widget build(BuildContext context, GoRouterState state) { - return QuestAddPage( + return QuestAddScreen( onAddQuestCompleted: () => context.pop(), ); } diff --git a/app/mobile/lib/router/routes/settings_route.dart b/app/mobile/lib/router/routes/settings_route.dart index f5583ab1..e80b246e 100644 --- a/app/mobile/lib/router/routes/settings_route.dart +++ b/app/mobile/lib/router/routes/settings_route.dart @@ -1,11 +1,11 @@ part of 'package:app_mobile/router/app_router.dart'; -/// 設定ページへのルート +/// 設定画面へのルート final class SettingsRoute extends GoRouteData { const SettingsRoute(); @override - Widget build(BuildContext context, GoRouterState state) => SettingsPage( + Widget build(BuildContext context, GoRouterState state) => SettingsScreen( onTapThemeSetting: () => const ThemeSettingDialogRoute().go(context), onTapOpenSourceLicense: () => const LicenseRoute().go(context), onSignOutSuccess: () => const AuthRoute().go(context), @@ -21,14 +21,14 @@ final class ThemeSettingDialogRoute extends GoRouteData { @override DialogPage buildPage(BuildContext context, GoRouterState state) => DialogPage( - builder: (context) => ThemeSettingDialogPage( + builder: (context) => ThemeSettingDialogScreen( onTapPositive: () => context.pop(), onTapNegative: () => context.pop(), ), ); } -/// ライセンスページへのルート +/// ライセンス画面へのルート final class LicenseRoute extends GoRouteData { const LicenseRoute(); diff --git a/core/network/lib/src/news/news_remote_data_source.g.dart b/core/network/lib/src/news/news_remote_data_source.g.dart index 2dafaf92..f3c8fab6 100644 --- a/core/network/lib/src/news/news_remote_data_source.g.dart +++ b/core/network/lib/src/news/news_remote_data_source.g.dart @@ -6,7 +6,7 @@ part of 'news_remote_data_source.dart'; // RetrofitGenerator // ************************************************************************** -// ignore_for_file: unnecessary_brace_in_string_interps,no_leading_underscores_for_local_identifiers,unused_element +// ignore_for_file: unnecessary_brace_in_string_interps,no_leading_underscores_for_local_identifiers,unused_element,unnecessary_string_interpolations class _NewsRemoteDataSource implements NewsRemoteDataSource { _NewsRemoteDataSource( diff --git a/core/network/lib/src/quest/main_quest_remote_data_source.g.dart b/core/network/lib/src/quest/main_quest_remote_data_source.g.dart index 1af63b50..7f93ce0e 100644 --- a/core/network/lib/src/quest/main_quest_remote_data_source.g.dart +++ b/core/network/lib/src/quest/main_quest_remote_data_source.g.dart @@ -6,7 +6,7 @@ part of 'main_quest_remote_data_source.dart'; // RetrofitGenerator // ************************************************************************** -// ignore_for_file: unnecessary_brace_in_string_interps,no_leading_underscores_for_local_identifiers,unused_element +// ignore_for_file: unnecessary_brace_in_string_interps,no_leading_underscores_for_local_identifiers,unused_element,unnecessary_string_interpolations class _QuestRemoteDataSource implements QuestRemoteDataSource { _QuestRemoteDataSource( diff --git a/feature/auth/lib/feature_auth.dart b/feature/auth/lib/feature_auth.dart index 591ced17..a7b245af 100644 --- a/feature/auth/lib/feature_auth.dart +++ b/feature/auth/lib/feature_auth.dart @@ -1,5 +1,5 @@ import 'package:feature_auth/src/gen/l10n/l10n.dart'; -export 'src/ui/page/auth/auth_page.dart'; +export 'src/ui/screen/auth/auth_screen.dart'; typedef FeatureAuthL10n = L10n; diff --git a/feature/auth/lib/src/ui/page/auth/auth_page.dart b/feature/auth/lib/src/ui/screen/auth/auth_screen.dart similarity index 86% rename from feature/auth/lib/src/ui/page/auth/auth_page.dart rename to feature/auth/lib/src/ui/screen/auth/auth_screen.dart index 3a3b01cb..085ed481 100644 --- a/feature/auth/lib/src/ui/page/auth/auth_page.dart +++ b/feature/auth/lib/src/ui/screen/auth/auth_screen.dart @@ -1,12 +1,12 @@ import 'dart:ui'; -import 'package:feature_auth/src/ui/page/auth/components/sign_in_form.dart'; -import 'package:feature_auth/src/ui/page/auth/components/video_background_view.dart'; +import 'package:feature_auth/src/ui/screen/auth/components/sign_in_form.dart'; +import 'package:feature_auth/src/ui/screen/auth/components/video_background_view.dart'; import 'package:flutter/material.dart'; -/// 認証ページ -final class AuthPage extends StatelessWidget { - const AuthPage({ +/// 認証画面 +final class AuthScreen extends StatelessWidget { + const AuthScreen({ required VoidCallback onLoginSuccess, super.key, }) : _onLoginSuccess = onLoginSuccess; diff --git a/feature/auth/lib/src/ui/page/auth/components/sign_in_form.dart b/feature/auth/lib/src/ui/screen/auth/components/sign_in_form.dart similarity index 100% rename from feature/auth/lib/src/ui/page/auth/components/sign_in_form.dart rename to feature/auth/lib/src/ui/screen/auth/components/sign_in_form.dart diff --git a/feature/auth/lib/src/ui/page/auth/components/video_background_view.dart b/feature/auth/lib/src/ui/screen/auth/components/video_background_view.dart similarity index 100% rename from feature/auth/lib/src/ui/page/auth/components/video_background_view.dart rename to feature/auth/lib/src/ui/screen/auth/components/video_background_view.dart diff --git a/feature/feed/lib/feature_feed.dart b/feature/feed/lib/feature_feed.dart index 34f150e6..fd4ffe17 100644 --- a/feature/feed/lib/feature_feed.dart +++ b/feature/feed/lib/feature_feed.dart @@ -1,6 +1,6 @@ import 'package:feature_feed/src/gen/l10n/l10n.dart'; -export 'src/ui/page/detail/feed_detail_page.dart'; -export 'src/ui/page/list/feed_list_page.dart'; +export 'src/ui/screen/detail/feed_detail_screen.dart'; +export 'src/ui/screen/list/feed_list_screen.dart'; typedef FeatureFeedL10n = L10n; diff --git a/feature/feed/lib/src/ui/page/list/feed_list_page.dart b/feature/feed/lib/src/ui/page/list/feed_list_page.dart deleted file mode 100644 index a780883f..00000000 --- a/feature/feed/lib/src/ui/page/list/feed_list_page.dart +++ /dev/null @@ -1,46 +0,0 @@ -import 'package:core_designsystem/component.dart'; -import 'package:core_model/feed.dart'; -import 'package:feature_feed/src/gen/l10n/l10n.dart'; -import 'package:feature_feed/src/ui/page/list/component/feed_list.dart'; -import 'package:feature_feed/src/ui/page/list/component/news_feed_card_section.dart'; -import 'package:flutter/material.dart'; - -/// お知らせ一覧ページ -final class FeedListPage extends StatelessWidget { - const FeedListPage({ - required void Function(Feed) onTapFeedListItem, - required void Function(NewsFeed) onTapNewsFeedCardItem, - required void Function() onTapMoreNewsFeed, - super.key, - }) : _onTapFeedListItem = onTapFeedListItem, - _onTapNewsFeedCardItem = onTapNewsFeedCardItem, - _onTapMoreNewsFeed = onTapMoreNewsFeed; - - final void Function(Feed feed) _onTapFeedListItem; - final void Function(NewsFeed newsFeed) _onTapNewsFeedCardItem; - final void Function() _onTapMoreNewsFeed; - - @override - Widget build(BuildContext context) { - final l10n = L10n.of(context); - - return TobeScaffold( - appBar: TobeAppBar( - title: Text(l10n.feedListAppBarTitle), - ), - body: SingleChildScrollView( - child: Column( - children: [ - NewsFeedCardSection( - onTapNewsFeedCardItem: _onTapNewsFeedCardItem, - onTapMoreNewsFeed: _onTapMoreNewsFeed, - ), - FeedList( - onTapFeedListItem: _onTapFeedListItem, - ), - ], - ), - ), - ); - } -} diff --git a/feature/feed/lib/src/ui/page/detail/component/feed_content.dart b/feature/feed/lib/src/ui/screen/detail/component/feed_content.dart similarity index 100% rename from feature/feed/lib/src/ui/page/detail/component/feed_content.dart rename to feature/feed/lib/src/ui/screen/detail/component/feed_content.dart diff --git a/feature/feed/lib/src/ui/page/detail/feed_detail_page.dart b/feature/feed/lib/src/ui/screen/detail/feed_detail_screen.dart similarity index 60% rename from feature/feed/lib/src/ui/page/detail/feed_detail_page.dart rename to feature/feed/lib/src/ui/screen/detail/feed_detail_screen.dart index 36ddcdbc..2c9c50a8 100644 --- a/feature/feed/lib/src/ui/page/detail/feed_detail_page.dart +++ b/feature/feed/lib/src/ui/screen/detail/feed_detail_screen.dart @@ -1,17 +1,17 @@ import 'package:core_designsystem/component.dart'; import 'package:core_model/feed.dart'; import 'package:feature_feed/src/gen/l10n/l10n.dart'; -import 'package:feature_feed/src/ui/page/detail/component/feed_content.dart'; +import 'package:feature_feed/src/ui/screen/detail/component/feed_content.dart'; import 'package:flutter/material.dart'; -/// お知らせ詳細ページ -final class FeedDetailPage extends StatelessWidget { - const FeedDetailPage({ - required FeedId feedId, +/// フィード詳細画面 +final class FeedDetailScreen extends StatelessWidget { + const FeedDetailScreen({ + required FeedId id, super.key, - }) : _feedId = feedId; + }) : _id = id; - final FeedId _feedId; + final FeedId _id; @override Widget build(BuildContext context) { @@ -22,7 +22,7 @@ final class FeedDetailPage extends StatelessWidget { title: Text(l10n.feedDetailAppBarTitle), ), body: FeedContent( - feedId: _feedId, + feedId: _id, ), ); } diff --git a/feature/feed/lib/src/ui/page/list/component/feed_list.dart b/feature/feed/lib/src/ui/screen/list/component/feed_list.dart similarity index 100% rename from feature/feed/lib/src/ui/page/list/component/feed_list.dart rename to feature/feed/lib/src/ui/screen/list/component/feed_list.dart diff --git a/feature/feed/lib/src/ui/page/list/component/news_feed_card_section.dart b/feature/feed/lib/src/ui/screen/list/component/news_feed_card_section.dart similarity index 100% rename from feature/feed/lib/src/ui/page/list/component/news_feed_card_section.dart rename to feature/feed/lib/src/ui/screen/list/component/news_feed_card_section.dart diff --git a/feature/feed/lib/src/ui/screen/list/feed_list_screen.dart b/feature/feed/lib/src/ui/screen/list/feed_list_screen.dart new file mode 100644 index 00000000..54dbbc33 --- /dev/null +++ b/feature/feed/lib/src/ui/screen/list/feed_list_screen.dart @@ -0,0 +1,35 @@ +import 'package:core_designsystem/component.dart'; +import 'package:core_model/feed.dart'; +import 'package:feature_feed/src/gen/l10n/l10n.dart'; +import 'package:feature_feed/src/ui/screen/list/component/feed_list.dart'; +import 'package:flutter/material.dart'; + +/// フィード一覧画面 +final class FeedListScreen extends StatelessWidget { + const FeedListScreen({ + required void Function(Feed) onTapFeedListItem, + super.key, + }) : _onTapFeedListItem = onTapFeedListItem; + + final void Function(Feed feed) _onTapFeedListItem; + + @override + Widget build(BuildContext context) { + final l10n = L10n.of(context); + + return TobeScaffold( + appBar: TobeAppBar( + title: Text(l10n.feedListAppBarTitle), + ), + body: SingleChildScrollView( + child: Column( + children: [ + FeedList( + onTapFeedListItem: _onTapFeedListItem, + ), + ], + ), + ), + ); + } +} diff --git a/feature/home/lib/feature_home.dart b/feature/home/lib/feature_home.dart index 3efcbe22..db90f920 100644 --- a/feature/home/lib/feature_home.dart +++ b/feature/home/lib/feature_home.dart @@ -1,6 +1,6 @@ import 'package:feature_home/src/gen/l10n/l10n.dart'; -export 'src/ui/page/home/home_page.dart'; -export 'src/ui/page/home/quick_add_quest_dialog.dart'; +export 'src/ui/screen/home/home_screen.dart'; +export 'src/ui/screen/home/quick_add_quest_dialog.dart'; typedef FeatureHomeL10n = L10n; diff --git a/feature/home/lib/src/ui/page/home/component/quest_overview_section.dart b/feature/home/lib/src/ui/screen/home/component/quest_overview_section.dart similarity index 100% rename from feature/home/lib/src/ui/page/home/component/quest_overview_section.dart rename to feature/home/lib/src/ui/screen/home/component/quest_overview_section.dart diff --git a/feature/home/lib/src/ui/page/home/component/recent_quest_list_section.dart b/feature/home/lib/src/ui/screen/home/component/recent_quest_list_section.dart similarity index 100% rename from feature/home/lib/src/ui/page/home/component/recent_quest_list_section.dart rename to feature/home/lib/src/ui/screen/home/component/recent_quest_list_section.dart diff --git a/feature/home/lib/src/ui/page/home/home_page.dart b/feature/home/lib/src/ui/screen/home/home_screen.dart similarity index 53% rename from feature/home/lib/src/ui/page/home/home_page.dart rename to feature/home/lib/src/ui/screen/home/home_screen.dart index 8926a6e7..fdf9d207 100644 --- a/feature/home/lib/src/ui/page/home/home_page.dart +++ b/feature/home/lib/src/ui/screen/home/home_screen.dart @@ -2,14 +2,14 @@ import 'package:core_designsystem/component.dart'; import 'package:core_domain/sync_use_case.dart'; import 'package:core_model/quest.dart'; import 'package:feature_home/src/gen/l10n/l10n.dart'; -import 'package:feature_home/src/ui/page/home/component/quest_overview_section.dart'; -import 'package:feature_home/src/ui/page/home/component/recent_quest_list_section.dart'; +import 'package:feature_home/src/ui/screen/home/component/quest_overview_section.dart'; +import 'package:feature_home/src/ui/screen/home/component/recent_quest_list_section.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -/// ホームページ -final class HomePage extends ConsumerWidget { - const HomePage({ +/// ホーム画面 +final class HomeScreen extends ConsumerWidget { + const HomeScreen({ required VoidCallback onTapNotification, required VoidCallback onQuickAddButtonPressed, required void Function(Quest quest) onTapQuestListItem, @@ -39,34 +39,28 @@ final class HomePage extends ConsumerWidget { ), ], ), - body: SafeArea( - child: RefreshIndicator( - onRefresh: () async { - ref.read(syncUseCaseProvider); - }, - child: SingleChildScrollView( - physics: const AlwaysScrollableScrollPhysics(), - padding: const EdgeInsets.all(16), - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - ...[ - QuestOverviewSection( - onQuickAddButtonPressed: _onQuickAddButtonPressed, - ), - RecentQuestListSection( - onTapQuestListItem: _onTapQuestListItem, - onMoreButtonPressed: _onMoreButtonPressed, - ), - ].expand( - (widget) => [ - widget, - const Gap(24), - ], - ), + body: RefreshIndicator( + onRefresh: () async { + ref.read(syncUseCaseProvider); + }, + child: ListView( + primary: true, + children: [ + ...[ + QuestOverviewSection( + onQuickAddButtonPressed: _onQuickAddButtonPressed, + ), + RecentQuestListSection( + onTapQuestListItem: _onTapQuestListItem, + onMoreButtonPressed: _onMoreButtonPressed, + ), + ].expand( + (widget) => [ + widget, + const SizedBox(height: 16), ], ), - ), + ], ), ), ); diff --git a/feature/home/lib/src/ui/page/home/quick_add_quest_dialog.dart b/feature/home/lib/src/ui/screen/home/quick_add_quest_dialog.dart similarity index 98% rename from feature/home/lib/src/ui/page/home/quick_add_quest_dialog.dart rename to feature/home/lib/src/ui/screen/home/quick_add_quest_dialog.dart index d8cd314a..83b3f26f 100644 --- a/feature/home/lib/src/ui/page/home/quick_add_quest_dialog.dart +++ b/feature/home/lib/src/ui/screen/home/quick_add_quest_dialog.dart @@ -5,6 +5,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; +/// クエストクイック追加ダイアログ final class QuickAddQuestDialog extends HookConsumerWidget { const QuickAddQuestDialog({ required VoidCallback onClose, diff --git a/feature/onboarding/lib/feature_onboarding.dart b/feature/onboarding/lib/feature_onboarding.dart index b338d4d0..a63d5774 100644 --- a/feature/onboarding/lib/feature_onboarding.dart +++ b/feature/onboarding/lib/feature_onboarding.dart @@ -1,5 +1,7 @@ import 'package:feature_onboarding/src/gen/l10n/l10n.dart'; export 'src/ui/screen/onboarding/onboarding_screen.dart'; +export 'src/ui/screen/onboarding/screen/agreement_screen.dart'; +export 'src/ui/screen/onboarding/screen/welcome_screen.dart'; typedef FeatureOnboardingL10n = L10n; diff --git a/feature/onboarding/lib/src/ui/screen/onboarding/onboarding_screen.dart b/feature/onboarding/lib/src/ui/screen/onboarding/onboarding_screen.dart index 0c6c166a..456fcbdd 100644 --- a/feature/onboarding/lib/src/ui/screen/onboarding/onboarding_screen.dart +++ b/feature/onboarding/lib/src/ui/screen/onboarding/onboarding_screen.dart @@ -2,8 +2,8 @@ import 'package:core_common/extension.dart'; import 'package:core_designsystem/component.dart'; import 'package:core_designsystem/space.dart'; import 'package:feature_onboarding/src/ui/screen/onboarding/component/page_indicator.dart'; -import 'package:feature_onboarding/src/ui/screen/onboarding/page/agreement_page.dart'; -import 'package:feature_onboarding/src/ui/screen/onboarding/page/welcome_page.dart'; +import 'package:feature_onboarding/src/ui/screen/onboarding/screen/agreement_screen.dart'; +import 'package:feature_onboarding/src/ui/screen/onboarding/screen/welcome_screen.dart'; import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; @@ -22,8 +22,8 @@ final class OnboardingScreen extends HookWidget { @override Widget build(BuildContext context) { final pages = [ - const WelcomePage(), - AgreementPage( + const WelcomeScreen(), + AgreementScreen( onAgreeAndContinue: _onAgreeAndContinue, ), ]; diff --git a/feature/onboarding/lib/src/ui/screen/onboarding/page/agreement_page.dart b/feature/onboarding/lib/src/ui/screen/onboarding/screen/agreement_screen.dart similarity index 95% rename from feature/onboarding/lib/src/ui/screen/onboarding/page/agreement_page.dart rename to feature/onboarding/lib/src/ui/screen/onboarding/screen/agreement_screen.dart index c0c82cb2..0dfa4f31 100644 --- a/feature/onboarding/lib/src/ui/screen/onboarding/page/agreement_page.dart +++ b/feature/onboarding/lib/src/ui/screen/onboarding/screen/agreement_screen.dart @@ -9,9 +9,9 @@ import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:lottie/lottie.dart'; -/// 同意して始めるページ -final class AgreementPage extends ConsumerWidget { - const AgreementPage({ +/// 同意して始める画面 +final class AgreementScreen extends ConsumerWidget { + const AgreementScreen({ required VoidCallback onAgreeAndContinue, super.key, }) : _onAgreeAndContinue = onAgreeAndContinue; diff --git a/feature/onboarding/lib/src/ui/screen/onboarding/page/welcome_page.dart b/feature/onboarding/lib/src/ui/screen/onboarding/screen/welcome_screen.dart similarity index 92% rename from feature/onboarding/lib/src/ui/screen/onboarding/page/welcome_page.dart rename to feature/onboarding/lib/src/ui/screen/onboarding/screen/welcome_screen.dart index 74c69c1e..581e8017 100644 --- a/feature/onboarding/lib/src/ui/screen/onboarding/page/welcome_page.dart +++ b/feature/onboarding/lib/src/ui/screen/onboarding/screen/welcome_screen.dart @@ -5,9 +5,9 @@ import 'package:feature_onboarding/src/gen/l10n/l10n.dart'; import 'package:flutter/material.dart'; import 'package:lottie/lottie.dart'; -/// ウェルカムページ -final class WelcomePage extends StatelessWidget { - const WelcomePage({super.key}); +/// ウェルカム画面 +final class WelcomeScreen extends StatelessWidget { + const WelcomeScreen({super.key}); @override Widget build(BuildContext context) { diff --git a/feature/quest/lib/feature_quest.dart b/feature/quest/lib/feature_quest.dart index a3665761..8167ef4e 100644 --- a/feature/quest/lib/feature_quest.dart +++ b/feature/quest/lib/feature_quest.dart @@ -1,7 +1,7 @@ import 'package:feature_quest/src/gen/l10n/l10n.dart'; -export 'src/ui/page/add/quest_add_page.dart'; -export 'src/ui/page/detail/quest_detail_page.dart'; -export 'src/ui/page/list/quest_list_page.dart'; +export 'src/ui/screen/add/quest_add_screen.dart'; +export 'src/ui/screen/detail/quest_detail_screen.dart'; +export 'src/ui/screen/list/quest_list_screen.dart'; typedef FeatureQuestL10n = L10n; diff --git a/feature/quest/lib/src/ui/page/add/quest_add_page.dart b/feature/quest/lib/src/ui/screen/add/quest_add_screen.dart similarity index 93% rename from feature/quest/lib/src/ui/page/add/quest_add_page.dart rename to feature/quest/lib/src/ui/screen/add/quest_add_screen.dart index 086f5158..1bb017ee 100644 --- a/feature/quest/lib/src/ui/page/add/quest_add_page.dart +++ b/feature/quest/lib/src/ui/screen/add/quest_add_screen.dart @@ -7,9 +7,10 @@ import 'package:flutter/material.dart'; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -final class QuestAddPage extends HookConsumerWidget { - const QuestAddPage({ - required void Function() onAddQuestCompleted, +/// クエスト追加画面 +final class QuestAddScreen extends HookConsumerWidget { + const QuestAddScreen({ + required VoidCallback onAddQuestCompleted, super.key, }) : _onAddQuestCompleted = onAddQuestCompleted; diff --git a/feature/quest/lib/src/ui/page/detail/component/quest_content.dart b/feature/quest/lib/src/ui/screen/detail/component/quest_content.dart similarity index 100% rename from feature/quest/lib/src/ui/page/detail/component/quest_content.dart rename to feature/quest/lib/src/ui/screen/detail/component/quest_content.dart diff --git a/feature/quest/lib/src/ui/page/detail/quest_detail_page.dart b/feature/quest/lib/src/ui/screen/detail/quest_detail_screen.dart similarity index 54% rename from feature/quest/lib/src/ui/page/detail/quest_detail_page.dart rename to feature/quest/lib/src/ui/screen/detail/quest_detail_screen.dart index f3aac75e..2b5eed5b 100644 --- a/feature/quest/lib/src/ui/page/detail/quest_detail_page.dart +++ b/feature/quest/lib/src/ui/screen/detail/quest_detail_screen.dart @@ -1,16 +1,17 @@ import 'package:core_designsystem/component.dart'; +import 'package:core_model/quest.dart'; import 'package:feature_quest/src/gen/l10n/l10n.dart'; -import 'package:feature_quest/src/ui/page/detail/component/quest_content.dart'; +import 'package:feature_quest/src/ui/screen/detail/component/quest_content.dart'; import 'package:flutter/material.dart'; -/// クエスト詳細ページ -final class QuestDetailPage extends StatelessWidget { - const QuestDetailPage({ - required String questId, +/// クエスト詳細画面 +final class QuestDetailScreen extends StatelessWidget { + const QuestDetailScreen({ + required QuestId id, super.key, - }) : _questId = questId; + }) : _id = id; - final String _questId; + final QuestId _id; @override Widget build(BuildContext context) { @@ -21,7 +22,7 @@ final class QuestDetailPage extends StatelessWidget { title: Text(l10n.questDetailAppBarTitle), ), body: SafeArea( - child: QuestContent(questId: _questId), + child: QuestContent(questId: _id), ), ); } diff --git a/feature/quest/lib/src/ui/page/list/component/quest_list.dart b/feature/quest/lib/src/ui/screen/list/component/quest_list.dart similarity index 100% rename from feature/quest/lib/src/ui/page/list/component/quest_list.dart rename to feature/quest/lib/src/ui/screen/list/component/quest_list.dart diff --git a/feature/quest/lib/src/ui/page/list/quest_list_page.dart b/feature/quest/lib/src/ui/screen/list/quest_list_screen.dart similarity index 79% rename from feature/quest/lib/src/ui/page/list/quest_list_page.dart rename to feature/quest/lib/src/ui/screen/list/quest_list_screen.dart index 268d21a3..f5348f78 100644 --- a/feature/quest/lib/src/ui/page/list/quest_list_page.dart +++ b/feature/quest/lib/src/ui/screen/list/quest_list_screen.dart @@ -1,12 +1,12 @@ import 'package:core_designsystem/component.dart'; import 'package:core_model/quest.dart'; import 'package:feature_quest/src/gen/l10n/l10n.dart'; -import 'package:feature_quest/src/ui/page/list/component/quest_list.dart'; +import 'package:feature_quest/src/ui/screen/list/component/quest_list.dart'; import 'package:flutter/material.dart'; -/// クエスト一覧ページ -final class QuestListPage extends StatelessWidget { - const QuestListPage({ +/// クエスト一覧画面 +final class QuestListScreen extends StatelessWidget { + const QuestListScreen({ required void Function(Quest) onTapQuestListItem, required void Function() onTapQuestAddButton, super.key, @@ -32,7 +32,6 @@ final class QuestListPage extends StatelessWidget { label: Text(l10n.questListAddQuest), icon: const Icon(Icons.add), ), - floatingActionButtonLocation: FloatingActionButtonLocation.centerFloat, ); } } diff --git a/feature/settings/lib/feature_settings.dart b/feature/settings/lib/feature_settings.dart index 10803a1d..6d497b99 100644 --- a/feature/settings/lib/feature_settings.dart +++ b/feature/settings/lib/feature_settings.dart @@ -1,6 +1,6 @@ import 'package:feature_settings/src/gen/l10n/l10n.dart'; -export 'src/ui/page/settings/settings_page.dart'; -export 'src/ui/page/settings/theme_setting_dialog_page.dart'; +export 'src/ui/screen/settings/settings_screen.dart'; +export 'src/ui/screen/settings/theme_setting_dialog_screen.dart'; typedef FeatureSettingsL10n = L10n; diff --git a/feature/settings/lib/src/ui/page/settings/component/app_config_tile_content.dart b/feature/settings/lib/src/ui/screen/settings/component/app_config_tile_content.dart similarity index 100% rename from feature/settings/lib/src/ui/page/settings/component/app_config_tile_content.dart rename to feature/settings/lib/src/ui/screen/settings/component/app_config_tile_content.dart diff --git a/feature/settings/lib/src/ui/page/settings/component/index.dart b/feature/settings/lib/src/ui/screen/settings/component/index.dart similarity index 100% rename from feature/settings/lib/src/ui/page/settings/component/index.dart rename to feature/settings/lib/src/ui/screen/settings/component/index.dart diff --git a/feature/settings/lib/src/ui/page/settings/component/theme_list_tile.dart b/feature/settings/lib/src/ui/screen/settings/component/theme_list_tile.dart similarity index 100% rename from feature/settings/lib/src/ui/page/settings/component/theme_list_tile.dart rename to feature/settings/lib/src/ui/screen/settings/component/theme_list_tile.dart diff --git a/feature/settings/lib/src/ui/page/settings/settings_page.dart b/feature/settings/lib/src/ui/screen/settings/settings_screen.dart similarity index 88% rename from feature/settings/lib/src/ui/page/settings/settings_page.dart rename to feature/settings/lib/src/ui/screen/settings/settings_screen.dart index cbe61596..f1b53b32 100644 --- a/feature/settings/lib/src/ui/page/settings/settings_page.dart +++ b/feature/settings/lib/src/ui/screen/settings/settings_screen.dart @@ -1,14 +1,14 @@ import 'package:core_designsystem/component.dart'; import 'package:core_domain/auth_use_case.dart'; import 'package:feature_settings/src/gen/l10n/l10n.dart'; -import 'package:feature_settings/src/ui/page/settings/component/index.dart'; -import 'package:feature_settings/src/ui/page/settings/component/theme_list_tile.dart'; +import 'package:feature_settings/src/ui/screen/settings/component/index.dart'; +import 'package:feature_settings/src/ui/screen/settings/component/theme_list_tile.dart'; import 'package:flutter/material.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -/// 設定ページ -final class SettingsPage extends ConsumerWidget { - const SettingsPage({ +/// 設定画面 +final class SettingsScreen extends ConsumerWidget { + const SettingsScreen({ required VoidCallback onTapThemeSetting, required VoidCallback onTapOpenSourceLicense, required VoidCallback onSignOutSuccess, diff --git a/feature/settings/lib/src/ui/page/settings/theme_setting_dialog_page.dart b/feature/settings/lib/src/ui/screen/settings/theme_setting_dialog_screen.dart similarity index 93% rename from feature/settings/lib/src/ui/page/settings/theme_setting_dialog_page.dart rename to feature/settings/lib/src/ui/screen/settings/theme_setting_dialog_screen.dart index 9918d13b..f25ff92e 100644 --- a/feature/settings/lib/src/ui/page/settings/theme_setting_dialog_page.dart +++ b/feature/settings/lib/src/ui/screen/settings/theme_setting_dialog_screen.dart @@ -5,9 +5,9 @@ import 'package:flutter/material.dart' hide Theme; import 'package:flutter_hooks/flutter_hooks.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart'; -/// テーマ設定ダイアログのページ -final class ThemeSettingDialogPage extends HookConsumerWidget { - const ThemeSettingDialogPage({ +/// テーマ設定ダイアログの画面 +final class ThemeSettingDialogScreen extends HookConsumerWidget { + const ThemeSettingDialogScreen({ required void Function() onTapPositive, required void Function() onTapNegative, super.key,