diff --git a/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk b/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk index 97d5376..668ac45 100644 Binary files a/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk and b/build/app/outputs/flutter-apk/app-arm64-v8a-release.apk differ diff --git a/lib/widgets/card_game/card_game_page.dart b/lib/widgets/card_game/card_game_page.dart index 6887a6f..65fb2a5 100644 --- a/lib/widgets/card_game/card_game_page.dart +++ b/lib/widgets/card_game/card_game_page.dart @@ -157,6 +157,7 @@ class _CardGamePageState extends State { left: 10.0.w, right: 10.0.w, bottom: 10.0.h, + top: 10.0.h, ), child: Row( children: [ diff --git a/lib/widgets/card_pack/cards_view.dart b/lib/widgets/card_pack/cards_view.dart index 3357ed9..c9da2a8 100644 --- a/lib/widgets/card_pack/cards_view.dart +++ b/lib/widgets/card_pack/cards_view.dart @@ -223,6 +223,7 @@ class _CardBuilder extends StatelessWidget { animation: a, builder: (context, child) => GameCardDecoration( alpha: a.value, + borderColor: cardPack.color?.asColor, child: FrontCard( card, card.memoryImage!, diff --git a/lib/widgets/game_card_widget.dart b/lib/widgets/game_card_widget.dart index 6621add..02efea9 100644 --- a/lib/widgets/game_card_widget.dart +++ b/lib/widgets/game_card_widget.dart @@ -200,8 +200,8 @@ class FrontCard extends StatelessWidget { if (constrains.maxHeight.isInfinite) { ar = 16 / 9; } - final textScale = min(1.0, ar / targetTextAr) * alpha; - final imageScale = min(1.0, pow(ar / targetImageAr, 1.5 * alpha)); + final textScale = min(1.0, ar / targetTextAr) * alpha * alpha; + final imageScale = 0.9 * min(1.0, pow(ar / targetImageAr, 1.5 * alpha)); return Material( borderOnForeground: false, type: MaterialType.transparency, @@ -310,6 +310,7 @@ class FrontCard extends StatelessWidget { syncDuration: Duration.zero, ), ), + if (card.mnemo?.isNotEmpty == true) GestureDetector( onTap: () async { final sp = await SharedPreferences.getInstance();