Skip to content

Commit dc60653

Browse files
CoderMikeHeCoderMikeHe
committed
调整发现和我模块icon
1 parent 054899e commit dc60653

File tree

6 files changed

+236
-220
lines changed

6 files changed

+236
-220
lines changed

‎ios/Podfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ DEPENDENCIES:
2424
- webview_flutter (from `.symlinks/plugins/webview_flutter/ios`)
2525

2626
SPEC REPOS:
27-
https://github.com/cocoapods/specs.git:
27+
https://github.com/CocoaPods/Specs.git:
2828
- FMDB
2929

3030
EXTERNAL SOURCES:
@@ -52,4 +52,4 @@ SPEC CHECKSUMS:
5252

5353
PODFILE CHECKSUM: 545ae53bd1d0bdac26cae6ddb8a02d47a0916981
5454

55-
COCOAPODS: 1.7.3
55+
COCOAPODS: 1.8.4

‎lib/model/common/common_item.dart‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:shared_preferences/shared_preferences.dart';
3+
import 'package:flutter_screenutil/flutter_screenutil.dart';
34

45
import 'package:flutter_wechat/constant/constant.dart';
56

@@ -14,13 +15,16 @@ class CommonItem {
1415
this.titleColor,
1516
this.subtitle = "",
1617
this.tapHighlight = true,
17-
this.padding = const EdgeInsets.all(Constant.pEdgeInset),
18+
this.padding = const EdgeInsets.symmetric(horizontal: 16),
1819
this.onTap,
1920
});
2021

2122
/// icon
2223
final String icon;
2324

25+
/// iconColor 主要针对svg default is null
26+
Color iconColor;
27+
2428
/// 主标题 default is ‘’
2529
final String title;
2630

@@ -33,8 +37,8 @@ class CommonItem {
3337
/// 点击高亮 default is true
3438
final bool tapHighlight;
3539

36-
/// item 内容边距 default is
37-
final EdgeInsetsGeometry padding;
40+
/// item 内容边距 default is const EdgeInsets.symmetric(horizontal: 16)
41+
EdgeInsetsGeometry padding;
3842

3943
/// 点击方法
4044
final CommonGestureTapCallback onTap;

‎lib/views/discover/discover_page.dart‎

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ class _DiscoverPageState extends State<DiscoverPage> {
3232
// 朋友圈
3333
final moments = CommonItem(
3434
title: '朋友圈',
35-
icon: Constant.assetsImages + "ff_IconShowAlbum_25x25.png",
35+
icon:
36+
Constant.assetsImagesDiscover + "icons_outlined_colorful_moment.svg",
3637
);
3738
final group0 = CommonGroup(
3839
items: [moments],
@@ -41,18 +42,25 @@ class _DiscoverPageState extends State<DiscoverPage> {
4142
// group1
4243
// 扫一扫
4344
final qrCode = CommonItem(
44-
title: "扫一扫", icon: Constant.assetsImages + "ff_IconQRCode_25x25.png");
45+
title: "扫一扫",
46+
icon: Constant.assetsImagesDiscover + "icons_outlined_scan.svg");
47+
qrCode.iconColor = Color(0xFF3d83e6);
4548
// 摇一摇
4649
final shake = CommonItem(
47-
title: "摇一摇", icon: Constant.assetsImages + "ff_IconShake_25x25.png");
50+
title: "摇一摇",
51+
icon: Constant.assetsImagesDiscover + "icons_outlined_shake.svg");
52+
shake.iconColor = Color(0xFF3d83e6);
53+
4854
final group1 = CommonGroup(
4955
items: [qrCode, shake],
5056
);
5157

5258
// group2
5359
// 看一看
5460
final look = CommonItem(
55-
title: "看一看", icon: Constant.assetsImages + "ff_IconBrowse1_25x25.png");
61+
title: "看一看",
62+
icon: Constant.assetsImagesDiscover + "icons_outlined_news.svg");
63+
look.iconColor = Color(0xFFF6C543);
5664
// 搜一搜
5765
final search = CommonItem(
5866
title: "搜一搜", icon: Constant.assetsImages + "ff_IconSearch1_25x25.png");
@@ -64,7 +72,8 @@ class _DiscoverPageState extends State<DiscoverPage> {
6472
// 附近的人
6573
final locationService = CommonItem(
6674
title: "附近的人",
67-
icon: Constant.assetsImages + "ff_IconLocationService_25x25.png");
75+
icon: Constant.assetsImagesDiscover + "icons_outlined_nearby.svg");
76+
locationService.iconColor = Color(0xFF3d83e6);
6877
// 漂流瓶
6978
final bottle = CommonItem(
7079
title: "漂流瓶", icon: Constant.assetsImages + "ff_IconBottle_25x25.png");
@@ -75,19 +84,27 @@ class _DiscoverPageState extends State<DiscoverPage> {
7584
// group4
7685
// 购物
7786
final shopping = CommonItem(
78-
title: "购物",
79-
icon: Constant.assetsImages + "CreditCard_ShoppingBag_25x25.png");
87+
title: "购物",
88+
icon: Constant.assetsImagesDiscover + "icons_outlined_shop.svg",
89+
);
90+
shopping.iconColor = Color(0xFFE75E58);
91+
8092
// 游戏
8193
final game = CommonItem(
82-
title: "游戏", icon: Constant.assetsImages + "MoreGame_25x25.png");
94+
title: "游戏",
95+
icon:
96+
Constant.assetsImagesDiscover + "icons_outlined_colorful_game.svg");
8397
final group4 = CommonGroup(
8498
items: [shopping, game],
8599
);
86100

87101
// group5
88102
// 小程序
89103
final moreApps = CommonItem(
90-
title: "小程序", icon: Constant.assetsImages + "MoreWeApp_25x25.png");
104+
title: "小程序",
105+
icon: Constant.assetsImagesDiscover + "icons_outlined_miniprogram.svg",
106+
);
107+
moreApps.iconColor = Color(0xFF6467e8);
91108
final group5 = CommonGroup(
92109
items: [moreApps],
93110
);

‎lib/views/profile/profile_page.dart‎

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,9 @@ class _ProfilePageState extends State<ProfilePage> {
3636
// 支付
3737
final pay = CommonItem(
3838
title: '支付',
39-
icon: Constant.assetsImages + "WeChatPay_25x25.png",
39+
icon: Constant.assetsImagesProfile + "icons_outlined_wechatpay.svg",
4040
);
41+
4142
final group0 = CommonGroup(
4243
items: [pay],
4344
headerHeight: 8.0,
@@ -46,18 +47,27 @@ class _ProfilePageState extends State<ProfilePage> {
4647
// group1
4748
// 收藏
4849
final collect = CommonItem(
49-
title: "收藏", icon: Constant.assetsImages + "MoreMyFavorites_25x25.png");
50+
title: "收藏",
51+
icon: Constant.assetsImagesProfile +
52+
"icons_outlined_colorful_favorites.svg",
53+
);
5054
// 相册
5155
final album = CommonItem(
52-
title: "相册", icon: Constant.assetsImages + "MoreMyAlbum_25x25.png");
56+
title: "相册",
57+
icon: Constant.assetsImagesProfile + "icons_outlined_album.svg",
58+
);
59+
album.iconColor = Color(0xFF3d83e6);
5360
// 卡包
5461
final card = CommonItem(
55-
title: "卡包",
56-
icon: Constant.assetsImages + "MyCardPackageIcon_25x25.png");
62+
title: "卡包",
63+
icon: Constant.assetsImagesProfile + "icons_outlined_colorful_cards.svg",
64+
);
5765
// 表情
5866
final expression = CommonItem(
59-
title: "表情",
60-
icon: Constant.assetsImages + "MoreExpressionShops_25x25.png");
67+
title: "表情",
68+
icon: Constant.assetsImagesProfile + "icons_outlined_sticker.svg",
69+
);
70+
expression.iconColor = Color(0xFFEDA150);
6171

6272
final group1 = CommonGroup(
6373
items: [collect, album, card, expression],
@@ -67,11 +77,13 @@ class _ProfilePageState extends State<ProfilePage> {
6777
// 设置
6878
final setting = CommonItem(
6979
title: "设置",
70-
icon: Constant.assetsImages + "MoreSetting_25x25.png",
80+
icon: Constant.assetsImagesProfile + "icons_outlined_setting.svg",
7181
onTap: (_) {
7282
NavigatorUtils.push(context, ProfileRouter.settingPage);
7383
},
7484
);
85+
setting.iconColor = Color(0xFF3d83e6);
86+
7587
final group2 = CommonGroup(
7688
items: [setting],
7789
);

0 commit comments

Comments
 (0)