Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #683 (bangumi cards text overflow) #686

Merged
merged 15 commits into from
Feb 6, 2025
Merged

Fix #683 (bangumi cards text overflow) #686

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1e2ab29
Clip overflow sections for bangumi cards
garylkz Feb 1, 2025
2ea6a22
Merge branch 'Predidit:main' into main
garylkz Feb 1, 2025
58c3b86
TextScale to prevent overflow instead
garylkz Feb 1, 2025
9b77ddf
Merge branch 'Predidit:main' into main
garylkz Feb 1, 2025
37182e4
Merge remote-tracking branch 'origin/main'
garylkz Feb 1, 2025
d846618
Added back & simplified bangumi cards' padding
garylkz Feb 2, 2025
08cf041
Added text alignment to bangumi card
garylkz Feb 2, 2025
e467791
Replaced `RichText` with `Text` for simplicity and readability
garylkz Feb 3, 2025
75aac0d
Made BangumiHistoryCardV height scale by resolution
garylkz Feb 3, 2025
c9e4450
Removed unused lines
garylkz Feb 3, 2025
9904fe0
Use wrap chips instead of column texts to conserve space
garylkz Feb 5, 2025
a323fe5
Fixed wrap chips run spacing issue on mobile
garylkz Feb 5, 2025
ea20b6a
Calculate `mainAxisExtent` with font style
garylkz Feb 5, 2025
ad0fba5
Changes again in favor of Wrap-Chip design
garylkz Feb 6, 2025
2f096ca
Updated UI colors and parameter type handling, removed unused functions
garylkz Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 17 additions & 24 deletions lib/bean/card/bangumi_card.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
import 'package:flutter/material.dart';
import 'package:flutter_modular/flutter_modular.dart';
import 'package:kazumi/bean/card/network_img_layer.dart';
import 'package:kazumi/bean/dialog/dialog_helper.dart';
import 'package:kazumi/utils/constants.dart';
import 'package:kazumi/utils/utils.dart';
import 'package:kazumi/modules/bangumi/bangumi_item.dart';
import 'package:kazumi/bean/card/network_img_layer.dart';
import 'package:kazumi/pages/info/info_controller.dart';
import 'package:kazumi/pages/popular/popular_controller.dart';
import 'package:kazumi/utils/constants.dart';
import 'package:kazumi/utils/utils.dart';

// 视频卡片 - 垂直布局
class BangumiCardV extends StatelessWidget {
Expand Down Expand Up @@ -52,6 +52,7 @@ class BangumiCardV extends StatelessWidget {
Modular.to.pushNamed('/info/');
},
child: Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
ClipRRect(
borderRadius: const BorderRadius.only(
Expand Down Expand Up @@ -93,32 +94,24 @@ class BangumiContent extends StatelessWidget {

@override
Widget build(BuildContext context) {
final ts = MediaQuery.textScalerOf(context);

return Expanded(
child: Padding(
// 多列
padding: const EdgeInsets.fromLTRB(5, 3, 5, 0),
padding: const EdgeInsets.fromLTRB(5, 3, 5, 1),
// 单列
// padding: const EdgeInsets.fromLTRB(14, 10, 4, 8),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Row(
children: [
Expanded(
child: Text(
bangumiItem.nameCn,
textAlign: TextAlign.start,
style: const TextStyle(
fontWeight: FontWeight.w500,
letterSpacing: 0.3,
),
maxLines: Utils.isDesktop() || Utils.isTablet() ? 3 : 2,
overflow: TextOverflow.ellipsis,
)),
],
),
const SizedBox(height: 1),
],
child: Text(
bangumiItem.nameCn,
textAlign: TextAlign.start,
style: const TextStyle(
fontWeight: FontWeight.w500,
letterSpacing: 0.3,
),
textScaler: ts.clamp(maxScaleFactor: 1.1),
maxLines: Utils.isDesktop() || Utils.isTablet() ? 3 : 2,
overflow: TextOverflow.ellipsis,
),
),
);
Expand Down
Loading
Loading