diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c19b98b3..0933af4d 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -159,14 +159,7 @@ 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' @@ -174,15 +167,11 @@ jobs: 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 diff --git a/lib/view/widget/media_list.dart b/lib/view/widget/media_list.dart index 568028cc..a3e5c990 100644 --- a/lib/view/widget/media_list.dart +++ b/lib/view/widget/media_list.dart @@ -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( @@ -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: