Skip to content

Commit eb7ca9a

Browse files
committed
fix: fix image accent & background color
* feat: add icon theme data to material app
1 parent f637c73 commit eb7ca9a

File tree

6 files changed

+20
-13
lines changed

6 files changed

+20
-13
lines changed

lib/app.dart

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,19 @@ class MyAppView extends StatelessWidget {
4747
theme: ThemeData(
4848
colorScheme: lightColorScheme,
4949
useMaterial3: true,
50-
).copyWith(dividerTheme: DividerThemeData(color: lightColorScheme.onSurface.withAlpha(45))),
50+
visualDensity: VisualDensity.standard,
51+
).copyWith(
52+
dividerTheme: DividerThemeData(color: lightColorScheme.onSurface.withAlpha(45)),
53+
iconTheme: IconThemeData(color: lightColorScheme.secondary),
54+
),
5155
darkTheme: ThemeData(
5256
colorScheme: darkColorScheme,
5357
useMaterial3: true,
54-
).copyWith(dividerTheme: DividerThemeData(color: darkColorScheme.onSurface.withAlpha(45))),
58+
visualDensity: VisualDensity.standard,
59+
).copyWith(
60+
dividerTheme: DividerThemeData(color: darkColorScheme.onSurface.withAlpha(45)),
61+
iconTheme: IconThemeData(color: darkColorScheme.secondary),
62+
),
5563
themeMode: state.themeMode,
5664
);
5765
},

lib/features/achieved/widget/achieved_wish_item_card.dart

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import 'dart:io';
33
import 'package:celenganku_app_clone/features/achieved/achieved.dart';
44
import 'package:celenganku_app_clone/features/achieved_detail/achieved_detail.dart';
55
import 'package:celenganku_app_clone/shared/shared.dart';
6-
import 'package:dynamic_color/dynamic_color.dart';
76
import 'package:flutter/material.dart';
87
import 'package:flutter_bloc/flutter_bloc.dart';
98

@@ -38,7 +37,7 @@ class AchievedWishItemCard extends StatelessWidget {
3837
aspectRatio: 16 / 9,
3938
child: Container(
4039
decoration: BoxDecoration(
41-
color: imagePath != null ? null : theme.colorScheme.primary,
40+
color: imagePath != null ? null : theme.colorScheme.surfaceVariant,
4241
image: imagePath != null
4342
? DecorationImage(
4443
image: FileImage(File(imagePath)),
@@ -53,7 +52,7 @@ class AchievedWishItemCard extends StatelessWidget {
5352
child: Icon(
5453
Icons.landscape_outlined,
5554
size: 100,
56-
color: theme.colorScheme.onPrimary,
55+
color: theme.colorScheme.primary,
5756
),
5857
),
5958
),

lib/features/achieved_detail/widget/achieved_detail_card.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class AchievedDetailCard extends StatelessWidget {
2424
aspectRatio: 16 / 9,
2525
child: Container(
2626
decoration: BoxDecoration(
27-
color: imagePath != null ? null : theme.colorScheme.primary,
27+
color: imagePath != null ? null : theme.colorScheme.surfaceVariant,
2828
image: imagePath != null
2929
? DecorationImage(
3030
image: FileImage(File(imagePath)),
@@ -39,7 +39,7 @@ class AchievedDetailCard extends StatelessWidget {
3939
child: Icon(
4040
Icons.landscape_outlined,
4141
size: 100,
42-
color: theme.colorScheme.onPrimary,
42+
color: theme.colorScheme.primary,
4343
),
4444
),
4545
),

lib/features/add_wish/widget/image_picker.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class ImagePicker extends StatelessWidget {
7272
child: SizedBox.expand(
7373
child: Material(
7474
shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(10)),
75-
color: imagePath != null ? Colors.transparent : theme.colorScheme.primary,
75+
color: imagePath != null ? Colors.transparent : theme.colorScheme.surfaceVariant,
7676
child: InkWell(
7777
borderRadius: BorderRadius.circular(10),
7878
onTap: () async {
@@ -88,7 +88,7 @@ class ImagePicker extends StatelessWidget {
8888
child: Icon(
8989
Icons.add_photo_alternate_outlined,
9090
size: 100,
91-
color: theme.colorScheme.onPrimary,
91+
color: theme.colorScheme.primary,
9292
),
9393
),
9494
),

lib/features/on_going/widget/wish_item_card.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ class WishItemCard extends StatelessWidget {
3636
aspectRatio: 16 / 9,
3737
child: Container(
3838
decoration: BoxDecoration(
39-
color: imagePath != null ? null : theme.colorScheme.primary,
39+
color: imagePath != null ? null : theme.colorScheme.surfaceVariant,
4040
image: imagePath != null
4141
? DecorationImage(
4242
image: FileImage(File(imagePath)),
@@ -51,7 +51,7 @@ class WishItemCard extends StatelessWidget {
5151
child: Icon(
5252
Icons.landscape_outlined,
5353
size: 100,
54-
color: theme.colorScheme.onPrimary,
54+
color: theme.colorScheme.primary,
5555
),
5656
),
5757
),

lib/features/wish_detail/widget/wish_detail_card.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class WishDetailCard extends StatelessWidget {
2424
aspectRatio: 16 / 9,
2525
child: Container(
2626
decoration: BoxDecoration(
27-
color: imagePath != null ? null : theme.colorScheme.primary,
27+
color: imagePath != null ? null : theme.colorScheme.surfaceVariant,
2828
image: imagePath != null
2929
? DecorationImage(
3030
image: FileImage(File(imagePath)),
@@ -39,7 +39,7 @@ class WishDetailCard extends StatelessWidget {
3939
child: Icon(
4040
Icons.landscape_outlined,
4141
size: 100,
42-
color: theme.colorScheme.onPrimary,
42+
color: theme.colorScheme.primary,
4343
),
4444
),
4545
),

0 commit comments

Comments
 (0)