Skip to content

Commit 2afdc9e

Browse files
committed
feat: Upgrade flutter version
1 parent 96d6681 commit 2afdc9e

File tree

7 files changed

+224
-184
lines changed

7 files changed

+224
-184
lines changed

.idx/dev.nix

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
{pkgs}: {
2+
channel = "stable-23.11";
3+
packages = [
4+
pkgs.nodePackages.firebase-tools
5+
pkgs.jdk17
6+
pkgs.unzip
7+
];
8+
idx.extensions = [
9+
10+
];
11+
idx.previews = {
12+
previews = {
13+
web = {
14+
command = [
15+
"flutter"
16+
"run"
17+
"--machine"
18+
"-d"
19+
"web-server"
20+
"--web-hostname"
21+
"0.0.0.0"
22+
"--web-port"
23+
"$PORT"
24+
];
25+
manager = "flutter";
26+
};
27+
android = {
28+
command = [
29+
"flutter"
30+
"run"
31+
"--machine"
32+
"-d"
33+
"android"
34+
"-d"
35+
"emulator-5554"
36+
];
37+
manager = "flutter";
38+
};
39+
};
40+
};
41+
}

android/app/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ android {
5050

5151
defaultConfig {
5252
applicationId "deepcolt.com.mituna"
53-
minSdkVersion 19
53+
minSdkVersion flutter.minSdkVersion
5454
targetSdkVersion flutter.targetSdkVersion
5555
versionCode flutterVersionCode.toInteger()
5656
versionName flutterVersionName

firebase.json

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1 @@
1-
{
2-
"functions": [
3-
{
4-
"source": "functions",
5-
"codebase": "default",
6-
"ignore": [
7-
"node_modules",
8-
".git",
9-
"firebase-debug.log",
10-
"firebase-debug.*.log"
11-
],
12-
"predeploy": [
13-
"npm --prefix \"$RESOURCE_DIR\" run lint",
14-
"npm --prefix \"$RESOURCE_DIR\" run build"
15-
]
16-
}
17-
]
18-
}
1+
{"functions":[{"source":"functions","codebase":"default","ignore":["node_modules",".git","firebase-debug.log","firebase-debug.*.log"],"predeploy":["npm --prefix \"$RESOURCE_DIR\" run lint","npm --prefix \"$RESOURCE_DIR\" run build"]}],"flutter":{"platforms":{"android":{"default":{"projectId":"mituna-ya-congo","appId":"1:513774495863:android:0b4493f6c0d4227fa6be72","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"mituna-ya-congo","configurations":{"android":"1:513774495863:android:0b4493f6c0d4227fa6be72","ios":"1:513774495863:ios:d4a2d4de8eebb15ba6be72"}}}}}}

lib/presentation/screens/settings/favorites_categories.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class FavoritesCategories extends HookConsumerWidget {
3434
category.title,
3535
style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold),
3636
),
37-
fillColor: MaterialStatePropertyAll(AppColors.kColorBlueRibbon),
37+
fillColor: WidgetStatePropertyAll(AppColors.kColorBlueRibbon),
3838
checkColor: AppColors.kColorYellow,
3939
onChanged: (value) {
4040
category.isFavorite = value ?? category.isFavorite;

lib/presentation/widgets/primary_button.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,10 @@ class PrimaryButton extends StatelessWidget {
3939
child: ElevatedButton(
4040
onPressed: onPressed,
4141
style: ButtonStyle(
42-
backgroundColor: MaterialStateProperty.all(backgroundColor),
43-
foregroundColor: MaterialStateProperty.all(foregroundColor),
44-
padding: MaterialStateProperty.all(padding),
45-
shape: MaterialStateProperty.all(
42+
backgroundColor: WidgetStateProperty.all(backgroundColor),
43+
foregroundColor: WidgetStateProperty.all(foregroundColor),
44+
padding: WidgetStateProperty.all(padding),
45+
shape: WidgetStateProperty.all(
4646
RoundedRectangleBorder(borderRadius: BorderRadius.circular(radius)),
4747
),
4848
),

0 commit comments

Comments
 (0)