Skip to content

Commit 9de4323

Browse files
committed
Merge branch 'main' into enhancement/flutter-theme
# Conflicts: # app/lib/presentation/resources/custom_network_image.dart # app/lib/presentation/themes/resources/light_theme_colors.dart # modules/common/.flutter-plugins-dependencies # modules/common/pubspec.yaml # modules/data/.flutter-plugins-dependencies # modules/domain/.flutter-plugins-dependencies
2 parents 9b2936b + 3d9db32 commit 9de4323

File tree

78 files changed

+449
-375
lines changed

Some content is hidden

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

78 files changed

+449
-375
lines changed

.gitignore

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ app.*.symbols
121121
!**/ios/**/default.perspectivev3
122122
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
123123
!/dev/ci/**/Gemfile.lock
124-
/app/env/
125-
126124

127125
/modules/common/.flutter-plugins
128126
/modules/common/.flutter-plugins-dependencies

.idea/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

.idea/flutter-base.iml

Lines changed: 0 additions & 71 deletions
This file was deleted.

.idea/libraries/Dart_SDK.xml

Lines changed: 0 additions & 29 deletions
This file was deleted.

.idea/modules.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.

.idea/vcs.xml

Lines changed: 0 additions & 6 deletions
This file was deleted.

README.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,11 @@ For more information you can check the [docs](https://dartcode.org/docs/launch-c
171171
- [intl](https://pub.dev/packages/intl) and [intl_utils](https://pub.dev/packages/intl_utils) for
172172
localization.
173173
- [flutter_svg](https://pub.dev/packages/flutter_svg) Svg Image loader.
174-
174+
- Auto generate translations files with [intl_utils](https://pub.dev/packages/intl_utils).
175+
176+
- ```text
177+
dart run intl_utils:generate
178+
```
175179
## Code Quality Standards
176180
177181
In order to meet the required code quality standards, this project is following

app/.gitignore

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ unlinked_spec.ds
7070
**/android/**/GeneratedPluginRegistrant.java
7171
**/android/key.properties
7272
*.jks
73+
/android/gradle.properties
7374

7475
# iOS/XCode related
7576
**/ios/**/*.mode1v3
@@ -121,4 +122,22 @@ app.*.symbols
121122
!**/ios/**/default.perspectivev3
122123
!/packages/flutter_tools/test/data/dart_dependencies_test/**/.packages
123124
!/dev/ci/**/Gemfile.lock
124-
/env*.json
125+
/env*.json
126+
127+
# Environment and configuration files (contain sensitive data)
128+
../env/.env
129+
../env/env_*.json
130+
.env
131+
.env.*
132+
*.env
133+
134+
# Firebase/Google config files (may contain sensitive keys)
135+
**/google-services.json
136+
**/GoogleService-Info.plist
137+
firebase.json
138+
.firebaserc
139+
firebase-debug.log
140+
141+
# Local development files
142+
local.properties
143+
*.properties

app/android/build.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
flutter.versionName=1.0.0
22
flutter.appId=base
33
flutter.versionCode=1
4-
flutter.compileSdkVersion=34
5-
flutter.minSdkVersion=21
6-
flutter.targetSdkVersion=33
4+
flutter.compileSdkVersion=36
5+
flutter.minSdkVersion=24
6+
flutter.targetSdkVersion=36

app/env/.env.example

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# The .env file MUST be in .gitignore
2+
# Delete this file after creating .env
3+
#
4+
# Each flavor (dev/qa/prod) uses the same .env file but reads
5+
# different variables based on the suffix:
6+
# - Development (main_dev.dart) → reads *_DEV variables
7+
# - QA/Staging (main_qa.dart) → reads *_QA variables
8+
# - Production (main.dart) → reads *_PROD variables
9+
10+
API_URL_DEV=https://your-api-url-dev.com
11+
API_URL_QA=https://your-api-url-qa.com
12+
API_URL_PROD=https://your-api-url-prod.com
13+

0 commit comments

Comments
 (0)