fix and improve

lifetimer/android/app/build.gradle.kts

@@ -7,7 +7,7 @@ plugins {
 }
 
 android {
-    namespace = "com.example.lifetimer"
+    namespace = "com.example.app1356"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
@@ -23,7 +23,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.example.lifetimer"
+        applicationId = "com.example.app1356"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion

lifetimer/android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <application
-        android:label="lifetimer"
+        android:label="1356"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true">
@@ -30,7 +36,7 @@
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="lifetimer" />
+                <data android:scheme="app1356" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.

lifetimer/android/app/src/main/kotlin/com/example/lifetimer/NextCountdownWidgetProvider.kt

@@ -1,10 +1,10 @@
-package com.example.lifetimer
+package com.example.app1356
 
 import android.appwidget.AppWidgetManager
 import android.content.Context
 import android.content.SharedPreferences
 import android.widget.RemoteViews
-import com.example.lifetimer.R
+import com.example.app1356.R
 import es.antonborri.home_widget.HomeWidgetProvider
 
 class NextCountdownWidgetProvider : HomeWidgetProvider() {
@@ -16,7 +16,7 @@ class NextCountdownWidgetProvider : HomeWidgetProvider() {
     ) {
         appWidgetIds.forEach { widgetId ->
             val title = widgetData.getString("next_title", "Next goal")
-            val subtitle = widgetData.getString("next_subtitle", "Open Lifetimer to see details")
+            val subtitle = widgetData.getString("next_subtitle", "Open 1356 to see details")
             val timeLeft = widgetData.getString("next_time_left", "0 days left")
 
             val views = RemoteViews(context.packageName, R.layout.next_countdown_widget).apply {

lifetimer/android/app/src/main/res/drawable/widget_background.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#1E1E1E" />
+    <corners android:radius="16dp" />
+    <stroke
+        android:width="1dp"
+        android:color="#33FFFFFF" />
+</shape>

lifetimer/android/app/src/main/res/layout/next_countdown_widget.xml

@@ -2,7 +2,8 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="#121212"
+    android:background="#1A1A1A"
+    android:backgroundTint="#2A2A2A"
     android:gravity="center_vertical"
     android:orientation="vertical"
     android:padding="12dp">
@@ -13,6 +14,7 @@
         android:layout_height="wrap_content"
         android:text="Next goal"
         android:textColor="#FFFFFF"
+        android:textStyle="bold"
         android:textSize="16sp"
         android:maxLines="1"
         android:ellipsize="end" />
@@ -23,7 +25,8 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="4dp"
         android:text="0 days left"
-        android:textColor="#FFCC66"
+        android:textColor="#4CAF50"
+        android:textStyle="bold"
         android:textSize="20sp"
         android:maxLines="1"
         android:ellipsize="end" />
@@ -33,7 +36,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="2dp"
-        android:text="Open Lifetimer to see details"
+        android:text="Open 1356 to see details"
         android:textColor="#B3FFFFFF"
         android:textSize="12sp"
         android:maxLines="2"

lifetimer/android/app/src/main/res/layout/progress_widget.xml

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="@drawable/widget_background"
+    android:gravity="center"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <!-- 1356 Branding -->
+    <TextView
+        android:id="@+id/text_brand"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1356"
+        android:textColor="#FFFFFF"
+        android:textSize="12sp"
+        android:textStyle="bold"
+        android:background="#4CAF50"
+        android:paddingHorizontal="8dp"
+        android:paddingVertical="4dp"
+        android:layout_marginBottom="12dp" />
+
+    <!-- Days Remaining -->
+    <TextView
+        android:id="@+id/text_days"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="1356"
+        android:textColor="#FFFFFF"
+        android:textSize="36sp"
+        android:textStyle="bold"
+        android:layout_marginBottom="4dp" />
+
+    <!-- Label -->
+    <TextView
+        android:id="@+id/text_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="days remaining"
+        android:textColor="#B3FFFFFF"
+        android:textSize="12sp"
+        android:layout_marginBottom="16dp" />
+
+    <!-- Progress Bar -->
+    <ProgressBar
+        android:id="@+id/progress_bar"
+        android:layout_width="match_parent"
+        android:layout_height="4dp"
+        android:layout_marginBottom="8dp"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:progressTint="#4CAF50"
+        android:progressBackgroundTint="#33FFFFFF" />
+
+    <!-- Progress Text -->
+    <TextView
+        android:id="@+id/text_progress"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="0% Complete"
+        android:textColor="#B3FFFFFF"
+        android:textSize="10sp" />
+
+</LinearLayout>

lifetimer/android/app/src/main/res/values/strings.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">1356</string>
+    
+    <!-- Google Sign-In Configuration -->
+    <string name="default_web_client_id" translatable="false">YOUR_WEB_CLIENT_ID_HERE</string>
+</resources>

lifetimer/lib/data/repositories/auth_repository.dart

@@ -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();
+      // Check if user is already signed in
-    if (googleUser == null) {
+      final googleUser = await googleSignIn.signInSilently();
-      throw Exception('Google sign-in was cancelled');
+      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;
+  Future<void> _handleGoogleUser(dynamic googleUser) async {
-    final idToken = googleAuth.idToken;
+    try {
+      final googleAuth = await googleUser.authentication;
+      final idToken = googleAuth.idToken;
+      final accessToken = googleAuth.accessToken;
 
-    if (idToken == null) {
+      if (idToken == null && accessToken == null) {
-      throw Exception('No ID token from Google sign-in');
+        throw Exception('No ID token or access token from Google sign-in');
-    }
+      }
 
-    final response = await _client.auth.signInWithIdToken(
+      final response = await _client.auth.signInWithIdToken(
-      provider: supabase.OAuthProvider.google,
+        provider: supabase.OAuthProvider.google,
-      idToken: idToken,
+        idToken: idToken,
-    );
+        accessToken: accessToken,
+      );
 
-    if (response.user != null) {
+      if (response.user != null) {
-      await _ensureUserProfileExists(response.user!.id, response.user!);
+        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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -17,10 +17,12 @@ class OnboardingHowItWorksScreen extends ConsumerWidget {
     return AppScaffold(
       body: SafeArea(
         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.stretch,
             children: [
+              // Progress Bar and Navigation
+              _OnboardingProgress(currentStep: 2, totalSteps: 3),
               const SizedBox(height: 24),
               Text(
                 'How It Works',
@@ -50,13 +52,27 @@ class OnboardingHowItWorksScreen extends ConsumerWidget {
                 description: 'The countdown begins immediately. Track your progress and make every day count.',
                 icon: Icons.timer,
               ),
-              const Spacer(),
+              const SizedBox(height: 16),
-              PrimaryButton(
+              Row(
-                onPressed: () {
+                children: [
-                  controller.completeStep('how_it_works');
+                  Expanded(
-                  context.push('/onboarding/motivation');
+                    child: TextButton(
-                },
+                      onPressed: () => context.pop(),
-                text: 'Continue',
+                      child: const Text('Back'),
+                    ),
+                  ),
+                  const SizedBox(width: 16),
+                  Expanded(
+                    flex: 2,
+                    child: PrimaryButton(
+                      onPressed: () {
+                        controller.completeStep('how_it_works');
+                        context.push('/onboarding/motivation');
+                      },
+                      text: 'Continue',
+                    ),
+                  ),
+                ],
               ),
               const SizedBox(height: 16),
             ],
@@ -159,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

@@ -17,10 +17,12 @@ class OnboardingIntroScreen extends ConsumerWidget {
     return AppScaffold(
       body: SafeArea(
         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.stretch,
             children: [
+              // Progress Bar and Navigation
+              _OnboardingProgress(currentStep: 1, totalSteps: 3),
               const SizedBox(height: 48),
               const Icon(
                 Icons.timer_outlined,
@@ -29,7 +31,7 @@ class OnboardingIntroScreen extends ConsumerWidget {
               ),
               const SizedBox(height: 32),
               Text(
-                'Welcome to LifeTimer',
+                'Welcome to 1356',
                 style: Theme.of(context).textTheme.headlineLarge?.copyWith(
                   fontWeight: FontWeight.bold,
                 ),
@@ -63,22 +65,31 @@ class OnboardingIntroScreen extends ConsumerWidget {
                 description: 'Watch yourself grow day by day',
               ),
               const Spacer(),
-              PrimaryButton(
+              Row(
-                onPressed: () {
+                children: [
-                  controller.completeStep('intro');
+                  Expanded(
-                  context.push('/onboarding/how-it-works');
+                    child: TextButton(
-                },
+                      onPressed: () async {
-                text: 'Get Started',
+                        await controller.skipOnboarding();
-              ),
+                        if (context.mounted) {
-              const SizedBox(height: 16),
+                          context.push('/home');
-              TextButton(
+                        }
-                onPressed: () async {
+                      },
-                  await controller.skipOnboarding();
+                      child: const Text('Skip'),
-                  if (context.mounted) {
+                    ),
-                    context.push('/home');
+                  ),
-                  }
+                  const SizedBox(width: 16),
-                },
+                  Expanded(
-                child: const Text('Skip onboarding'),
+                    flex: 2,
+                    child: PrimaryButton(
+                      onPressed: () {
+                        controller.completeStep('intro');
+                        context.push('/onboarding/how-it-works');
+                      },
+                      text: 'Get Started',
+                    ),
+                  ),
+                ],
               ),
               const SizedBox(height: 16),
             ],
@@ -144,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

@@ -16,11 +16,14 @@ class OnboardingMotivationScreen extends ConsumerWidget {
     
     return AppScaffold(
       body: SafeArea(
-        child: Padding(
+        child: SingleChildScrollView(
-          padding: const EdgeInsets.all(24.0),
+          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,
@@ -65,16 +68,30 @@ class OnboardingMotivationScreen extends ConsumerWidget {
                 title: 'Celebrate Wins',
                 description: 'Every achievement is worth celebrating.',
               ),
-              const Spacer(),
+              const SizedBox(height: 16),
-              PrimaryButton(
+              Row(
-                onPressed: () async {
+                children: [
-                  controller.completeStep('motivation');
+                  Expanded(
-                  await controller.completeOnboarding();
+                    child: TextButton(
-                  if (context.mounted) {
+                      onPressed: () => context.pop(),
-                    context.push('/profile/create');
+                      child: const Text('Back'),
-                  }
+                    ),
-                },
+                  ),
-                text: 'Get Started',
+                  const SizedBox(width: 16),
+                  Expanded(
+                    flex: 2,
+                    child: PrimaryButton(
+                      onPressed: () async {
+                        controller.completeStep('motivation');
+                        await controller.completeOnboarding();
+                        if (context.mounted) {
+                          context.push('/profile/create');
+                        }
+                      },
+                      text: 'Get Started',
+                    ),
+                  ),
+                ],
               ),
               const SizedBox(height: 16),
             ],
@@ -140,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

@@ -13,6 +13,7 @@ void main() async {
     const SystemUiOverlayStyle(
       statusBarColor: Colors.transparent,
       systemNavigationBarColor: Colors.transparent,
+      systemNavigationBarDividerColor: Colors.transparent,
     ),
   );
   
@@ -24,13 +25,13 @@ void main() async {
   
   runApp(
     const ProviderScope(
-      child: LifeTimerApp(),
+      child: App1356(),
     ),
   );
 }
 
-class LifeTimerApp extends ConsumerWidget {
+class App1356 extends ConsumerWidget {
-  const LifeTimerApp({super.key});
+  const App1356({super.key});
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
@@ -38,7 +39,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,

lifetimer/pubspec.yaml

@@ -1,4 +1,4 @@
-name: lifetimer
+name: 1356
 description: A gamified life countdown app with 1356-day challenge and bucket list tracking.
 publish_to: 'none'
 version: 1.0.0+1