Skip to content

Commit f7f1595

Browse files
Robert-StackflowRobert-Stackflow
committed
Fix sliding conflict issues;Memory window position and size
1 parent 28c5c44 commit f7f1595

File tree

109 files changed

+1396
-3892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

109 files changed

+1396
-3892
lines changed

‎lib/Models/illust.dart‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,9 @@ class Illust {
1818
required this.blogNickName,
1919
required this.part,
2020
});
21+
22+
@override
23+
String toString() {
24+
return 'Illust{originalName: $originalName, blogId: $blogId, blogLofterId: $blogLofterId, blogNickName: $blogNickName, part: $part, postId: $postId, url: $url, extension: $extension}';
25+
}
2126
}

‎lib/Screens/Info/collection_screen.dart‎

Lines changed: 65 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -177,75 +177,77 @@ class _CollectionScreenState extends State<CollectionScreen>
177177
double verticalPadding = 12,
178178
}) {
179179
List<String> tags = collection.tags.split(",");
180-
return GestureDetector(
181-
onTap: onTap,
182-
child: Container(
183-
color: Colors.transparent,
184-
padding:
185-
EdgeInsets.symmetric(vertical: verticalPadding, horizontal: 16),
186-
child: Column(
187-
children: [
188-
Row(
189-
children: [
190-
ClipRRect(
191-
borderRadius: BorderRadius.circular(8),
192-
child: ItemBuilder.buildCachedImage(
193-
context: context,
194-
imageUrl: collection.coverUrl,
195-
width: 80,
196-
height: 80,
197-
fit: BoxFit.cover,
198-
showLoading: false,
180+
return ItemBuilder.buildClickItem(
181+
GestureDetector(
182+
onTap: onTap,
183+
child: Container(
184+
color: Colors.transparent,
185+
padding:
186+
EdgeInsets.symmetric(vertical: verticalPadding, horizontal: 16),
187+
child: Column(
188+
children: [
189+
Row(
190+
children: [
191+
ClipRRect(
192+
borderRadius: BorderRadius.circular(8),
193+
child: ItemBuilder.buildCachedImage(
194+
context: context,
195+
imageUrl: collection.coverUrl,
196+
width: 80,
197+
height: 80,
198+
fit: BoxFit.cover,
199+
showLoading: false,
200+
),
199201
),
200-
),
201-
const SizedBox(width: 8),
202-
Expanded(
203-
child: SizedBox(
204-
height: 80,
205-
child: Column(
206-
mainAxisSize: MainAxisSize.max,
207-
mainAxisAlignment: MainAxisAlignment.spaceBetween,
208-
crossAxisAlignment: CrossAxisAlignment.start,
209-
children: [
210-
Text(
211-
collection.name,
212-
style: Theme.of(context).textTheme.titleMedium,
213-
maxLines: 1,
214-
overflow: TextOverflow.ellipsis,
215-
),
216-
Text(
217-
"${collection.postCount}篇 · 更新于${Utils.formatTimestamp(collection.lastPublishTime)}",
218-
style: Theme.of(context).textTheme.labelMedium,
219-
maxLines: 1,
220-
overflow: TextOverflow.ellipsis,
221-
),
222-
SizedBox(
223-
height: 20,
224-
child: ListView(
225-
scrollDirection: Axis.horizontal,
226-
cacheExtent: 9999,
227-
children: [
228-
...List.generate(
229-
tags.length,
230-
(index) => Container(
231-
margin: const EdgeInsets.only(right: 5),
232-
child: ItemBuilder.buildSmallTagItem(
233-
context,
234-
tags[index],
235-
showIcon: false,
202+
const SizedBox(width: 8),
203+
Expanded(
204+
child: SizedBox(
205+
height: 80,
206+
child: Column(
207+
mainAxisSize: MainAxisSize.max,
208+
mainAxisAlignment: MainAxisAlignment.spaceBetween,
209+
crossAxisAlignment: CrossAxisAlignment.start,
210+
children: [
211+
Text(
212+
collection.name,
213+
style: Theme.of(context).textTheme.titleMedium,
214+
maxLines: 1,
215+
overflow: TextOverflow.ellipsis,
216+
),
217+
Text(
218+
"${collection.postCount}篇 · 更新于${Utils.formatTimestamp(collection.lastPublishTime)}",
219+
style: Theme.of(context).textTheme.labelMedium,
220+
maxLines: 1,
221+
overflow: TextOverflow.ellipsis,
222+
),
223+
SizedBox(
224+
height: 20,
225+
child: ListView(
226+
scrollDirection: Axis.horizontal,
227+
cacheExtent: 9999,
228+
children: [
229+
...List.generate(
230+
tags.length,
231+
(index) => Container(
232+
margin: const EdgeInsets.only(right: 5),
233+
child: ItemBuilder.buildSmallTagItem(
234+
context,
235+
tags[index],
236+
showIcon: false,
237+
),
236238
),
237239
),
238-
),
239-
],
240+
],
241+
),
240242
),
241-
),
242-
],
243+
],
244+
),
243245
),
244246
),
245-
),
246-
],
247-
)
248-
],
247+
],
248+
)
249+
],
250+
),
249251
),
250252
),
251253
);

‎lib/Screens/Info/grain_screen.dart‎

Lines changed: 64 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -168,74 +168,76 @@ class _GrainScreenState extends State<GrainScreen>
168168
Function()? onTap,
169169
double verticalPadding = 12,
170170
}) {
171-
return GestureDetector(
172-
onTap: onTap,
173-
child: Container(
174-
color: Colors.transparent,
175-
padding:
176-
EdgeInsets.symmetric(vertical: verticalPadding, horizontal: 16),
177-
child: Column(
178-
children: [
179-
Row(
180-
children: [
181-
ClipRRect(
182-
borderRadius: BorderRadius.circular(8),
183-
child: ItemBuilder.buildCachedImage(
184-
context: context,
185-
imageUrl: grain.coverUrl,
186-
width: 80,
187-
height: 80,
188-
fit: BoxFit.cover,
189-
showLoading: false,
171+
return ItemBuilder.buildClickItem(
172+
GestureDetector(
173+
onTap: onTap,
174+
child: Container(
175+
color: Colors.transparent,
176+
padding:
177+
EdgeInsets.symmetric(vertical: verticalPadding, horizontal: 16),
178+
child: Column(
179+
children: [
180+
Row(
181+
children: [
182+
ClipRRect(
183+
borderRadius: BorderRadius.circular(8),
184+
child: ItemBuilder.buildCachedImage(
185+
context: context,
186+
imageUrl: grain.coverUrl,
187+
width: 80,
188+
height: 80,
189+
fit: BoxFit.cover,
190+
showLoading: false,
191+
),
190192
),
191-
),
192-
const SizedBox(width: 8),
193-
Expanded(
194-
child: SizedBox(
195-
height: 80,
196-
child: Column(
197-
mainAxisSize: MainAxisSize.max,
198-
mainAxisAlignment: MainAxisAlignment.spaceBetween,
199-
crossAxisAlignment: CrossAxisAlignment.start,
200-
children: [
201-
Text(
202-
grain.name,
203-
style: Theme.of(context).textTheme.titleMedium,
204-
maxLines: 1,
205-
overflow: TextOverflow.ellipsis,
206-
),
207-
Text(
208-
"${grain.postCount}篇 · 更新于${Utils.formatTimestamp(grain.updateTime)}",
209-
style: Theme.of(context).textTheme.labelMedium,
210-
maxLines: 1,
211-
overflow: TextOverflow.ellipsis,
212-
),
213-
SizedBox(
214-
height: 20,
215-
child: ListView(
216-
scrollDirection: Axis.horizontal,
217-
children: [
218-
...List.generate(
219-
grain.tags.length,
220-
(index) => Container(
221-
margin: const EdgeInsets.only(right: 5),
222-
child: ItemBuilder.buildSmallTagItem(
223-
context,
224-
grain.tags[index],
225-
showIcon: false,
193+
const SizedBox(width: 8),
194+
Expanded(
195+
child: SizedBox(
196+
height: 80,
197+
child: Column(
198+
mainAxisSize: MainAxisSize.max,
199+
mainAxisAlignment: MainAxisAlignment.spaceBetween,
200+
crossAxisAlignment: CrossAxisAlignment.start,
201+
children: [
202+
Text(
203+
grain.name,
204+
style: Theme.of(context).textTheme.titleMedium,
205+
maxLines: 1,
206+
overflow: TextOverflow.ellipsis,
207+
),
208+
Text(
209+
"${grain.postCount}篇 · 更新于${Utils.formatTimestamp(grain.updateTime)}",
210+
style: Theme.of(context).textTheme.labelMedium,
211+
maxLines: 1,
212+
overflow: TextOverflow.ellipsis,
213+
),
214+
SizedBox(
215+
height: 20,
216+
child: ListView(
217+
scrollDirection: Axis.horizontal,
218+
children: [
219+
...List.generate(
220+
grain.tags.length,
221+
(index) => Container(
222+
margin: const EdgeInsets.only(right: 5),
223+
child: ItemBuilder.buildSmallTagItem(
224+
context,
225+
grain.tags[index],
226+
showIcon: false,
227+
),
226228
),
227229
),
228-
),
229-
],
230+
],
231+
),
230232
),
231-
),
232-
],
233+
],
234+
),
233235
),
234236
),
235-
),
236-
],
237-
)
238-
],
237+
],
238+
)
239+
],
240+
),
239241
),
240242
),
241243
);

0 commit comments

Comments
 (0)