diff --git a/lib/model/app/contributors.dart b/lib/model/app/contributors.dart index 35ed6a04a..a12902790 100644 --- a/lib/model/app/contributors.dart +++ b/lib/model/app/contributors.dart @@ -67,10 +67,10 @@ class Contributors { Contributor('Reza Almanda', 'rezaalmanda27@gmail.com'), Contributor('Sveinn í Felli', 'sv1@fellsnet.is'), Contributor('Henning Bunk', 'henningtbunk@gmail.com'), - // Contributor('SAMIRAH AIL', 'samiratalzahrani@gmail.com'), // Arabic - // Contributor('Salih Ail', 'rrrfff444@gmail.com'), // Arabic - // Contributor('nasreddineloukriz', 'nasreddineloukriz@gmail.com'), // Arabic - // Contributor('Mohamed Zeroug', 'mzeroug19@gmail.com'), // Arabic + Contributor('SAMIRAH AIL', 'samiratalzahrani@gmail.com'), + Contributor('Salih Ail', 'rrrfff444@gmail.com'), + Contributor('nasreddineloukriz', 'nasreddineloukriz@gmail.com'), + Contributor('Mohamed Zeroug', 'mzeroug19@gmail.com'), // Contributor('Alvi Khan', 'aveenalvi@gmail.com'), // Bengali // Contributor('Htet Oo Hlaing', 'htetoh2006@outlook.com'), // Burmese // Contributor('Khant', 'khant@users.noreply.hosted.weblate.org'), // Burmese diff --git a/lib/widgets/about/app_ref.dart b/lib/widgets/about/app_ref.dart index b5db10133..6fd99957f 100644 --- a/lib/widgets/about/app_ref.dart +++ b/lib/widgets/about/app_ref.dart @@ -48,7 +48,12 @@ class AppReference extends StatelessWidget { ), const SizedBox(width: 8), Text( - '${context.l10n.appName} ${device.packageVersion}', + context.l10n.appName, + style: _appTitleStyle, + ), + const SizedBox(width: 8), + Text( + device.packageVersion, style: _appTitleStyle, ), ], diff --git a/lib/widgets/about/licenses.dart b/lib/widgets/about/licenses.dart index f5a603673..4bdad8da7 100644 --- a/lib/widgets/about/licenses.dart +++ b/lib/widgets/about/licenses.dart @@ -132,7 +132,6 @@ class _LicenseRow extends StatelessWidget { child: LinkChip( text: package.name, urlString: package.sourceUrl, - textStyle: const TextStyle(fontWeight: FontWeight.bold), ), ); } diff --git a/lib/widgets/collection/entry_set_action_delegate.dart b/lib/widgets/collection/entry_set_action_delegate.dart index 6a0b9c49a..262424abf 100644 --- a/lib/widgets/collection/entry_set_action_delegate.dart +++ b/lib/widgets/collection/entry_set_action_delegate.dart @@ -84,7 +84,7 @@ class EntrySetActionDelegate with FeedbackMixin, PermissionAwareMixin, SizeAware case EntrySetAction.stats: return isMain; case EntrySetAction.rescan: - return !useTvLayout && isMain && !isTrash; + return !useTvLayout && isMain && !isTrash && isSelecting; // selecting case EntrySetAction.share: case EntrySetAction.toggleFavourite: diff --git a/lib/widgets/common/grid/selector.dart b/lib/widgets/common/grid/selector.dart index ba1eeb6cf..dc7058347 100644 --- a/lib/widgets/common/grid/selector.dart +++ b/lib/widgets/common/grid/selector.dart @@ -128,6 +128,8 @@ class _GridSelectionGestureDetectorState extends State, bool>((selection) => selection.isSelecting) ? (details) { + if (_isScrolling) return; + final item = _getItemAt(details.localPosition); if (item == null) return; diff --git a/lib/widgets/viewer/overlay/minimap.dart b/lib/widgets/viewer/overlay/minimap.dart index a29be6f86..5c63c5b20 100644 --- a/lib/widgets/viewer/overlay/minimap.dart +++ b/lib/widgets/viewer/overlay/minimap.dart @@ -1,6 +1,8 @@ import 'dart:math'; +import 'dart:ui'; import 'package:aves/model/view_state.dart'; +import 'package:aves/widgets/common/extensions/build_context.dart'; import 'package:aves/widgets/editor/transform/controller.dart'; import 'package:aves/widgets/editor/transform/transformation.dart'; import 'package:aves/widgets/viewer/overlay/top.dart'; @@ -36,6 +38,7 @@ class Minimap extends StatelessWidget { contentSize: contentSize, viewCenterOffset: viewState.position, viewScale: viewState.scale!, + alignmentX: context.isRtl ? 1 : 0, transformation: transformation, minimapBorderColor: ViewerTopOverlay.componentBorderColor, ), @@ -52,7 +55,7 @@ class Minimap extends StatelessWidget { class _MinimapPainter extends CustomPainter { final Size contentSize, viewportSize; final Offset viewCenterOffset; - final double viewScale; + final double viewScale, alignmentX; final Transformation? transformation; final Color minimapBorderColor; @@ -63,6 +66,7 @@ class _MinimapPainter extends CustomPainter { required this.contentSize, required this.viewCenterOffset, required this.viewScale, + required this.alignmentX, this.transformation, this.minimapBorderColor = Colors.white, }) { @@ -103,6 +107,8 @@ class _MinimapPainter extends CustomPainter { height: min(scaledContentSize.height, scaledViewportSize.height), ); + canvas.translate(lerpDouble(0, size.width - contentRect.width, alignmentX)!, 0); + Matrix4? transformMatrix; if (transformation != null) { final viewportCenter = viewportRect.center; diff --git a/untranslated.json b/untranslated.json index de583bf54..81143d62d 100644 --- a/untranslated.json +++ b/untranslated.json @@ -1,11 +1,4 @@ { - "be": [ - "columnCount", - "timeSeconds", - "timeMinutes", - "timeDays" - ], - "bn": [ "itemCount", "columnCount",