Skip to content

Commit 29572c2

Browse files
committed
another merge
2 parents d31e681 + 6b45f4e commit 29572c2

File tree

11 files changed

+321
-562
lines changed

11 files changed

+321
-562
lines changed

.fvmrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"flutter": "3.29.2"
3+
}

.github/workflows/flutterci.yml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,34 +17,34 @@ jobs:
1717
steps:
1818
# Step 1: Checkout the repository
1919
- uses: actions/checkout@v2
20-
20+
2121
# Step 2: Setup Java with version 12.x
2222
- uses: actions/setup-java@v1
2323
with:
24-
java-version: '12.x'
25-
24+
java-version: "17.x"
25+
2626
# Step 3: Setup Flutter with version 3.7.11
2727
- uses: subosito/flutter-action@v1
2828
with:
29-
flutter-version: '3.22.1'
30-
29+
flutter-version: "3.29.2"
30+
3131
# Step 4: Get dependencies using pub get
3232
- run: flutter pub get
33-
33+
3434
# Step 5: Analyze the code using flutter analyze
35-
- run: flutter analyze
36-
35+
- run: flutter analyze --no-fatal-warnings --no-fatal-infos
36+
3737
# Step 6: Format the code using flutter format (uncomment if needed)
3838
# - run: flutter format -n --set-exit-if-changed .
39-
39+
4040
# Step 7: Run tests using flutter test
4141
# - run: flutter test
42-
42+
4343
# Step 8: Build APK using flutter build apk
4444
- run: flutter build apk
45-
45+
4646
# Step 9: Upload the built APK as an artifact
47-
- uses: actions/upload-artifact@v3
47+
- uses: actions/upload-artifact@v4
4848
with:
4949
name: release-apk
5050
path: build/app/outputs/apk/release/app-release.apk

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,3 +45,6 @@ app.*.map.json
4545
/android/app/debug
4646
/android/app/profile
4747
/android/app/release
48+
49+
# FVM Version Cache
50+
.fvm/

.vscode/settings.json

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
2-
// "editor.minimap.enabled": false,
3-
"html.format.wrapAttributesIndentSize": 4,
4-
"[dart]": {
5-
"editor.tabSize": 4,
6-
"editor.insertSpaces": false,
7-
"editor.detectIndentation": true,
8-
"editor.suggest.insertMode": "replace",
9-
"editor.formatOnSave": true
10-
},
11-
"editor.formatOnSave": true,
12-
"editor.insertSpaces": false,
13-
"editor.detectIndentation": false,
14-
"editor.tabSize": 4,
15-
"editor.codeActionsOnSave": {
16-
"source.fixAll": "explicit"
17-
},
18-
"java.configuration.updateBuildConfiguration": "interactive"
2+
"html.format.wrapAttributesIndentSize": 4,
3+
"[dart]": {
4+
"editor.tabSize": 4,
5+
"editor.insertSpaces": false,
6+
"editor.detectIndentation": true,
7+
"editor.suggest.insertMode": "replace",
8+
"editor.formatOnSave": true
9+
},
10+
"editor.formatOnSave": true,
11+
"editor.insertSpaces": false,
12+
"editor.detectIndentation": false,
13+
"editor.tabSize": 4,
14+
"editor.codeActionsOnSave": {
15+
"source.fixAll": "explicit"
16+
},
17+
"java.configuration.updateBuildConfiguration": "interactive",
18+
"dart.flutterSdkPath": ".fvm/versions/3.29.2"
1919
}

lib/app/modules/profile/views/deleteprofiledialog.dart

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,15 @@ class DeleteProfileDialog extends StatelessWidget {
1111
const DeleteProfileDialog({
1212
required this.profile,
1313
required this.context,
14+
required this.profiles,
15+
required this.profileName,
1416
super.key,
1517
});
1618

1719
final String profile;
1820
final BuildContext context;
19-
21+
final RxMap<dynamic, dynamic> profiles;
22+
final String? profileName;
2023
@override
2124
Widget build(BuildContext context) {
2225
TaskwarriorColorTheme tColors = Theme.of(context).extension<TaskwarriorColorTheme>()!;
@@ -26,10 +29,9 @@ class DeleteProfileDialog extends StatelessWidget {
2629
child: Utils.showAlertDialog(
2730
scrollable: true,
2831
title: Text(
29-
SentenceManager(
30-
currentLanguage: AppSettings.selectedLanguage)
31-
.sentences
32-
.profilePageDeleteProfile,
32+
SentenceManager(currentLanguage: AppSettings.selectedLanguage)
33+
.sentences
34+
.profilePageDeleteProfile,
3335
style: TextStyle(
3436
color: tColors.primaryTextColor,
3537
),
@@ -38,7 +40,8 @@ class DeleteProfileDialog extends StatelessWidget {
3840
actions: [
3941
TextButton(
4042
onPressed: () {
41-
// Navigator.of(context).pop();
43+
debugPrint("PROFILE$profile${profileName!}");
44+
profiles[profile] = profileName;
4245
Get.back();
4346
},
4447
child: Text(

lib/app/modules/profile/views/manageprofile.dart

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

0 commit comments

Comments
 (0)