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: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

71 changes: 0 additions & 71 deletions .idea/flutter-base.iml

This file was deleted.

29 changes: 0 additions & 29 deletions .idea/libraries/Dart_SDK.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,11 @@ For more information you can check the [docs](https://dartcode.org/docs/launch-c
- [intl](https://pub.dev/packages/intl) and [intl_utils](https://pub.dev/packages/intl_utils) for
localization.
- [flutter_svg](https://pub.dev/packages/flutter_svg) Svg Image loader.

- Auto generate translations files with [intl_utils](https://pub.dev/packages/intl_utils).

- ```text
dart run intl_utils:generate
```
## Code Quality Standards

In order to meet the required code quality standards, this project is following
Expand Down
22 changes: 21 additions & 1 deletion app/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ unlinked_spec.ds
**/android/**/GeneratedPluginRegistrant.java
**/android/key.properties
*.jks
/android/gradle.properties

# iOS/XCode related
**/ios/**/*.mode1v3
Expand Down Expand Up @@ -121,4 +122,23 @@ app.*.symbols
!**/ios/**/default.perspectivev3
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
!/dev/ci/**/Gemfile.lock
/env*.json
/env*.json

# Environment and configuration files (contain sensitive data)
env/.env
env/.settings
env/env_*.json
.env
.env.*
*.env

# Firebase/Google config files (may contain sensitive keys)
**/google-services.json
**/GoogleService-Info.plist
firebase.json
.firebaserc
firebase-debug.log

# Local development files
local.properties
*.properties
6 changes: 3 additions & 3 deletions app/android/build.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
flutter.versionName=1.0.0
flutter.appId=base
flutter.versionCode=1
flutter.compileSdkVersion=34
flutter.minSdkVersion=21
flutter.targetSdkVersion=33
flutter.compileSdkVersion=36
flutter.minSdkVersion=24
flutter.targetSdkVersion=36
2 changes: 1 addition & 1 deletion app/lib/main/app.dart
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import 'init.dart';
class App extends StatelessWidget {
GoRouter get _goRouter => Routers.authRouter;

const App({Key? key}) : super(key: key);
const App({super.key});

@override
Widget build(BuildContext context) {
Expand Down
1 change: 0 additions & 1 deletion app/lib/main/env/main_dev.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/material.dart';
import 'package:app/main/env/env_config.dart';
import 'package:app/main/init.dart';
Expand Down
1 change: 0 additions & 1 deletion app/lib/main/env/main_qa.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import 'package:firebase_core/firebase_core.dart';
import 'package:flutter/material.dart';
import 'package:app/main/env/env_config.dart';
import 'package:app/main/init.dart';
Expand Down
10 changes: 5 additions & 5 deletions app/lib/presentation/resources/custom_network_image.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class CustomNetworkImage extends StatelessWidget {
static const double _shadowOpacity = 0.2;

const CustomNetworkImage({
Key? key,
super.key,
this.imageUrl,
this.shadow,
this.width,
Expand All @@ -29,7 +29,7 @@ class CustomNetworkImage extends StatelessWidget {
this.loaderImage,
this.svgIconColor,
this.imageUrlError,
}) : super(key: key);
});

bool isSvg(String? url) {
if (url == null) {
Expand All @@ -45,7 +45,7 @@ class CustomNetworkImage extends StatelessWidget {
decoration: BoxDecoration(boxShadow: [
if ((shadow ?? false))
BoxShadow(
color: Colors.black.withOpacity(_shadowOpacity),
color: Colors.black.withValues(alpha: _shadowOpacity),
spreadRadius: 0,
blurRadius: _blurRadius,
offset: const Offset(5, 5),
Expand All @@ -55,14 +55,14 @@ class CustomNetworkImage extends StatelessWidget {
imageUrl ?? "",
width: width,
height: height,
color: svgIconColor,
colorFilter: color != null ? ColorFilter.mode(svgIconColor!, BlendMode.srcIn) : null,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
colorFilter: color != null ? ColorFilter.mode(svgIconColor!, BlendMode.srcIn) : null,
colorFilter: color != null ? ColorFilter.mode(svgIconColor!, BlendMode.srcIn,) : null,

),
)
: Container(
decoration: BoxDecoration(boxShadow: [
if ((shadow ?? false))
BoxShadow(
color: Colors.black.withOpacity(_shadowOpacity),
color: Colors.black.withValues(alpha: _shadowOpacity),
spreadRadius: 0,
blurRadius: _blurRadius,
offset: const Offset(5, 5),
Expand Down
3 changes: 1 addition & 2 deletions app/lib/presentation/resources/images.dart
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,14 @@ class _SvgImage {
Alignment alignment = Alignment.center,
String? semanticLabel,
String? package,
@visibleForTesting bool isWeb = false,
}) {
return SvgPicture.asset(
assetPath,
key: Key(assetPath),
width: width,
height: height,
fit: fit,
color: color,
colorFilter: color != null ? ColorFilter.mode(color, BlendMode.srcIn) : null,
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
colorFilter: color != null ? ColorFilter.mode(color, BlendMode.srcIn) : null,
colorFilter: color != null ? ColorFilter.mode(color, BlendMode.srcIn,) : null,

alignment: alignment,
semanticsLabel: semanticLabel,
package: package,
Expand Down
3 changes: 2 additions & 1 deletion app/lib/presentation/themes/local_theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,9 @@ abstract class LocalTheme {
pickerTextStyle: bodyS,
dateTimePickerTextStyle: bodyS,
),
colors.background,
colors.surface,
colors.secondaryContainer,
CupertinoColors.systemBlue,
true,
);

Expand Down
62 changes: 24 additions & 38 deletions app/lib/presentation/themes/resources/app_theme_data.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,10 @@ class AppThemeData {
onError: palette.error.v100,
errorContainer: palette.error.v90,
onErrorContainer: palette.error.v10,
background: palette.neutral.v99,
onBackground: palette.neutral.v10,
surface: palette.neutral.v99,
onSurface: palette.neutral.v10,
surfaceVariant: palette.neutralVariant.v90,
onSurfaceVariant: palette.neutralVariant.v30,
surfaceContainerHighest: palette.neutralVariant.v90,
outline: palette.neutralVariant.v50,
outlineVariant: palette.neutralVariant.v80,
shadow: palette.neutral.v0,
Expand All @@ -44,50 +42,38 @@ class AppThemeData {
}

abstract class ThemeColors {
/**
* 40: primary
* 100: onPrimary
* 90: primaryContainer
* 10: onPrimaryContainer
* **/
/// 40: primary
/// 100: onPrimary
/// 90: primaryContainer
/// 10: onPrimaryContainer
abstract final MaterialColor primary;

/**
* 40: secondary
* 100: onSecondary
* 90: secondaryContainer
* 10: onSecondaryContainer
* **/
/// 40: secondary
/// 100: onSecondary
/// 90: secondaryContainer
/// 10: onSecondaryContainer
abstract final MaterialColor secondary;

/**
* 40: tertiary
* 100: onTertiary
* 90: tertiaryContainer
* 10: onTertiaryContainer
* **/
/// 40: tertiary
/// 100: onTertiary
/// 90: tertiaryContainer
/// 10: onTertiaryContainer
abstract final MaterialColor tertiary;

/**
* 40: error
* 100: onError
* 90: errorContainer
* 10: onErrorContainer
* **/
/// 40: error
/// 100: onError
/// 90: errorContainer
/// 10: onErrorContainer
abstract final MaterialColor error;

/**
* 0: shadow
* 99: background / surface
* 10: onBackground / onSurface
* **/
/// 0: shadow
/// 99: background / surface
/// 10: onBackground / onSurface
abstract final MaterialColor neutral;

/**
* 90: surfaceVariant
* 30: onSurfaceVariant
* 50: outline
* 80: outlineVariant
* **/
/// 90: surfaceVariant
/// 30: onSurfaceVariant
/// 50: outline
/// 80: outlineVariant
abstract final MaterialColor neutralVariant;
}
Loading
Loading