Skip to content

Commit 7b91943

Browse files
tqha1011anhkietbienhoa-cryptohoanghaozcoderabbitai[bot]CodeRabbit
authored
Fix/chatbot (#38)
* Feature/user profile (#30) * feat(UserProfile): build screen UserProfile # Conflicts: # src/lib/features/main/view/screens/main_screen.dart * feat: switch dark/light theme * fix: black color theme * fix: black theme in statistics screen * feat: add dark theme to auth screen * feat: apply dark theme for bottom navigation bar * feat(priority task):Implement priority and tag selection in task creation version 1 (#31) * feat(task): implement priority and tag selection features in task creation * Update README.md * Update README.md * Update README.md --------- Co-authored-by: Tran Quang Ha <[email protected]> * Update README.md (#32) * feat: Priority selector and tag system verson2 (#33) * feat(task): implement priority and tag selection features in task creation * feat(tags): enhance tag management with custom tag creation and selection * Update README.md * Update README.md * fix: error screen in main.dart (#34) * Enhance authentication UI and implement Focus feature set (#35) * feat(core): add auth layout template, custom textfield and colors * feat(auth): implement viewmodels for auth flow (MVVM) * feat(auth): build complete auth UI screens (Login, Register, OTP, Passwords) * chore(main): set LoginView as initial route * refactor(auth) : delete .gitkeep * chore: update dependencies and pubspec.lock * refactor(auth): optimize registration logic, timezone handling, and form validation * feat(auth): update UI for login, registration, and forgot password screens * feat(tasks): update task management UI and statistics screen * chore: update main entry point and fix widget tests * chore: ignore devtools_options.yaml * chore: ignore devtools_options.yaml * style(login) : rewrite title for login view * feat(auth): configure android deep link for supabase oauth * refactor(ui): add social login callbacks to auth layout template * feat(auth): update oauth methods with redirect url and signout * feat(auth): implement AuthGate using StreamBuilder for session tracking * feat(viewmodel): add oauth logic and improve provider lifecycle * refactor(ui): migrate LoginView to Provider pattern * chore(main): set AuthGate as initial route and setup provider * feat: implement full Focus feature set - Added Pomodoro timer with Start/Reset/Skip logic. - Integrated local Quick Notes with Pin/Delete functionality. - Supported image attachments in notes using image_picker. - Added Focus settings: time duration, vibration, and ringtones. * fix (auth) : dispose TextEditingControllers to prevent memory leaks * refactor (alarm ) : create off alarm button when time out * fix: apply CodeRabbit auto-fixes Fixed 3 file(s) based on 4 unresolved review comments. Co-authored-by: CodeRabbit <[email protected]> * fix(timer): prevent division by zero in progress calculation and sanitize negative settings input * fix(timer): prevent division by zero in progress calculation and sanitize negative settings input * fix(auth): unblock new-user login and add settings logout * refactor(LoginScreen) : compact all items to fit in screen to help users interface easily --------- Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: CodeRabbit <[email protected]> * build(deps)(deps): bump shared_preferences from 2.5.4 to 2.5.5 in /src (#36) Bumps [shared_preferences](https://github.com/flutter/packages/tree/main/packages/shared_preferences) from 2.5.4 to 2.5.5. - [Commits](https://github.com/flutter/packages/commits/shared_preferences-v2.5.5/packages/shared_preferences) --- updated-dependencies: - dependency-name: shared_preferences dependency-version: 2.5.5 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * Feature/user profile (#37) * feat(UserProfile): build screen UserProfile # Conflicts: # src/lib/features/main/view/screens/main_screen.dart * feat: switch dark/light theme * fix: black color theme * fix: black theme in statistics screen * feat: add dark theme to auth screen * feat: apply dark theme for bottom navigation bar * feat(RPC): update RPC to get data for heatmap * feat(RPC): update new RPC to get data for heatmap * feat: integrate chatbot assistant * feat(chatbot): integrate create task, answer question for chatbot * feat: remove mock data and get data tags and categories from supabase * feat: integrate chatbot's ability to create task --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Nguyễn Anh Kiệt <[email protected]> Co-authored-by: Nguyễn Lê Hoàng Hảo <[email protected]> Co-authored-by: coderabbitai[bot] <136622811+coderabbitai[bot]@users.noreply.github.com> Co-authored-by: CodeRabbit <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
1 parent bb72c59 commit 7b91943

62 files changed

Lines changed: 4807 additions & 610 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ The application is built with a focus on performance, security, and clean code p
2222
For a deeper dive into our system design and development workflows, please explore the attached documentation:
2323
* [Flutter App Architecture](documentation/architecture/flutter-architecture.md)
2424
* [Database Schema & ERD](documentation/architecture/database-schema.md)
25-
* [Git & Conventional Commits Guidelines](documentation/guidelines/conventional-commit.md)
25+
* [Git & Conventional Commits Guidelines](documentation/guidelines/conventional-commit.md)

‎src/lib/core/theme/app_theme.dart‎

Lines changed: 87 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,87 @@
1+
import 'package:flutter/material.dart';
2+
3+
class AppTheme {
4+
// =========================================================
5+
// ☀️ LIGHT THEME DICTIONARY
6+
// Inherited from the legacy AppColors class
7+
// =========================================================
8+
static final ThemeData lightTheme = ThemeData(
9+
brightness: Brightness.light,
10+
scaffoldBackgroundColor: const Color(0xFFF4F6F9), // Legacy: AppColors.background
11+
12+
colorScheme: const ColorScheme.light(
13+
// Brand Colors
14+
primary: Color(0xFF5A8DF3), // Legacy: AppColors.primary
15+
secondary: Color(0xFF4A90E2), // Legacy: AppColors.primaryBlue
16+
17+
// Background & Surface Colors
18+
// Note: 'background' is deprecated, scaffoldBackgroundColor handles the main background.
19+
surface: Colors.white, // Legacy: AppColors.taskCardBg / white
20+
surfaceContainerHighest: Color(0xFFE0F7FA), // Legacy: AppColors.backgroundBlue (Tinted background)
21+
22+
// Text Colors
23+
onSurface: Color(0xFF2D3440), // Legacy: AppColors.textDark
24+
onSurfaceVariant: Color(0xFF757575), // Legacy: AppColors.grayText / textSecondary
25+
26+
// Border & Status Colors
27+
outline: Color(0xFFE2E8F0), // Legacy: AppColors.border
28+
error: Colors.redAccent, // Legacy: AppColors.error
29+
tertiary: Colors.green, // Using Tertiary for Success (Green)
30+
),
31+
32+
appBarTheme: const AppBarTheme(
33+
backgroundColor: Colors.transparent,
34+
elevation: 0,
35+
iconTheme: IconThemeData(color: Color(0xFF5A8DF3)),
36+
titleTextStyle: TextStyle(
37+
color: Color(0xFF5A8DF3),
38+
fontWeight: FontWeight.w800,
39+
fontSize: 20,
40+
),
41+
),
42+
43+
dividerTheme: const DividerThemeData(color: Color(0xFFE2E8F0)),
44+
);
45+
46+
// =========================================================
47+
// 🌙 DARK THEME DICTIONARY
48+
// Extracted from the provided Stitch Design System
49+
// =========================================================
50+
static final ThemeData darkTheme = ThemeData(
51+
brightness: Brightness.dark,
52+
scaffoldBackgroundColor: const Color(0xFF0F172A), // Neutral Slate Dark
53+
54+
colorScheme: const ColorScheme.dark(
55+
// Brand Colors (Slightly brighter to stand out on dark background)
56+
primary: Color(0xFF60A5FA), // Bright Blue
57+
secondary: Color(0xFF61789A), // Slate Blue
58+
59+
// Background & Surface Colors
60+
// Note: 'background' is deprecated, scaffoldBackgroundColor handles the main background.
61+
surface: Color(0xFF1E293B), // Slightly lighter than background, used for Cards
62+
surfaceContainerHighest: Color(0xFF162032), // Dark mode counterpart for backgroundBlue
63+
64+
// Text Colors
65+
onSurface: Colors.white, // Primary text (White)
66+
onSurfaceVariant: Color(0xFF94A3B8), // Secondary text (Light Slate)
67+
68+
// Border, Status & Highlight Colors
69+
outline: Color(0xFF334155), // Faint Card Border
70+
error: Color(0xFFF87171), // Pinkish Red (Similar to Trash Icon)
71+
tertiary: Color(0xFFD19900), // Mustard Yellow (Similar to Edit Pencil Icon)
72+
),
73+
74+
appBarTheme: const AppBarTheme(
75+
backgroundColor: Colors.transparent,
76+
elevation: 0,
77+
iconTheme: IconThemeData(color: Color(0xFF60A5FA)),
78+
titleTextStyle: TextStyle(
79+
color: Color(0xFF60A5FA),
80+
fontWeight: FontWeight.w800,
81+
fontSize: 20,
82+
),
83+
),
84+
85+
dividerTheme: const DividerThemeData(color: Color(0xFF334155)),
86+
);
87+
}

0 commit comments

Comments
 (0)