Skip to content

Commit 6e988a0

Browse files
niuhuanniuhuan
committed
⚡ 131
1 parent c14b9e9 commit 6e988a0

File tree

10 files changed

+149
-43
lines changed

10 files changed

+149
-43
lines changed

‎ci/version.code.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.2.2
1+
v1.3.1

‎ci/version.info.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
v1.3.1
2+
- [x] ✨长按标题复制
3+
- [x] ♻️显示分类和页数
4+
- [x] ♻️修复一点点不能显示的图片
5+
- [x] 🚀增加一些分流
6+
- [x] 🐛修复搜索错误
7+
18
v1.2.2
29
- [x] 🚀导出
310

‎ios/Podfile.lock‎

Lines changed: 54 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,64 @@
11
PODS:
2+
- DKImagePickerController/Core (4.3.4):
3+
- DKImagePickerController/ImageDataManager
4+
- DKImagePickerController/Resource
5+
- DKImagePickerController/ImageDataManager (4.3.4)
6+
- DKImagePickerController/PhotoGallery (4.3.4):
7+
- DKImagePickerController/Core
8+
- DKPhotoGallery
9+
- DKImagePickerController/Resource (4.3.4)
10+
- DKPhotoGallery (0.0.17):
11+
- DKPhotoGallery/Core (= 0.0.17)
12+
- DKPhotoGallery/Model (= 0.0.17)
13+
- DKPhotoGallery/Preview (= 0.0.17)
14+
- DKPhotoGallery/Resource (= 0.0.17)
15+
- SDWebImage
16+
- SwiftyGif
17+
- DKPhotoGallery/Core (0.0.17):
18+
- DKPhotoGallery/Model
19+
- DKPhotoGallery/Preview
20+
- SDWebImage
21+
- SwiftyGif
22+
- DKPhotoGallery/Model (0.0.17):
23+
- SDWebImage
24+
- SwiftyGif
25+
- DKPhotoGallery/Preview (0.0.17):
26+
- DKPhotoGallery/Model
27+
- DKPhotoGallery/Resource
28+
- SDWebImage
29+
- SwiftyGif
30+
- DKPhotoGallery/Resource (0.0.17):
31+
- SDWebImage
32+
- SwiftyGif
33+
- file_picker (0.0.1):
34+
- DKImagePickerController/PhotoGallery
35+
- Flutter
236
- Flutter (1.0.0)
337
- permission_handler_apple (9.1.0):
438
- Flutter
39+
- SDWebImage (5.18.3):
40+
- SDWebImage/Core (= 5.18.3)
41+
- SDWebImage/Core (5.18.3)
42+
- SwiftyGif (5.4.4)
543
- url_launcher_ios (0.0.1):
644
- Flutter
745

846
DEPENDENCIES:
47+
- file_picker (from `.symlinks/plugins/file_picker/ios`)
948
- Flutter (from `Flutter`)
1049
- permission_handler_apple (from `.symlinks/plugins/permission_handler_apple/ios`)
1150
- url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
1251

52+
SPEC REPOS:
53+
trunk:
54+
- DKImagePickerController
55+
- DKPhotoGallery
56+
- SDWebImage
57+
- SwiftyGif
58+
1359
EXTERNAL SOURCES:
60+
file_picker:
61+
:path: ".symlinks/plugins/file_picker/ios"
1462
Flutter:
1563
:path: Flutter
1664
permission_handler_apple:
@@ -19,10 +67,15 @@ EXTERNAL SOURCES:
1967
:path: ".symlinks/plugins/url_launcher_ios/ios"
2068

2169
SPEC CHECKSUMS:
70+
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
71+
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
72+
file_picker: ce3938a0df3cc1ef404671531facef740d03f920
2273
Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
2374
permission_handler_apple: 8f116445eff3c0e7c65ad60f5fef5490aa94b4e4
75+
SDWebImage: 96e0c18ef14010b7485210e92fac888587ebb958
76+
SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
2477
url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
2578

2679
PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
2780

28-
COCOAPODS: 1.11.3
81+
COCOAPODS: 1.12.1

‎ios/Runner.xcodeproj/project.pbxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@
159159
97C146E61CF9000F007C117D /* Project object */ = {
160160
isa = PBXProject;
161161
attributes = {
162-
LastUpgradeCheck = 1300;
162+
LastUpgradeCheck = 1430;
163163
ORGANIZATIONNAME = "";
164164
TargetAttributes = {
165165
97C146ED1CF9000F007C117D = {

‎ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1300"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎lib/configs/host.dart‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ import 'package:wax/basic/methods.dart';
55

66
const _defaultHost = "https://www.wnacg.com";
77
const _hostMap = {
8-
"https://www.wnacg.com": "MAIN",
9-
"https://www.htmanga9.top": "TOP9",
8+
"https://www.hm1.lol": "H1",
9+
"https://www.hm2.lol": "H2",
10+
"https://www.hm3.lol": "H3",
1011
};
1112

1213
late String host;
@@ -56,7 +57,7 @@ Widget hostSetting() {
5657
builder: (BuildContext context, void Function(void Function()) setState) {
5758
return ListTile(
5859
title: const Text("分流"),
59-
subtitle: Text("${_hostMap[host]} (登录注册不上试试换分流或改变网络)"),
60+
subtitle: Text("${currentHost()} (登录注册不上试试换分流或改变网络)"),
6061
onTap: () async {
6162
await chooseHost(context);
6263
setState(() {});

‎lib/screens/comic_info_screen.dart‎

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -161,12 +161,17 @@ class _ComicInfoScreenState extends State<ComicInfoScreen> {
161161
Container(height: 20),
162162
Container(
163163
margin: const EdgeInsets.only(left: 20, right: 20),
164-
child: Text(
165-
widget.comicSimple.title,
166-
textAlign: TextAlign.center,
167-
style: const TextStyle(
168-
fontSize: 18,
169-
fontWeight: FontWeight.bold,
164+
child: GestureDetector(
165+
onLongPress: () {
166+
confirmCopy(context, widget.comicSimple.title);
167+
},
168+
child: Text(
169+
widget.comicSimple.title,
170+
textAlign: TextAlign.center,
171+
style: const TextStyle(
172+
fontSize: 18,
173+
fontWeight: FontWeight.bold,
174+
),
170175
),
171176
),
172177
),
@@ -192,6 +197,13 @@ class _ComicInfoScreenState extends State<ComicInfoScreen> {
192197
)),
193198
),
194199
Container(height: 10),
200+
Container(
201+
margin: const EdgeInsets.only(left: 20, right: 20),
202+
child: Wrap(
203+
children: (item.comicInfo.labels.map(_buildLabel)).toList(),
204+
),
205+
),
206+
Container(height: 10),
195207
Container(
196208
margin: const EdgeInsets.only(left: 20, right: 20),
197209
child: Wrap(
@@ -283,6 +295,36 @@ class _ComicInfoScreenState extends State<ComicInfoScreen> {
283295
);
284296
}
285297

298+
Widget _buildLabel(String tag) {
299+
return GestureDetector(
300+
onTap: () {
301+
// Navigator.of(context)
302+
// .push(MaterialPageRoute(builder: (BuildContext context) {
303+
// return BrowserScreen(tag: tag);
304+
// }));
305+
},
306+
child: Card(
307+
elevation: 0,
308+
child: Text.rich(TextSpan(
309+
style: const TextStyle(fontSize: 10),
310+
children: [
311+
WidgetSpan(
312+
child: ClipRRect(
313+
borderRadius: const BorderRadius.all(Radius.circular(4.0)),
314+
child: Container(
315+
color: Colors.grey.withAlpha(20),
316+
padding: const EdgeInsets.only(
317+
top: 4, bottom: 4, left: 4, right: 4),
318+
child: Text(tag),
319+
),
320+
),
321+
),
322+
],
323+
)),
324+
),
325+
);
326+
}
327+
286328
Widget _buildTag(String tag) {
287329
return GestureDetector(
288330
onTap: () {

‎lib/screens/pro_screen.dart‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -202,6 +202,7 @@ class _ProServerNameWidgetState extends State<ProServerNameWidget> {
202202
context,
203203
title: "选择发电方式",
204204
values: {
205+
"核能发电": "JP",
205206
"风力发电": "HK",
206207
"水力发电": "US",
207208
},
@@ -218,6 +219,8 @@ class _ProServerNameWidgetState extends State<ProServerNameWidget> {
218219

219220
String _loadServerName() {
220221
switch (_serverName) {
222+
case "JP":
223+
return "核能发电";
221224
case "HK":
222225
return "风力发电";
223226
case "US":

‎pubspec.lock‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ packages:
1313
dependency: transitive
1414
description:
1515
name: async
16-
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
16+
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
1717
url: "https://pub.dev"
1818
source: hosted
19-
version: "2.10.0"
19+
version: "2.11.0"
2020
boolean_selector:
2121
dependency: transitive
2222
description:
@@ -29,10 +29,10 @@ packages:
2929
dependency: transitive
3030
description:
3131
name: characters
32-
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
32+
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
3333
url: "https://pub.dev"
3434
source: hosted
35-
version: "1.2.1"
35+
version: "1.3.0"
3636
clipboard:
3737
dependency: "direct main"
3838
description:
@@ -53,10 +53,10 @@ packages:
5353
dependency: transitive
5454
description:
5555
name: collection
56-
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
56+
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
5757
url: "https://pub.dev"
5858
source: hosted
59-
version: "1.17.0"
59+
version: "1.17.2"
6060
convert:
6161
dependency: "direct main"
6262
description:
@@ -193,18 +193,10 @@ packages:
193193
dependency: transitive
194194
description:
195195
name: intl
196-
sha256: "910f85bce16fb5c6f614e117efa303e85a1731bb0081edf3604a2ae6e9a3cc91"
197-
url: "https://pub.dev"
198-
source: hosted
199-
version: "0.17.0"
200-
js:
201-
dependency: transitive
202-
description:
203-
name: js
204-
sha256: "5528c2f391ededb7775ec1daa69e65a2d61276f7552de2b5f7b8d34ee9fd4ab7"
196+
sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d"
205197
url: "https://pub.dev"
206198
source: hosted
207-
version: "0.6.5"
199+
version: "0.18.1"
208200
lints:
209201
dependency: transitive
210202
description:
@@ -217,26 +209,26 @@ packages:
217209
dependency: transitive
218210
description:
219211
name: matcher
220-
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
212+
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
221213
url: "https://pub.dev"
222214
source: hosted
223-
version: "0.12.13"
215+
version: "0.12.16"
224216
material_color_utilities:
225217
dependency: transitive
226218
description:
227219
name: material_color_utilities
228-
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
220+
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
229221
url: "https://pub.dev"
230222
source: hosted
231-
version: "0.2.0"
223+
version: "0.5.0"
232224
meta:
233225
dependency: transitive
234226
description:
235227
name: meta
236-
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
228+
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
237229
url: "https://pub.dev"
238230
source: hosted
239-
version: "1.8.0"
231+
version: "1.9.1"
240232
modal_bottom_sheet:
241233
dependency: "direct main"
242234
description:
@@ -249,10 +241,10 @@ packages:
249241
dependency: transitive
250242
description:
251243
name: path
252-
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
244+
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
253245
url: "https://pub.dev"
254246
source: hosted
255-
version: "1.8.2"
247+
version: "1.8.3"
256248
path_drawing:
257249
dependency: transitive
258250
description:
@@ -358,10 +350,10 @@ packages:
358350
dependency: transitive
359351
description:
360352
name: source_span
361-
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
353+
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
362354
url: "https://pub.dev"
363355
source: hosted
364-
version: "1.9.1"
356+
version: "1.10.0"
365357
stack_trace:
366358
dependency: transitive
367359
description:
@@ -398,10 +390,10 @@ packages:
398390
dependency: transitive
399391
description:
400392
name: test_api
401-
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
393+
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
402394
url: "https://pub.dev"
403395
source: hosted
404-
version: "0.4.16"
396+
version: "0.6.0"
405397
typed_data:
406398
dependency: transitive
407399
description:
@@ -482,6 +474,14 @@ packages:
482474
url: "https://pub.dev"
483475
source: hosted
484476
version: "2.1.4"
477+
web:
478+
dependency: transitive
479+
description:
480+
name: web
481+
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
482+
url: "https://pub.dev"
483+
source: hosted
484+
version: "0.1.4-beta"
485485
win32:
486486
dependency: transitive
487487
description:
@@ -499,5 +499,5 @@ packages:
499499
source: hosted
500500
version: "6.2.2"
501501
sdks:
502-
dart: ">=2.19.0 <3.0.0"
502+
dart: ">=3.1.0-185.0.dev <4.0.0"
503503
flutter: ">=3.7.0"

‎pubspec.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
1515
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
1616
# Read more about iOS versioning at
1717
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
18-
version: 1.2.2+7
18+
version: 1.3.1+8
1919

2020
environment:
2121
sdk: ">=2.16.1 <3.0.0"

0 commit comments

Comments
 (0)