Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions lib/src/app/router/routes.dart
Original file line number Diff line number Diff line change
Expand Up @@ -270,10 +270,6 @@ class GroupCreateNameSheetRoute extends GoRouteData
Page<void> buildPage(BuildContext context, GoRouterState state) {
return PagedSheetPage<void>(
key: state.pageKey,
initialOffset: const SheetOffset(0.6),
snapGrid: const SheetSnapGrid(
snaps: <SheetOffset>[SheetOffset(0.6), SheetOffset(1)],
),
child: const GroupCreateNameSheetPage(),
);
}
Expand Down
30 changes: 30 additions & 0 deletions lib/src/app/widgets/m/m_checkbox.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import 'package:flutter/material.dart';
import 'package:memuno_app/src/app/widgets/m/m_colors.dart';

class MCheckbox extends StatelessWidget {
final bool isChecked;
final bool isEnabled;
final void Function(bool?)? onChanged;

const MCheckbox({
super.key,
this.isChecked = false,
this.isEnabled = true,
this.onChanged,
});

@override
Widget build(BuildContext context) {
return Checkbox(
onChanged: isEnabled ? onChanged : null,
value: isChecked,
fillColor: WidgetStateProperty.resolveWith((Set<WidgetState> states) {
if (states.contains(WidgetState.selected)) {
return MColors.yellow500;
}
return MColors.transparent;
}),
checkColor: Colors.white,
);
}
}
110 changes: 54 additions & 56 deletions lib/src/features/auth/presentation/pages/sign_up_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,13 @@ import 'package:memuno_app/src/app/router/app_router.dart';
import 'package:memuno_app/src/app/widgets/m/m_app_bar.dart';
import 'package:memuno_app/src/app/widgets/m/m_button.dart';
import 'package:memuno_app/src/app/widgets/m/m_center.dart';
import 'package:memuno_app/src/app/widgets/m/m_checkbox.dart';
import 'package:memuno_app/src/app/widgets/m/m_colors.dart';
import 'package:memuno_app/src/app/widgets/m/m_gap.dart';
import 'package:memuno_app/src/app/widgets/m/m_scaffold.dart';
import 'package:memuno_app/src/app/widgets/m/m_spacing.dart';
import 'package:memuno_app/src/app/widgets/m/m_tappable.dart';
import 'package:memuno_app/src/app/widgets/m/m_text.dart';
import 'package:memuno_app/src/app/widgets/m/m_text_field.dart';
import 'package:memuno_app/src/core/config/app_env.dart';
import 'package:memuno_app/src/core/config/legal_urls.dart';
Expand Down Expand Up @@ -85,11 +88,11 @@ class SignUpPage extends HookConsumerWidget {
required VoidCallback onPressed,
required bool isEnabled,
}) {
return InkWell(
onTap: isEnabled ? onPressed : null,
borderRadius: BorderRadius.circular(4.0),
child: Text(
text,
return MTappable(
onPressed: onPressed,
isEnabled: isEnabled,
child: MText.p(
text: text,
style: TextStyle(
color: isEnabled ? MColors.blue400 : MColors.gray500,
decoration: TextDecoration.underline,
Expand Down Expand Up @@ -198,67 +201,62 @@ class SignUpPage extends HookConsumerWidget {
),
const MGap.md(),
Container(
width: double.infinity,
padding: const EdgeInsets.all(MSpacing.sm),
decoration: BoxDecoration(
borderRadius: BorderRadius.circular(MSpacing.sm),
borderRadius: BorderRadius.circular(20.0),
border: Border.all(color: MColors.gray700),
color: MColors.gray800.withValues(alpha: 0.4),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Checkbox(
value: hasAcceptedLegal.value,
onChanged: isLoading
? null
: (bool? nextValue) {
hasAcceptedLegal.value = nextValue ?? false;
},
MCheckbox(
isChecked: hasAcceptedLegal.value,
isEnabled: !isLoading,
onChanged: (bool? nextValue) {
hasAcceptedLegal.value = nextValue ?? false;
},
),
Expanded(
child: Padding(
padding: const EdgeInsets.only(top: 12.0),
child: Wrap(
spacing: 4.0,
runSpacing: 4.0,
children: <Widget>[
Text(
l10n.signUpLegalConsentPrefix,
style: const TextStyle(color: MColors.gray100),
),
_legalLink(
text: l10n.signUpLegalTermsLink,
isEnabled: !isLoading,
onPressed: () {
_openLegalDocument(
context,
ref,
LegalDocument.termsOfUse,
);
},
),
Text(
l10n.signUpLegalConsentAnd,
style: const TextStyle(color: MColors.gray100),
),
_legalLink(
text: l10n.signUpLegalPrivacyLink,
isEnabled: !isLoading,
onPressed: () {
_openLegalDocument(
context,
ref,
LegalDocument.privacyPolicy,
);
},
),
Text(
'.',
style: const TextStyle(color: MColors.gray100),
),
],
),
child: Wrap(
spacing: 4.0,
runSpacing: 4.0,
children: <Widget>[
MText.p(
text: l10n.signUpLegalConsentPrefix,
style: const TextStyle(color: MColors.gray100),
),
_legalLink(
text: l10n.signUpLegalTermsLink,
isEnabled: !isLoading,
onPressed: () {
_openLegalDocument(
context,
ref,
LegalDocument.termsOfUse,
);
},
),
MText.p(
text: l10n.signUpLegalConsentAnd,
style: const TextStyle(color: MColors.gray100),
),
_legalLink(
text: l10n.signUpLegalPrivacyLink,
isEnabled: !isLoading,
onPressed: () {
_openLegalDocument(
context,
ref,
LegalDocument.privacyPolicy,
);
},
),
MText.p(
text: '.',
style: const TextStyle(color: MColors.gray100),
),
],
),
),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ class GroupCreateNameSheetPage extends HookConsumerWidget {
right: context.rightPadding + MSpacing.md,
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[
Align(
Expand Down Expand Up @@ -89,7 +90,7 @@ class GroupCreateNameSheetPage extends HookConsumerWidget {
maxLength: 64,
autofocus: true,
),
const Spacer(),
const MGap.lg(),
MButton.primary(
title: l10n.groupsCreateNameContinueButton,
isEnabled: draft.canProceedFromNameStep,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ class GroupCreateSheetShell extends ConsumerWidget {
bottom: MediaQuery.viewInsetsOf(context).bottom,
),
decoration: const MaterialSheetDecoration(
size: SheetSize.stretch,
size: SheetSize.fit,
color: MColors.gray900,
borderRadius: BorderRadius.vertical(top: Radius.circular(20.0)),
clipBehavior: Clip.antiAlias,
Expand Down
Binary file added meme_templates/images/100.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/101.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/102.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/103.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/104.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/105.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/106.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/107.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/108.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/109.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/110.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/111.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/112.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/113.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/114.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/150_kb/100.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/150_kb/101.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/150_kb/102.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/150_kb/103.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/150_kb/104.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/150_kb/105.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/150_kb/106.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/150_kb/107.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/150_kb/108.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/150_kb/109.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added meme_templates/images/150_kb/110.jpg
Binary file added meme_templates/images/150_kb/111.jpg
Binary file added meme_templates/images/150_kb/112.jpg
Binary file added meme_templates/images/150_kb/113.jpg
Binary file added meme_templates/images/150_kb/114.jpg
Binary file added meme_templates/images/150_kb/37.jpg
Binary file added meme_templates/images/150_kb/38.jpg
Binary file added meme_templates/images/150_kb/39.jpg
Binary file added meme_templates/images/150_kb/40.jpg
Binary file added meme_templates/images/150_kb/41.jpg
Binary file added meme_templates/images/150_kb/42.jpg
Binary file added meme_templates/images/150_kb/43.jpg
Binary file added meme_templates/images/150_kb/44.jpg
Binary file added meme_templates/images/150_kb/45.jpg
Binary file added meme_templates/images/150_kb/46.jpg
Binary file added meme_templates/images/150_kb/47.jpg
Binary file added meme_templates/images/150_kb/48.jpg
Binary file added meme_templates/images/150_kb/49.jpg
Binary file added meme_templates/images/150_kb/50.jpg
Binary file added meme_templates/images/150_kb/51.jpg
Binary file added meme_templates/images/150_kb/52.jpg
Binary file added meme_templates/images/150_kb/53.jpg
Binary file added meme_templates/images/150_kb/54.jpg
Binary file added meme_templates/images/150_kb/55.jpg
Binary file added meme_templates/images/150_kb/56.jpg
Binary file added meme_templates/images/150_kb/57.jpg
Binary file added meme_templates/images/150_kb/58.jpg
Binary file added meme_templates/images/150_kb/59.jpg
Binary file added meme_templates/images/150_kb/60.jpg
Binary file added meme_templates/images/150_kb/61.jpg
Binary file added meme_templates/images/150_kb/62.jpg
Binary file added meme_templates/images/150_kb/63.jpg
Binary file added meme_templates/images/150_kb/64.jpg
Binary file added meme_templates/images/150_kb/65.jpg
Binary file added meme_templates/images/150_kb/66.jpg
Binary file added meme_templates/images/150_kb/67.jpg
Binary file added meme_templates/images/150_kb/68.jpg
Binary file added meme_templates/images/150_kb/69.jpg
Binary file added meme_templates/images/150_kb/70.jpg
Binary file added meme_templates/images/150_kb/71.jpg
Binary file added meme_templates/images/150_kb/72.jpg
Binary file added meme_templates/images/150_kb/73.jpg
Binary file added meme_templates/images/150_kb/74.jpg
Binary file added meme_templates/images/150_kb/75.jpg
Binary file added meme_templates/images/150_kb/76.jpg
Binary file added meme_templates/images/150_kb/77.jpg
Binary file added meme_templates/images/150_kb/78.jpg
Binary file added meme_templates/images/150_kb/79.jpg
Binary file added meme_templates/images/150_kb/80.jpg
Binary file added meme_templates/images/150_kb/81.jpg
Binary file added meme_templates/images/150_kb/82.jpg
Binary file added meme_templates/images/150_kb/83.jpg
Binary file added meme_templates/images/150_kb/84.jpg
Binary file added meme_templates/images/150_kb/85.jpg
Binary file added meme_templates/images/150_kb/86.jpg
Binary file added meme_templates/images/150_kb/87.jpg
Binary file added meme_templates/images/150_kb/88.jpg
Binary file added meme_templates/images/150_kb/89.jpg
Binary file added meme_templates/images/150_kb/90.jpg
Binary file added meme_templates/images/150_kb/91.jpg
Binary file added meme_templates/images/150_kb/92.jpg
Binary file added meme_templates/images/150_kb/93.jpg
Binary file added meme_templates/images/150_kb/94.jpg
Binary file added meme_templates/images/150_kb/95.jpg
Binary file added meme_templates/images/150_kb/96.jpg
Binary file added meme_templates/images/150_kb/97.jpg
Binary file added meme_templates/images/150_kb/98.jpg
Binary file added meme_templates/images/150_kb/99.jpg
Binary file added meme_templates/images/20_kb/100.jpg
Binary file added meme_templates/images/20_kb/101.jpg
Binary file added meme_templates/images/20_kb/102.jpg
Binary file added meme_templates/images/20_kb/103.jpg
Binary file added meme_templates/images/20_kb/104.jpg
Binary file added meme_templates/images/20_kb/105.jpg
Binary file added meme_templates/images/20_kb/106.jpg
Binary file added meme_templates/images/20_kb/107.jpg
Binary file added meme_templates/images/20_kb/108.jpg
Binary file added meme_templates/images/20_kb/109.jpg
Binary file added meme_templates/images/20_kb/110.jpg
Binary file added meme_templates/images/20_kb/111.jpg
Binary file added meme_templates/images/20_kb/112.jpg
Binary file added meme_templates/images/20_kb/113.jpg
Binary file added meme_templates/images/20_kb/114.jpg
Binary file added meme_templates/images/20_kb/37.jpg
Binary file added meme_templates/images/20_kb/38.jpg
Binary file added meme_templates/images/20_kb/39.jpg
Binary file added meme_templates/images/20_kb/40.jpg
Binary file added meme_templates/images/20_kb/41.jpg
Binary file added meme_templates/images/20_kb/42.jpg
Binary file added meme_templates/images/20_kb/43.jpg
Binary file added meme_templates/images/20_kb/44.jpg
Binary file added meme_templates/images/20_kb/45.jpg
Binary file added meme_templates/images/20_kb/46.jpg
Binary file added meme_templates/images/20_kb/47.jpg
Binary file added meme_templates/images/20_kb/48.jpg
Binary file added meme_templates/images/20_kb/49.jpg
Binary file added meme_templates/images/20_kb/50.jpg
Binary file added meme_templates/images/20_kb/51.jpg
Binary file added meme_templates/images/20_kb/52.jpg
Binary file added meme_templates/images/20_kb/53.jpg
Binary file added meme_templates/images/20_kb/54.jpg
Binary file added meme_templates/images/20_kb/55.jpg
Binary file added meme_templates/images/20_kb/56.jpg
Binary file added meme_templates/images/20_kb/57.jpg
Binary file added meme_templates/images/20_kb/58.jpg
Binary file added meme_templates/images/20_kb/59.jpg
Binary file added meme_templates/images/20_kb/60.jpg
Binary file added meme_templates/images/20_kb/61.jpg
Binary file added meme_templates/images/20_kb/62.jpg
Binary file added meme_templates/images/20_kb/63.jpg
Binary file added meme_templates/images/20_kb/64.jpg
Binary file added meme_templates/images/20_kb/65.jpg
Binary file added meme_templates/images/20_kb/66.jpg
Binary file added meme_templates/images/20_kb/67.jpg
Binary file added meme_templates/images/20_kb/68.jpg
Binary file added meme_templates/images/20_kb/69.jpg
Binary file added meme_templates/images/20_kb/70.jpg
Binary file added meme_templates/images/20_kb/71.jpg
Binary file added meme_templates/images/20_kb/72.jpg
Binary file added meme_templates/images/20_kb/73.jpg
Binary file added meme_templates/images/20_kb/74.jpg
Binary file added meme_templates/images/20_kb/75.jpg
Binary file added meme_templates/images/20_kb/76.jpg
Binary file added meme_templates/images/20_kb/77.jpg
Binary file added meme_templates/images/20_kb/78.jpg
Binary file added meme_templates/images/20_kb/79.jpg
Binary file added meme_templates/images/20_kb/80.jpg
Binary file added meme_templates/images/20_kb/81.jpg
Binary file added meme_templates/images/20_kb/82.jpg
Binary file added meme_templates/images/20_kb/83.jpg
Binary file added meme_templates/images/20_kb/84.jpg
Binary file added meme_templates/images/20_kb/85.jpg
Binary file added meme_templates/images/20_kb/86.jpg
Binary file added meme_templates/images/20_kb/87.jpg
Binary file added meme_templates/images/20_kb/88.jpg
Binary file added meme_templates/images/20_kb/89.jpg
Binary file added meme_templates/images/20_kb/90.jpg
Binary file added meme_templates/images/20_kb/91.jpg
Binary file added meme_templates/images/20_kb/92.jpg
Binary file added meme_templates/images/20_kb/93.jpg
Binary file added meme_templates/images/20_kb/94.jpg
Binary file added meme_templates/images/20_kb/95.jpg
Binary file added meme_templates/images/20_kb/96.jpg
Binary file added meme_templates/images/20_kb/97.jpg
Binary file added meme_templates/images/20_kb/98.jpg
Binary file added meme_templates/images/20_kb/99.jpg
Binary file added meme_templates/images/37.jpg
Binary file added meme_templates/images/38.jpg
Binary file added meme_templates/images/39.jpg
Binary file added meme_templates/images/40.jpg
Binary file added meme_templates/images/41.jpg
Binary file added meme_templates/images/42.jpg
Binary file added meme_templates/images/43.jpg
Binary file added meme_templates/images/44.jpg
Binary file added meme_templates/images/45.jpg
Binary file added meme_templates/images/46.jpg
Binary file added meme_templates/images/47.jpg
Binary file added meme_templates/images/48.jpg
Binary file added meme_templates/images/49.jpg
Binary file added meme_templates/images/50.jpg
Binary file added meme_templates/images/51.jpg
Binary file added meme_templates/images/52.jpg
Binary file added meme_templates/images/53.jpg
Binary file added meme_templates/images/54.jpg
Binary file added meme_templates/images/55.jpg
Binary file added meme_templates/images/56.jpg
Binary file added meme_templates/images/57.jpg
Binary file added meme_templates/images/58.jpg
Binary file added meme_templates/images/59.jpg
Binary file added meme_templates/images/60.jpg
Binary file added meme_templates/images/61.jpg
Binary file added meme_templates/images/62.jpg
Binary file added meme_templates/images/63.jpg
Binary file added meme_templates/images/64.jpg
Binary file added meme_templates/images/65.jpg
Binary file added meme_templates/images/66.jpg
Binary file added meme_templates/images/67.jpg
Binary file added meme_templates/images/68.jpg
Binary file added meme_templates/images/69.jpg
Binary file added meme_templates/images/70.jpg
Binary file added meme_templates/images/71.jpg
Binary file added meme_templates/images/72.jpg
Binary file added meme_templates/images/73.jpg
Binary file added meme_templates/images/74.jpg
Binary file added meme_templates/images/75.jpg
Binary file added meme_templates/images/76.jpg
Binary file added meme_templates/images/77.jpg
Binary file added meme_templates/images/78.jpg
Binary file added meme_templates/images/79.jpg
Binary file added meme_templates/images/80.jpg
Binary file added meme_templates/images/81.jpg
Binary file added meme_templates/images/82.jpg
Binary file added meme_templates/images/83.jpg
Binary file added meme_templates/images/84.jpg
Binary file added meme_templates/images/85.jpg
Binary file added meme_templates/images/86.jpg
Binary file added meme_templates/images/87.jpg
Binary file added meme_templates/images/88.jpg
Binary file added meme_templates/images/89.jpg
Binary file added meme_templates/images/90.jpg
Binary file added meme_templates/images/91.jpg
Binary file added meme_templates/images/92.jpg
Binary file added meme_templates/images/93.jpg
Binary file added meme_templates/images/94.jpg
Binary file added meme_templates/images/95.jpg
Binary file added meme_templates/images/96.jpg
Binary file added meme_templates/images/97.jpg
Binary file added meme_templates/images/98.jpg
Binary file added meme_templates/images/99.jpg
Loading
Loading