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
3 changes: 3 additions & 0 deletions app/env/.dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
API_URL=https://dummyjson.com
SECRET_KEY=your_secret_key_here
ENV=dev
File renamed without changes.
2 changes: 1 addition & 1 deletion app/lib/main/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class App extends StatelessWidget {
builder: (context, child) {
return BlocListener<AuthCubit, Resource>(
listener: (_, state) {
if (state is Success<AuthState>) {
if (state is RSuccess<AuthState>) {
switch (state.data) {
case AuthStateAuthenticated _:
_goRouter.go('/home');
Expand Down
4 changes: 2 additions & 2 deletions app/lib/main/env/env_config.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:domain/env/env_config.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';

enum Flavor {
Expand Down Expand Up @@ -27,7 +28,6 @@ class Environment {
}

class FlavorValues {

FlavorValues();
}

Expand All @@ -47,7 +47,7 @@ class FlavorConfig {
flavor.toString(),
values,
);
switch(flavor) {
switch (flavor) {
case Flavor.dev:
EnvConfig.env = EnvConfig.kDevEnv;
break;
Expand Down
10 changes: 1 addition & 9 deletions app/lib/main/init.dart
Original file line number Diff line number Diff line change
@@ -1,17 +1,13 @@
import 'package:app/main/app.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:app/main/env/env_config.dart';
import 'package:common/init.dart';
import 'package:data/init.dart';
import 'package:domain/init.dart';
import 'package:example_domain/init.dart';
import 'package:example_data/init.dart';
import 'package:flutter/material.dart';
import 'package:flutter_dotenv/flutter_dotenv.dart';
import 'package:get_it/get_it.dart';
import 'package:url_strategy/url_strategy.dart';

import 'env/env_config.dart';

void init() async {
WidgetsFlutterBinding.ensureInitialized();
await initialize();
Expand All @@ -27,8 +23,4 @@ Future<void> initialize() async {
await CommonInit.initialize(getIt);
await DataInit.initialize(getIt);
await DomainInit.initialize(getIt);

// Example Module init
await ExampleDataInit.initialize(getIt);
await ExampleDomainInit.initialize(getIt);
}
180 changes: 88 additions & 92 deletions app/lib/presentation/themes/resources/dark_theme_colors.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,132 +5,128 @@ import 'package:app/presentation/themes/resources/app_theme_data.dart';
class DarkThemeColors implements ThemeColors {
/// 10: onPrimaryContainer
/// 40: primary
/// 80: inversePrimary
/// 90: primaryContainer
/// 100: onPrimary
@override
// TODO: implement primary
MaterialColor get primary => const MaterialColor(0xFFFFFFDE, {
0: Color(0xFFFFFFDE),
10: Color(0xFFFFFFDE),
20: Color(0xFFFFFFDE),
30: Color(0xFFFFFFDE),
40: Color(0xFFFFFFDE),
50: Color(0xFFFFFFDE),
60: Color(0xFFFFFFDE),
70: Color(0xFFFFFFDE),
80: Color(0xFFFFFFDE),
90: Color(0xFF6750A4),
95: Color(0xFFFFFFDE),
99: Color(0xFF6750A4),
100: Color(0xFF6750A4),
MaterialColor get primary => const MaterialColor(0xFFD0BCFF, {
0: Color(0xFF000000),
10: Color(0xFF21005D), // onPrimaryContainer
20: Color(0xFF381E72),
30: Color(0xFF4F378B),
40: Color(0xFF6750A4), // inversePrimary (light mode primary)
50: Color(0xFF7F67BE),
60: Color(0xFF9A82DB),
70: Color(0xFFB69DF8),
80: Color(0xFFD0BCFF), // primary - Main brand color in dark
90: Color(0xFFEADDFF), // primaryContainer
95: Color(0xFFF6EDFF),
99: Color(0xFFFFFBFE),
100: Color(0xFFFFFFFF), // onPrimary
});

/// 10: onSecondaryContainer
/// 40: secondary
/// 90: secondaryContainer
/// 100: onSecondary
@override
// TODO: implement secondary
MaterialColor get secondary => const MaterialColor(0xFFFFFFFD, {
0: Color(0xFFFFFFDE),
10: Color(0xFF1D192B),
20: Color(0xFFFFFFDE),
30: Color(0xFFFFFFDE),
40: Color(0xFFFFFFFD),
50: Color(0xFFFFFFDE),
60: Color(0xFFFFFFDE),
70: Color(0xFFFFFFDE),
80: Color(0xFFFFFFDE),
90: Color(0xFF1D192B),
95: Color(0xFFFFFFDE),
99: Color(0xFF1D192B),
100: Color(0xFF1D192B),
MaterialColor get secondary => const MaterialColor(0xFFCCC2DC, {
0: Color(0xFF000000),
10: Color(0xFF1D192B), // onSecondaryContainer
20: Color(0xFF332D41),
30: Color(0xFF4A4458),
40: Color(0xFF625B71),
50: Color(0xFF7A7289),
60: Color(0xFF958DA5),
70: Color(0xFFB0A7C0),
80: Color(0xFFCCC2DC), // secondary
90: Color(0xFFE8DEF8), // secondaryContainer
95: Color(0xFFF6EDFF),
99: Color(0xFFFFFBFE),
100: Color(0xFFFFFFFF), // onSecondary
});

/// 10: onTertiaryContainer
/// 40: tertiary
/// 90: tertiaryContainer
/// 100: onTertiary
@override
// TODO: implement tertiary
MaterialColor get tertiary => const MaterialColor(0xFFFFFFDE, {
0: Color(0xFFFFFFDE),
10: Color(0xFFFFFFDE),
20: Color(0xFFFFFFDE),
30: Color(0xFFFFFFDE),
40: Color(0xFFFFFFDE),
50: Color(0xFFFFFFDE),
60: Color(0xFFFFFFDE),
70: Color(0xFFFFFFDE),
80: Color(0xFFFFFFDE),
90: Color(0xFFF0524D),
95: Color(0xFFFFFFDE),
99: Color(0xFFFFFFDE),
100: Color(0xFFF0524D),
MaterialColor get tertiary => const MaterialColor(0xFFEFB8C8, {
0: Color(0xFF000000),
10: Color(0xFF31111D), // onTertiaryContainer
20: Color(0xFF492532),
30: Color(0xFF633B48),
40: Color(0xFF7D5260),
50: Color(0xFF986977),
60: Color(0xFFB58392),
70: Color(0xFFD29DAC),
80: Color(0xFFEFB8C8), // tertiary
90: Color(0xFFFFD8E4), // tertiaryContainer
95: Color(0xFFFFECF1),
99: Color(0xFFFFFBFA),
100: Color(0xFFFFFFFF), // onTertiary
});

/// 10: onErrorContainer
/// 40: error
/// 90: errorContainer
/// 100: onError
@override
// TODO: implement error
MaterialColor get error => const MaterialColor(0xFFB3261E, {
0: Color(0xFFFFFFDE),
10: Color(0xFF410E0B),
20: Color(0xFFF0524D),
30: Color(0xFFF0524D),
MaterialColor get error => const MaterialColor(0xFFF2B8B5, {
0: Color(0xFF000000),
10: Color(0xFF410E0B), // onErrorContainer
20: Color(0xFF601410),
30: Color(0xFF8C1D18),
40: Color(0xFFB3261E),
50: Color(0xFFF0524D),
60: Color(0xFFF0524D),
70: Color(0xFFF0524D),
80: Color(0xFFF0524D),
90: Color(0xFFF9DEDC),
95: Color(0xFFF0524D),
99: Color(0xFFFFD8E4),
100: Color(0xFFFFFFFF),
50: Color(0xFFDC362E),
60: Color(0xFFE46962),
70: Color(0xFFEC928E),
80: Color(0xFFF2B8B5), // error
90: Color(0xFFF9DEDC), // errorContainer
95: Color(0xFFFCEEEE),
99: Color(0xFFFFFBF9),
100: Color(0xFFFFFFFF), // onError
});

/// 0: shadow
/// 10: onBackground / onSurface
/// 99: background / surface
/// 0: shadow / scrim
/// 10: onSurface
/// 20: inverseSurface
/// 99: surface
@override
// TODO: implement neutral
MaterialColor get neutral => const MaterialColor(0xFF410E0B, {
0: Color(0xFF410E0B),
10: Color(0xFF410E0B),
20: Color(0xFF410E0B),
30: Color(0xFF410E0B),
40: Color(0xFF410E0B),
50: Color(0xFF410E0B),
60: Color(0xFF410E0B),
70: Color(0xFF410E0B),
80: Color(0xFF410E0B),
90: Color(0xFF410E0B),
95: Color(0xFF410E0B),
99: Color(0xFF410E0B),
100: Color(0xFF410E0B),
MaterialColor get neutral => const MaterialColor(0xFF1C1B1F, {
0: Color(0xFF000000), // shadow / scrim
10: Color(0xFFE6E1E5), // onSurface - Main text color in dark (light color)
20: Color(0xFFF4EFF4), // inverseSurface (light color)
30: Color(0xFFAEAAAE),
40: Color(0xFF939094),
50: Color(0xFF787579),
60: Color(0xFF605D62),
70: Color(0xFF484649),
80: Color(0xFF313033),
90: Color(0xFF1C1B1F),
95: Color(0xFF141316),
99: Color(0xFF141316), // surface - Main background in dark (dark color)
100: Color(0xFF000000),
});

/// 30: onSurfaceVariant
/// 50: outline
/// 80: outlineVariant
/// 90: surfaceVariant
/// 90: surfaceContainerHighest
@override
// TODO: implement neutralVariant
MaterialColor get neutralVariant => const MaterialColor(0xFFFDDDDE, {
MaterialColor get neutralVariant => const MaterialColor(0xFF49454F, {
0: Color(0xFF000000),
10: Color(0xFF49454F),
20: Color(0xFFF0524D),
30: Color(0xFFF0524D),
40: Color(0xFFFDDDDE),
50: Color(0xFFF0524D),
60: Color(0xFFF0524D),
70: Color(0xFFF0524D),
80: Color(0xFFF0524D),
90: Color(0xFFF0524D),
95: Color(0xFFFDDDDE),
99: Color(0xFFF0524D),
100: Color(0xFFF0524D),
10: Color(0xFFF5EEFA),
20: Color(0xFFE7E0EC),
30: Color(0xFFC9C5D0), // onSurfaceVariant - Secondary text (lighter in dark)
40: Color(0xFFAEA9B4),
50: Color(0xFF938F99), // outline - Borders, dividers
60: Color(0xFF79747E),
70: Color(0xFF605D66),
80: Color(0xFF49454F), // outlineVariant - Subtle borders
90: Color(0xFF322F37), // surfaceContainerHighest
95: Color(0xFF1D1A22),
99: Color(0xFF000000),
100: Color(0xFF000000),
});
}
Loading