Skip to content

Commit 80e5eaa

Browse files
committed
Merge remote-tracking branch 'origin/main'
# Conflicts: # lib/l10n/app_localizations.dart # lib/l10n/app_localizations_de.dart # lib/l10n/app_localizations_en.dart # lib/l10n/app_localizations_pt.dart
2 parents dd82b99 + 6baee4f commit 80e5eaa

File tree

11 files changed

+127
-23
lines changed

11 files changed

+127
-23
lines changed
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
name: 🐞 Bug Report
3+
about: Report a Flutter-related bug to help us improve
4+
title: "[Bug] <short description>"
5+
labels: bug
6+
assignees: ''
7+
8+
---
9+
10+
### 🐛 Describe the bug
11+
A clear and concise description of the bug you're experiencing.
12+
13+
---
14+
15+
### 🔁 Reproduction Steps
16+
Please list the minimal steps to reproduce the bug:
17+
1. `flutter clean`
18+
2. Run `flutter pub get`
19+
3. Navigate to '...'
20+
4. Click on '...'
21+
5. Observe the error
22+
23+
---
24+
25+
### 🤔 Expected behavior
26+
What did you expect to happen?
27+
28+
---
29+
30+
### 📸 Screenshots / Logs
31+
If applicable, add screenshots or terminal output that help explain the issue.
32+
33+
---
34+
35+
### 🧪 Test Environment
36+
Please complete the following information:
37+
38+
- **Flutter Version:**
39+
Run `flutter --version` and paste the output here.
40+
41+
- **Device:**
42+
e.g., Pixel 6, iPhone 14 Pro
43+
44+
- **OS:**
45+
Android / iOS / Web / macOS / Windows / Linux
46+
47+
- **Channel:**
48+
stable / beta / dev / master
49+
50+
---
51+
52+
### 📝 Additional context
53+
Add any other relevant context about the bug here (e.g., dependencies used, packages involved).
54+
55+
---
56+
57+
### ✅ Checklist
58+
- [ ] I have run `flutter clean` and `flutter pub get`
59+
- [ ] I have tried to reproduce this issue on a physical device and/or emulator
60+
- [ ] I have checked for similar issues in the [existing issues list](../../issues)
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
---
2+
name: 💡 Feature Request
3+
about: Suggest a new Flutter feature or improvement
4+
title: "[Feature] <short description>"
5+
labels: enhancement
6+
assignees: ''
7+
---
8+
9+
### Feature description
10+
Describe what you’d like to see added or improved.
11+
12+
### Motivation
13+
Why is this feature important or useful?
14+
15+
### Alternatives
16+
Are there any existing workarounds or alternatives?
17+
18+
### Additional context
19+
Add any context or mockups to support your request.

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616

1717
steps:
1818
- name: Checkout
19-
uses: actions/checkout@v3
19+
uses: actions/checkout@v4
2020

2121
- name: Setup Flutter
2222
uses: subosito/flutter-action@v2
@@ -67,14 +67,14 @@ jobs:
6767
run: lcov --remove coverage/lcov.info 'lib/routers/router.dart' -o coverage/lcov.info --ignore-errors unused
6868

6969
- name: Check Code Coverage
70-
uses: VeryGoodOpenSource/very_good_coverage@v1.2.0
70+
uses: VeryGoodOpenSource/very_good_coverage@v3.0.0
7171
with:
7272
path: coverage/lcov.info
7373
min_coverage: 59
7474
exclude: '**/*.g.dart **/*.gen.dart **/lib/di/ lib/generated/ **/lib/generated/ lib/di/*.dart **/lib/constants/ lib/constants/*.dart/ lib/routers/router.dart'
7575

7676
- name: Upload coverage to codecov
77-
uses: codecov/codecov-action@v3
77+
uses: codecov/codecov-action@v5
7878

7979
- name: Run codacy-coverage-reporter
8080
uses: codacy/codacy-coverage-reporter-action@v1

Makefile

Lines changed: 22 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,33 @@
1-
.PHONY: gen genAll rebuild check get localize runDev runDevQa runDevStaging lines release apk
1+
.PHONY: gen genAll rebuild check get localize runDev runDevQa runDevStaging runProdRelease \
2+
release apk lines force_upgrade integration_test
23

3-
# clean project, install dependencies & generate sources
4+
# Clean project, install dependencies & generate sources
45
rebuild:
56
flutter clean
6-
flutter packages pub get
7-
flutter packages pub run build_runner build --delete-conflicting-outputs
7+
flutter pub get
8+
flutter pub run build_runner build --delete-conflicting-outputs
89
fluttergen -c pubspec.yaml
910

10-
# generate localizations, dependencies, image assets, colors, fonts
11+
# Generate code with build_runner
1112
gen:
12-
flutter packages pub run build_runner build --delete-conflicting-outputs
13+
flutter pub run build_runner build --delete-conflicting-outputs
1314

14-
# generate localizations, dependencies, image assets, colors, fonts
15+
# Generate code and localizations
1516
genAll:
16-
flutter packages pub run build_runner build --delete-conflicting-outputs
17+
flutter pub run build_runner build --delete-conflicting-outputs
1718
flutter pub run intl_utils:generate
1819
fluttergen -c pubspec.yaml
1920

20-
# generate localizations
21+
# Generate localizations only
2122
localize:
2223
flutter pub run intl_utils:generate
2324

24-
# analyze the project
25+
# Analyze the project
2526
check:
2627
dart analyze .
2728
# flutter pub run dart_code_metrics:metrics analyze lib
2829

29-
# flavors
30+
# Run with flavors
3031
runDev:
3132
flutter run --flavor dev -t lib/main.dart
3233

@@ -39,17 +40,25 @@ runDevStaging:
3940
release:
4041
flutter run --release -t lib/main_prod.dart
4142

42-
prodRelease:
43+
runProdRelease:
4344
flutter run --flavor prod --release -t lib/main_prod.dart
4445

46+
# Build release APK
4547
apk:
46-
flutter build apk --release -t lib/main_prod.dart
48+
flutter build apk --flavor dev --release -t lib/main_prod.dart
4749

50+
# Build debug APK
51+
debug_apk:
52+
flutter build apk --flavor dev --debug -t lib/main_dev.dart
53+
54+
# Count lines of Dart code
4855
lines:
4956
find . -name '*.dart' | xargs wc -l
5057

58+
# Force upgrade packages
5159
force_upgrade:
5260
flutter update-packages --force-upgrade
5361

62+
# Run integration test
5463
integration_test:
5564
flutter test integration_test/app_test.dart --flavor dev

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ For example dev configuration for Android Studio looks like:
4444
<img src="/preview/config/dev.png" width="32%"/>
4545
</p>
4646

47+
- dev: --flavor dev -t lib/main_dev.dart
48+
4749
## Android Screenshots
4850
<p align="left">
4951
<img src="/preview/android/launches_android_dark_theme.png" width="32%"/>

android/app/build.gradle.kts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,17 @@ android {
3131
versionName = flutter.versionName
3232
}
3333

34+
// buildTypes {
35+
// release {
36+
// signingConfig = signingConfigs.debug
37+
// applicationVariants.all { variant ->
38+
// variant.outputs.all {
39+
// outputFileName = "${variant.buildType.name}-${variant.versionName}.apk"
40+
// }
41+
// }
42+
// }
43+
// }
44+
3445
flavorDimensions += "version"
3546
productFlavors {
3647
create("dev") {

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
33
zipStoreBase=GRADLE_USER_HOME
44
zipStorePath=wrapper/dists
5-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
5+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-all.zip

android/settings.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ pluginManagement {
1818

1919
plugins {
2020
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
21-
id("com.android.application") version "8.7.0" apply false
22-
id("org.jetbrains.kotlin.android") version "1.8.22" apply false
21+
id("com.android.application") version "8.11.1" apply false
22+
id("org.jetbrains.kotlin.android") version "2.2.0" apply false
2323
}
2424

2525
include(":app")

lib/repository/news_repository.dart

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

pubspec.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ dev_dependencies:
6565
mockito: ^5.4.5
6666
#test: ^1.17.9
6767
bloc_test: ^10.0.0
68-
flutter_lints: ^5.0.0
68+
flutter_lints: ^6.0.0
6969
mocktail: ^1.0.4
7070
freezed: ^3.0.2
7171
#dart_code_metrics: ^5.7.5

0 commit comments

Comments
 (0)