TDvorak/1356
1
0
Fork 0
mirror of https://github.com/Dvorinka/1356.git synced 2026-06-03 19:42:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Dvorinka/1356

Browse Source
This commit is contained in:
Tomas Dvorak
2026-01-06 13:46:49 +01:00
parent 9f44fd57f7 2aa4c0721f
commit 7b7ed0083f
18 changed files with 464 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lifetimer/lib/data/repositories/auth_repository.dart
+39 -15
View File
@@ -84,27 +84,51 @@ class AuthRepository {
}
Future<void> signInWithGoogle() async {
final GoogleSignIn googleSignIn = GoogleSignIn();
try {
final GoogleSignIn googleSignIn = GoogleSignIn(
scopes: ['email', 'profile'],
);
final googleUser = await googleSignIn.signIn();
if (googleUser == null) {
throw Exception('Google sign-in was cancelled');
// Check if user is already signed in
final googleUser = await googleSignIn.signInSilently();
if (googleUser != null) {
await _handleGoogleUser(googleUser);
return;
}
// Sign in interactively
final interactiveUser = await googleSignIn.signIn();
if (interactiveUser == null) {
throw Exception('Google sign-in was cancelled');
}
await _handleGoogleUser(interactiveUser);
} catch (e) {
throw Exception('Google sign-in failed: ${e.toString()}');
}
}
final googleAuth = await googleUser.authentication;
final idToken = googleAuth.idToken;
Future<void> _handleGoogleUser(dynamic googleUser) async {
try {
final googleAuth = await googleUser.authentication;
final idToken = googleAuth.idToken;
final accessToken = googleAuth.accessToken;
if (idToken == null) {
throw Exception('No ID token from Google sign-in');
}
if (idToken == null && accessToken == null) {
throw Exception('No ID token or access token from Google sign-in');
}
final response = await _client.auth.signInWithIdToken(
provider: supabase.OAuthProvider.google,
idToken: idToken,
);
final response = await _client.auth.signInWithIdToken(
provider: supabase.OAuthProvider.google,
idToken: idToken,
accessToken: accessToken,
);
if (response.user != null) {
await _ensureUserProfileExists(response.user!.id, response.user!);
if (response.user != null) {
await _ensureUserProfileExists(response.user!.id, response.user!);
}
} catch (e) {
throw Exception('Failed to authenticate with Google: ${e.toString()}');
}
}
lifetimer/lib/features/auth/presentation/auth_choice_screen.dart
+1 -1
View File
@@ -102,7 +102,7 @@ class _AuthChoiceScreenState extends ConsumerState<AuthChoiceScreen> {
),
const SizedBox(height: 24),
Text(
'LifeTimer',
'1356',
style: Theme.of(context)
.textTheme
.headlineLarge
lifetimer/lib/features/auth/presentation/auth_showcase_screen.dart
+1 -1
View File
@@ -64,7 +64,7 @@ class AuthShowcaseScreen extends ConsumerWidget {
),
const SizedBox(height: 16),
Text(
'LifeTimer helps you design a 1356-day experiment, focus on a small set of meaningful goals, and see time as a single bold countdown.',
'1356 helps you design a 1356-day experiment, focus on a small set of meaningful goals, and see time as a single bold countdown.',
style: theme.textTheme.bodyLarge?.copyWith(
color: colorScheme.onSurface.withValues(alpha:0.7),
height: 1.6,
lifetimer/lib/features/auth/presentation/sign_in_screen.dart
+1 -1
View File
@@ -111,7 +111,7 @@ class _SignInScreenState extends ConsumerState<SignInScreen> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'LifeTimer',
'1356',
style: Theme.of(context)
.textTheme
.titleMedium
lifetimer/lib/features/auth/presentation/sign_up_screen.dart
+1 -1
View File
@@ -91,7 +91,7 @@ class _SignUpScreenState extends ConsumerState<SignUpScreen> {
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'LifeTimer',
'1356',
style: Theme.of(context)
.textTheme
.titleMedium
lifetimer/lib/features/countdown/presentation/home_countdown_screen.dart
+4 -2
View File
@@ -30,7 +30,9 @@ class _HomeCountdownScreenState extends ConsumerState<HomeCountdownScreen> {
return AppScaffold(
body: SafeArea(
child: countdownState.isLoading
child: Padding(
padding: const EdgeInsets.only(top: 30.0, bottom: 30.0),
child: countdownState.isLoading
? const Center(child: LoadingIndicator())
: countdownState.error != null
? Center(
@@ -156,7 +158,7 @@ class _CountdownActiveScreen extends StatelessWidget {
child: SingleChildScrollView(
physics: const AlwaysScrollableScrollPhysics(),
child: Padding(
padding: const EdgeInsets.all(24.0),
padding: const EdgeInsets.only(top: 30.0, left: 24.0, right: 24.0, bottom: 30.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.center,
children: [
lifetimer/lib/features/onboarding/presentation/onboarding_how_it_works_screen.dart
+93 -67
View File
@@ -16,82 +16,67 @@ class OnboardingHowItWorksScreen extends ConsumerWidget {
return AppScaffold(
body: SafeArea(
child: Column(
children: [
// Progress indicator and back button
Padding(
padding: const EdgeInsets.all(24.0),
child: Row(
children: [
IconButton(
onPressed: () {
context.pop();
},
icon: const Icon(Icons.arrow_back),
),
Expanded(
child: LinearProgressIndicator(
value: 2 / 3, // Step 2 of 3
backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
valueColor: AlwaysStoppedAnimation<Color>(
Theme.of(context).colorScheme.primary,
),
),
),
const SizedBox(width: 48), // Balance the back button
],
child: Padding(
padding: const EdgeInsets.only(top: 30.0, left: 24.0, right: 24.0, bottom: 30.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Progress Bar and Navigation
_OnboardingProgress(currentStep: 2, totalSteps: 3),
const SizedBox(height: 24),
Text(
'How It Works',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
),
),
// Scrollable content
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.symmetric(horizontal: 24.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(height: 8),
Text(
'How It Works',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
const SizedBox(height: 32),
const _StepCard(
number: 1,
title: 'Create Your Bucket List',
description: 'Add between 1 and 20 goals you want to achieve. Each goal can have a description, location, and image.',
icon: Icons.edit_note,
),
const SizedBox(height: 16),
const _StepCard(
number: 2,
title: 'Finalize Your List',
description: 'Once you\'re happy with your goals, confirm your bucket list. This action cannot be undone.',
icon: Icons.lock,
),
const SizedBox(height: 16),
const _StepCard(
number: 3,
title: 'Start Your 1356-Day Journey',
description: 'The countdown begins immediately. Track your progress and make every day count.',
icon: Icons.timer,
),
const SizedBox(height: 16),
Row(
children: [
Expanded(
child: TextButton(
onPressed: () => context.pop(),
child: const Text('Back'),
),
const SizedBox(height: 20),
const _StepCard(
number: 1,
title: 'Create Your Bucket List',
description: 'Add between 1 and 20 goals you want to achieve. Each goal can have a description, location, and image.',
icon: Icons.edit_note,
),
const SizedBox(height: 12),
const _StepCard(
number: 2,
title: 'Finalize Your List',
description: 'Once you\'re happy with your goals, confirm your bucket list. This action cannot be undone.',
icon: Icons.lock,
),
const SizedBox(height: 12),
const _StepCard(
number: 3,
title: 'Start Your 1356-Day Journey',
description: 'The countdown begins immediately. Track your progress and make every day count.',
icon: Icons.timer,
),
const SizedBox(height: 24),
PrimaryButton(
),
const SizedBox(width: 16),
Expanded(
flex: 2,
child: PrimaryButton(
onPressed: () {
controller.completeStep('how_it_works');
context.push('/onboarding/motivation');
},
text: 'Continue',
),
const SizedBox(height: 20),
],
),
),
],
),
),
],
const SizedBox(height: 16),
],
),
),
),
);
@@ -190,3 +175,44 @@ class _StepCard extends StatelessWidget {
);
}
}
class _OnboardingProgress extends StatelessWidget {
final int currentStep;
final int totalSteps;
const _OnboardingProgress({
required this.currentStep,
required this.totalSteps,
});
@override
Widget build(BuildContext context) {
return Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'Step $currentStep of $totalSteps',
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
),
),
TextButton(
onPressed: () => context.pop(),
child: const Text('Back'),
),
],
),
const SizedBox(height: 12),
LinearProgressIndicator(
value: currentStep / totalSteps,
backgroundColor: Theme.of(context).colorScheme.primaryContainer.withOpacity(0.3),
valueColor: AlwaysStoppedAnimation<Color>(
Theme.of(context).colorScheme.primary,
),
),
],
);
}
}
lifetimer/lib/features/onboarding/presentation/onboarding_intro_screen.dart
+110 -90
View File
@@ -16,105 +16,84 @@ class OnboardingIntroScreen extends ConsumerWidget {
return AppScaffold(
body: SafeArea(
child: Column(
children: [
// Progress indicator and back button
Padding(
padding: const EdgeInsets.all(24.0),
child: Row(
children: [
IconButton(
onPressed: () {
// Can't go back from intro, go to auth choice
context.push('/auth-choice');
},
icon: const Icon(Icons.arrow_back),
),
Expanded(
child: LinearProgressIndicator(
value: 1 / 3, // Step 1 of 3
backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
valueColor: AlwaysStoppedAnimation<Color>(
Theme.of(context).colorScheme.primary,
),
),
),
const SizedBox(width: 48), // Balance the back button
],
child: Padding(
padding: const EdgeInsets.only(top: 30.0, left: 24.0, right: 24.0, bottom: 30.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Progress Bar and Navigation
_OnboardingProgress(currentStep: 1, totalSteps: 3),
const SizedBox(height: 48),
const Icon(
Icons.timer_outlined,
size: 100,
color: null,
),
),
// Scrollable content
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.symmetric(horizontal: 24.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(height: 16),
const Icon(
Icons.timer_outlined,
size: 64,
color: null,
),
const SizedBox(height: 20),
Text(
'Welcome to LifeTimer',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 10),
Text(
'Your 1356-day journey starts here.\nCreate your bucket list and begin your countdown.',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
height: 1.5,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 24),
const _FeatureCard(
icon: Icons.flag,
title: 'Set Your Goals',
description: 'Create a bucket list of 1-20 meaningful goals',
),
const SizedBox(height: 10),
const _FeatureCard(
icon: Icons.lock_clock,
title: 'Fixed Timeline',
description: '1356 days to achieve everything - no extensions',
),
const SizedBox(height: 10),
const _FeatureCard(
icon: Icons.trending_up,
title: 'Track Progress',
description: 'Watch yourself grow day by day',
),
const SizedBox(height: 32),
PrimaryButton(
onPressed: () {
controller.completeStep('intro');
context.push('/onboarding/how-it-works');
},
text: 'Get Started',
),
const SizedBox(height: 10),
TextButton(
const SizedBox(height: 32),
Text(
'Welcome to 1356',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 16),
Text(
'Your 1356-day journey starts here.\nCreate your bucket list and begin your countdown.',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
height: 1.5,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 48),
const _FeatureCard(
icon: Icons.flag,
title: 'Set Your Goals',
description: 'Create a bucket list of 1-20 meaningful goals',
),
const SizedBox(height: 16),
const _FeatureCard(
icon: Icons.lock_clock,
title: 'Fixed Timeline',
description: '1356 days to achieve everything - no extensions',
),
const SizedBox(height: 16),
const _FeatureCard(
icon: Icons.trending_up,
title: 'Track Progress',
description: 'Watch yourself grow day by day',
),
const Spacer(),
Row(
children: [
Expanded(
child: TextButton(
onPressed: () async {
await controller.skipOnboarding();
if (context.mounted) {
context.push('/home');
}
},
child: const Text('Skip onboarding'),
child: const Text('Skip'),
),
const SizedBox(height: 20),
],
),
),
const SizedBox(width: 16),
Expanded(
flex: 2,
child: PrimaryButton(
onPressed: () {
controller.completeStep('intro');
context.push('/onboarding/how-it-works');
},
text: 'Get Started',
),
),
],
),
),
],
const SizedBox(height: 16),
],
),
),
),
);
@@ -176,3 +155,44 @@ class _FeatureCard extends StatelessWidget {
);
}
}
class _OnboardingProgress extends StatelessWidget {
final int currentStep;
final int totalSteps;
const _OnboardingProgress({
required this.currentStep,
required this.totalSteps,
});
@override
Widget build(BuildContext context) {
return Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'Step $currentStep of $totalSteps',
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
),
),
TextButton(
onPressed: () => context.pop(),
child: const Text('Back'),
),
],
),
const SizedBox(height: 12),
LinearProgressIndicator(
value: currentStep / totalSteps,
backgroundColor: Theme.of(context).colorScheme.primaryContainer.withOpacity(0.3),
valueColor: AlwaysStoppedAnimation<Color>(
Theme.of(context).colorScheme.primary,
),
),
],
);
}
}
lifetimer/lib/features/onboarding/presentation/onboarding_motivation_screen.dart
+110 -83
View File
@@ -16,100 +16,86 @@ class OnboardingMotivationScreen extends ConsumerWidget {
return AppScaffold(
body: SafeArea(
child: Column(
children: [
// Progress indicator and back button
Padding(
padding: const EdgeInsets.all(24.0),
child: Row(
children: [
IconButton(
onPressed: () {
context.pop();
},
icon: const Icon(Icons.arrow_back),
),
Expanded(
child: LinearProgressIndicator(
value: 3 / 3, // Step 3 of 3 (complete)
backgroundColor: Theme.of(context).colorScheme.surfaceContainerHighest,
valueColor: AlwaysStoppedAnimation<Color>(
Theme.of(context).colorScheme.primary,
),
),
),
const SizedBox(width: 48), // Balance the back button
],
child: SingleChildScrollView(
child: Padding(
padding: const EdgeInsets.only(top: 30.0, left: 24.0, right: 24.0, bottom: 30.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
// Progress Bar and Navigation
_OnboardingProgress(currentStep: 3, totalSteps: 3),
const SizedBox(height: 24),
const Icon(
Icons.psychology_outlined,
size: 80,
color: Colors.amber,
),
),
// Scrollable content
Expanded(
child: SingleChildScrollView(
padding: const EdgeInsets.symmetric(horizontal: 24.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
const SizedBox(height: 8),
const Icon(
Icons.psychology_outlined,
size: 64,
color: Colors.amber,
const SizedBox(height: 24),
Text(
'Your Time is Now',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 16),
Text(
'1356 days is approximately 3 years and 8 months.\n\n'
'That\'s enough time to transform your life, learn new skills, '
'build meaningful relationships, and achieve your biggest dreams.\n\n'
'Every day counts. Every step matters. Your journey begins now.',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
height: 1.5,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 32),
const _MotivationCard(
icon: Icons.trending_up,
title: 'Track Progress',
description: 'Watch yourself grow as you complete goals and milestones.',
),
const SizedBox(height: 16),
const _MotivationCard(
icon: Icons.people,
title: 'Join Community',
description: 'Connect with others on similar journeys (optional).',
),
const SizedBox(height: 16),
const _MotivationCard(
icon: Icons.celebration,
title: 'Celebrate Wins',
description: 'Every achievement is worth celebrating.',
),
const SizedBox(height: 16),
Row(
children: [
Expanded(
child: TextButton(
onPressed: () => context.pop(),
child: const Text('Back'),
),
const SizedBox(height: 16),
Text(
'Your Time is Now',
style: Theme.of(context).textTheme.headlineLarge?.copyWith(
fontWeight: FontWeight.bold,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 12),
Text(
'1356 days is approximately 3 years and 8 months.\n\n'
'That\'s enough time to transform your life, learn new skills, '
'build meaningful relationships, and achieve your biggest dreams.\n\n'
'Every day counts. Every step matters. Your journey begins now.',
style: Theme.of(context).textTheme.bodyLarge?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.8),
height: 1.5,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 20),
const _MotivationCard(
icon: Icons.trending_up,
title: 'Track Progress',
description: 'Watch yourself grow as you complete goals and milestones.',
),
const SizedBox(height: 10),
const _MotivationCard(
icon: Icons.people,
title: 'Join Community',
description: 'Connect with others on similar journeys (optional).',
),
const SizedBox(height: 10),
const _MotivationCard(
icon: Icons.celebration,
title: 'Celebrate Wins',
description: 'Every achievement is worth celebrating.',
),
const SizedBox(height: 24),
PrimaryButton(
),
const SizedBox(width: 16),
Expanded(
flex: 2,
child: PrimaryButton(
onPressed: () async {
controller.completeStep('motivation');
await controller.completeOnboarding();
if (context.mounted) {
context.push('/profile-setup');
context.push('/profile/create');
}
},
text: 'Get Started',
),
const SizedBox(height: 20),
],
),
),
],
),
),
],
const SizedBox(height: 16),
],
),
),
),
);
@@ -171,3 +157,44 @@ class _MotivationCard extends StatelessWidget {
);
}
}
class _OnboardingProgress extends StatelessWidget {
final int currentStep;
final int totalSteps;
const _OnboardingProgress({
required this.currentStep,
required this.totalSteps,
});
@override
Widget build(BuildContext context) {
return Column(
children: [
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Text(
'Step $currentStep of $totalSteps',
style: Theme.of(context).textTheme.bodySmall?.copyWith(
color: Theme.of(context).colorScheme.onSurface.withOpacity(0.6),
),
),
TextButton(
onPressed: () => context.pop(),
child: const Text('Back'),
),
],
),
const SizedBox(height: 12),
LinearProgressIndicator(
value: currentStep / totalSteps,
backgroundColor: Theme.of(context).colorScheme.primaryContainer.withOpacity(0.3),
valueColor: AlwaysStoppedAnimation<Color>(
Theme.of(context).colorScheme.primary,
),
),
],
);
}
}
lifetimer/lib/main.dart
+5 -4
View File
@@ -17,6 +17,7 @@ void main() async {
const SystemUiOverlayStyle(
statusBarColor: Colors.transparent,
systemNavigationBarColor: Colors.transparent,
systemNavigationBarDividerColor: Colors.transparent,
),
);
@@ -28,13 +29,13 @@ void main() async {
runApp(
const ProviderScope(
child: LifeTimerApp(),
child: App1356(),
),
);
}
class LifeTimerApp extends ConsumerWidget {
const LifeTimerApp({super.key});
class App1356 extends ConsumerWidget {
const App1356({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
@@ -42,7 +43,7 @@ class LifeTimerApp extends ConsumerWidget {
final themeMode = ref.watch(themeModeProvider);
return MaterialApp.router(
title: 'LifeTimer',
title: '1356',
debugShowCheckedModeBanner: false,
theme: AppTheme.light,
darkTheme: AppTheme.dark,