Skip to content

Commit 35cdad5

Browse files
committed
去掉联系人页的测试代码
1 parent aa2f904 commit 35cdad5

File tree

2 files changed

+11
-18
lines changed

2 files changed

+11
-18
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/views/contacts/contacts_page.dart

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ class _ContactsPageState extends State<ContactsPage> {
351351
key: Key(title),
352352
controller: _slidableController,
353353
dismissal: SlidableDismissal(
354-
closeOnCanceled: true,
354+
closeOnCanceled: false,
355355
dragDismissible: true,
356356
child: SlidableDrawerDismissal(),
357357
onWillDismiss: (actionType) {
@@ -565,7 +565,9 @@ class _ContactsPageState extends State<ContactsPage> {
565565
Color color;
566566
if (INDEX_DATA_0.indexOf(tag) != -1) {
567567
// 灰
568-
color = Color(0xFFC9C9C9);
568+
// color = Color(0xFFC9C9C9);
569+
// 黄
570+
color = Color(0xFFFFC300);
569571
} else if (INDEX_DATA_1.indexOf(tag) != -1) {
570572
// 红
571573
color = Color(0xFFFA5151);
@@ -579,11 +581,6 @@ class _ContactsPageState extends State<ContactsPage> {
579581
if (indexModel.tag == tag) {
580582
return IGNORE_TAGS.indexOf(tag) != -1 ? Colors.transparent : color;
581583
}
582-
583-
//
584-
if (tag == 'D' || tag == 'L' || tag == 'T' || tag == 'Z') {
585-
return color;
586-
}
587584
return Colors.transparent;
588585
}
589586

@@ -592,8 +589,8 @@ class _ContactsPageState extends State<ContactsPage> {
592589
Color textColor;
593590
Color selTextColor;
594591
if (INDEX_DATA_0.indexOf(tag) != -1) {
595-
// 浅黑
596-
textColor = Color(0xFF555555);
592+
// 浅黑 Color(0xFF555555)
593+
textColor = Color(0xFFFFC300);
597594
selTextColor = Colors.white;
598595
} else if (INDEX_DATA_1.indexOf(tag) != -1) {
599596
// 红色
@@ -618,7 +615,7 @@ class _ContactsPageState extends State<ContactsPage> {
618615
// 返回映射的部件
619616
return new SvgPicture.asset(
620617
Constant.assetsImagesSearch + 'icons_filled_search.svg',
621-
color: Color(0xFF555555),
618+
color: Color(0xFFFFC300),
622619
width: 12,
623620
height: 12,
624621
);
@@ -676,9 +673,7 @@ class _ContactsPageState extends State<ContactsPage> {
676673
textAlign: TextAlign.center,
677674
style: TextStyle(
678675
fontSize: 10.0,
679-
color: (tag == 'D' || tag == 'L' || tag == 'T' || tag == 'Z')
680-
? selTextColor
681-
: textColor,
676+
color: textColor,
682677
fontWeight: FontWeight.w500,
683678
),
684679
);
@@ -751,8 +746,6 @@ class _ContactsPageState extends State<ContactsPage> {
751746
final List<String> ignoreTags = [];
752747
return ignoreTags.indexOf(tag) != -1 ? true : !indexModel.isTouchDown;
753748
}
754-
return (tag == 'D' || tag == 'L' || tag == 'T' || tag == 'Z')
755-
? false
756-
: true;
749+
return true;
757750
}
758751
}

0 commit comments

Comments
 (0)