这是indexloc提供的服务，不要输入任何密码
Skip to content

fix: add constraint for MediaList #573

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

Merged
merged 1 commit into from
Mar 15, 2025
Merged

fix: add constraint for MediaList #573

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 1 addition & 12 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,30 +159,19 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Get changed i18n files
id: changed-i18n-files
uses: tj-actions/changed-files@v45
with:
files: lib/i18n/aria/*.i18n.yaml

- name: Install Flutter
if: steps.changed-i18n-files.outputs.any_changed == 'true'
uses: subosito/flutter-action@v2
with:
channel: 'stable'
flutter-version: ${{ needs.get-flutter-version.outputs.flutter-version }}
cache: true

- name: Get dependencies
if: steps.changed-i18n-files.outputs.any_changed == 'true'
run: flutter pub get

- name: Sort i18n files
if: steps.changed-i18n-files.outputs.any_changed == 'true'
env:
ALL_CHANGED_FILES: ${{ steps.changed-i18n-files.outputs.all_changed_files }}
run: |
for file in $ALL_CHANGED_FILES; do
for file in $(ls lib/i18n/aria/*.i18n.yaml); do
dart run script/sort_yaml.dart $file
done

Expand Down
134 changes: 73 additions & 61 deletions lib/view/widget/media_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class MediaList extends ConsumerWidget {
return ConstrainedBox(
constraints: BoxConstraints(
minWidth: double.infinity,
minHeight: 64.0,
minHeight: 90.0,
maxHeight: minAspectRatio > 0.0 ? double.infinity : 360.0,
),
child: AspectRatio(
Expand All @@ -66,75 +66,87 @@ class MediaList extends ConsumerWidget {
),
);
case 2:
return AspectRatio(
aspectRatio: 16 / 9,
child: Row(
children: [
Expanded(
child: MediaCard(
account: account,
files: files,
index: 0,
user: user,
fit: fit,
return ConstrainedBox(
constraints: const BoxConstraints(
minWidth: double.infinity,
minHeight: 90.0,
),
child: AspectRatio(
aspectRatio: 16 / 9,
child: Row(
children: [
Expanded(
child: MediaCard(
account: account,
files: files,
index: 0,
user: user,
fit: fit,
),
),
),
const SizedBox(width: 4.0),
Expanded(
child: MediaCard(
account: account,
files: files,
index: 1,
user: user,
fit: fit,
const SizedBox(width: 4.0),
Expanded(
child: MediaCard(
account: account,
files: files,
index: 1,
user: user,
fit: fit,
),
),
),
],
],
),
),
);
case 3:
return AspectRatio(
aspectRatio: 16 / 9,
child: Row(
children: [
Expanded(
flex: 3,
child: MediaCard(
account: account,
files: files,
index: 0,
user: user,
fit: fit,
return ConstrainedBox(
constraints: const BoxConstraints(
minWidth: double.infinity,
minHeight: 180.0,
),
child: AspectRatio(
aspectRatio: 16 / 9,
child: Row(
children: [
Expanded(
flex: 3,
child: MediaCard(
account: account,
files: files,
index: 0,
user: user,
fit: fit,
),
),
),
const SizedBox(width: 4.0),
Expanded(
flex: 2,
child: Column(
children: [
Expanded(
child: MediaCard(
account: account,
files: files,
index: 1,
user: user,
fit: fit,
const SizedBox(width: 4.0),
Expanded(
flex: 2,
child: Column(
children: [
Expanded(
child: MediaCard(
account: account,
files: files,
index: 1,
user: user,
fit: fit,
),
),
),
const SizedBox(height: 4.0),
Expanded(
child: MediaCard(
account: account,
files: files,
index: 2,
user: user,
fit: fit,
const SizedBox(height: 4.0),
Expanded(
child: MediaCard(
account: account,
files: files,
index: 2,
user: user,
fit: fit,
),
),
),
],
],
),
),
),
],
],
),
),
);
default:
Expand Down
Loading