diff --git a/CHANGELOG.md b/CHANGELOG.md index 59a85be17..dfe948fce 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ All notable changes to this project will be documented in this file. ### Changed +- logo - upgraded Flutter to stable v3.19.6 ### Fixed diff --git a/android/app/src/debug/res/values/colors.xml b/android/app/src/debug/res/values/colors.xml index 206921163..023cc2034 100644 --- a/android/app/src/debug/res/values/colors.xml +++ b/android/app/src/debug/res/values/colors.xml @@ -1,4 +1,4 @@ - #7B1FA2 + #815AFA \ No newline at end of file diff --git a/android/app/src/main/res/drawable-nodpi/banner.png b/android/app/src/main/res/drawable-nodpi/banner.png index c33433d6c..ac4ec599c 100644 Binary files a/android/app/src/main/res/drawable-nodpi/banner.png and b/android/app/src/main/res/drawable-nodpi/banner.png differ diff --git a/android/app/src/main/res/drawable-v21/ic_notification.xml b/android/app/src/main/res/drawable-v21/ic_notification.xml index a9fdcd46f..480be0b2c 100644 --- a/android/app/src/main/res/drawable-v21/ic_notification.xml +++ b/android/app/src/main/res/drawable-v21/ic_notification.xml @@ -4,23 +4,35 @@ android:viewportWidth="100" android:viewportHeight="100"> diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml index 0933093c4..aed5a0c30 100644 --- a/android/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/android/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,30 +1,38 @@ - - - - + android:width="100dp" + android:height="100dp" + android:viewportWidth="100" + android:viewportHeight="100"> + + + + diff --git a/android/app/src/main/res/drawable/ic_launcher_mono.xml b/android/app/src/main/res/drawable/ic_launcher_mono.xml index 738ecc287..553be0af1 100644 --- a/android/app/src/main/res/drawable/ic_launcher_mono.xml +++ b/android/app/src/main/res/drawable/ic_launcher_mono.xml @@ -3,30 +3,36 @@ android:height="100dp" android:viewportWidth="100" android:viewportHeight="100"> - - - - - - + + + + diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 18c76a697..7c532b798 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png index 644a73bb4..740704177 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 2764beb47..f9bbc54f3 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png index 6cccc47ff..c31695eae 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 7e9003c34..e3491dad8 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png index c70ef8f6b..8e5ee2bb1 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 70801fc46..51adec063 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png index 335d15d58..b11aeb86f 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 4f856ac51..8da583ba4 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png index 0552c72b5..8b7999bd8 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index 6e3fbd50f..a77f5f66a 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -3,5 +3,5 @@ #FFFFFF #FFFFFF #455A64 - #3f51b5 + #1cc8eb \ No newline at end of file diff --git a/android/app/src/profile/res/values/colors.xml b/android/app/src/profile/res/values/colors.xml index f5bfedf7c..9981f6cd3 100644 --- a/android/app/src/profile/res/values/colors.xml +++ b/android/app/src/profile/res/values/colors.xml @@ -1,4 +1,4 @@ - #D32F2F + #007A78 \ No newline at end of file diff --git a/aves_logo.svg b/aves_logo.svg index a3c89f30d..327ddbe1d 100644 --- a/aves_logo.svg +++ b/aves_logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/fastlane/metadata/android/ar/images/featureGraphic.png b/fastlane/metadata/android/ar/images/featureGraphic.png index 7204bd0d6..9bc5c9971 100644 Binary files a/fastlane/metadata/android/ar/images/featureGraphic.png and b/fastlane/metadata/android/ar/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/be/images/featureGraphic.png b/fastlane/metadata/android/be/images/featureGraphic.png index c1455009b..24e0a97c3 100644 Binary files a/fastlane/metadata/android/be/images/featureGraphic.png and b/fastlane/metadata/android/be/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/ca/images/featureGraphic.png b/fastlane/metadata/android/ca/images/featureGraphic.png old mode 100644 new mode 100755 index ad29dfe39..405897a43 Binary files a/fastlane/metadata/android/ca/images/featureGraphic.png and b/fastlane/metadata/android/ca/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/cs/images/featureGraphic.png b/fastlane/metadata/android/cs/images/featureGraphic.png old mode 100644 new mode 100755 index a0b3a3e77..c18ccc0a5 Binary files a/fastlane/metadata/android/cs/images/featureGraphic.png and b/fastlane/metadata/android/cs/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/de/images/featureGraphic.png b/fastlane/metadata/android/de/images/featureGraphic.png old mode 100644 new mode 100755 index a0b3a3e77..c18ccc0a5 Binary files a/fastlane/metadata/android/de/images/featureGraphic.png and b/fastlane/metadata/android/de/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/el/images/featureGraphic.png b/fastlane/metadata/android/el/images/featureGraphic.png index eaadbbef5..e5664dd9d 100644 Binary files a/fastlane/metadata/android/el/images/featureGraphic.png and b/fastlane/metadata/android/el/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/en-US/images/featureGraphic.png b/fastlane/metadata/android/en-US/images/featureGraphic.png old mode 100644 new mode 100755 index c3eeb06dc..1ccb76900 Binary files a/fastlane/metadata/android/en-US/images/featureGraphic.png and b/fastlane/metadata/android/en-US/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png index 3b7a936cc..2e75b0042 100644 Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/fastlane/metadata/android/es-MX/images/featureGraphic.png b/fastlane/metadata/android/es-MX/images/featureGraphic.png old mode 100644 new mode 100755 index 6bcf1d781..be1a1f7eb Binary files a/fastlane/metadata/android/es-MX/images/featureGraphic.png and b/fastlane/metadata/android/es-MX/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/eu/images/featureGraphic.png b/fastlane/metadata/android/eu/images/featureGraphic.png old mode 100644 new mode 100755 index ad29dfe39..405897a43 Binary files a/fastlane/metadata/android/eu/images/featureGraphic.png and b/fastlane/metadata/android/eu/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/fr/images/featureGraphic.png b/fastlane/metadata/android/fr/images/featureGraphic.png old mode 100644 new mode 100755 index a0b3a3e77..c18ccc0a5 Binary files a/fastlane/metadata/android/fr/images/featureGraphic.png and b/fastlane/metadata/android/fr/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/hu/images/featureGraphic.png b/fastlane/metadata/android/hu/images/featureGraphic.png index 00071b077..f3a5ff209 100644 Binary files a/fastlane/metadata/android/hu/images/featureGraphic.png and b/fastlane/metadata/android/hu/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/id/images/featureGraphic.png b/fastlane/metadata/android/id/images/featureGraphic.png index 11d0ca7af..293632231 100644 Binary files a/fastlane/metadata/android/id/images/featureGraphic.png and b/fastlane/metadata/android/id/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/is/images/featureGraphic.png b/fastlane/metadata/android/is/images/featureGraphic.png index d86ecedbc..2b65e244b 100644 Binary files a/fastlane/metadata/android/is/images/featureGraphic.png and b/fastlane/metadata/android/is/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/it/images/featureGraphic.png b/fastlane/metadata/android/it/images/featureGraphic.png index 3d0cd2b2e..6afae6d6e 100644 Binary files a/fastlane/metadata/android/it/images/featureGraphic.png and b/fastlane/metadata/android/it/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/ja/images/featureGraphic.png b/fastlane/metadata/android/ja/images/featureGraphic.png index 0b3824d0e..1d72a07d0 100644 Binary files a/fastlane/metadata/android/ja/images/featureGraphic.png and b/fastlane/metadata/android/ja/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/ko/images/featureGraphic.png b/fastlane/metadata/android/ko/images/featureGraphic.png old mode 100644 new mode 100755 index cb81a914d..a926db4f9 Binary files a/fastlane/metadata/android/ko/images/featureGraphic.png and b/fastlane/metadata/android/ko/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/lt/images/featureGraphic.png b/fastlane/metadata/android/lt/images/featureGraphic.png index eb0819532..d14be1c9e 100644 Binary files a/fastlane/metadata/android/lt/images/featureGraphic.png and b/fastlane/metadata/android/lt/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/nb-NO/images/featureGraphic.png b/fastlane/metadata/android/nb-NO/images/featureGraphic.png index e9e800f6b..2d8ec0710 100644 Binary files a/fastlane/metadata/android/nb-NO/images/featureGraphic.png and b/fastlane/metadata/android/nb-NO/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/nl/images/featureGraphic.png b/fastlane/metadata/android/nl/images/featureGraphic.png index ec6a7efdc..e692101ad 100644 Binary files a/fastlane/metadata/android/nl/images/featureGraphic.png and b/fastlane/metadata/android/nl/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/nn/images/featureGraphic.png b/fastlane/metadata/android/nn/images/featureGraphic.png index e9e800f6b..2d8ec0710 100644 Binary files a/fastlane/metadata/android/nn/images/featureGraphic.png and b/fastlane/metadata/android/nn/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/pl/images/featureGraphic.png b/fastlane/metadata/android/pl/images/featureGraphic.png old mode 100644 new mode 100755 index ad29dfe39..405897a43 Binary files a/fastlane/metadata/android/pl/images/featureGraphic.png and b/fastlane/metadata/android/pl/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/pt-BR/images/featureGraphic.png b/fastlane/metadata/android/pt-BR/images/featureGraphic.png old mode 100644 new mode 100755 index 677f87431..405897a43 Binary files a/fastlane/metadata/android/pt-BR/images/featureGraphic.png and b/fastlane/metadata/android/pt-BR/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/ro/images/featureGraphic.png b/fastlane/metadata/android/ro/images/featureGraphic.png old mode 100644 new mode 100755 index ad29dfe39..405897a43 Binary files a/fastlane/metadata/android/ro/images/featureGraphic.png and b/fastlane/metadata/android/ro/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/ru/images/featureGraphic.png b/fastlane/metadata/android/ru/images/featureGraphic.png old mode 100644 new mode 100755 index 5fa1a582a..ada0f6087 Binary files a/fastlane/metadata/android/ru/images/featureGraphic.png and b/fastlane/metadata/android/ru/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/sk/images/featureGraphic.png b/fastlane/metadata/android/sk/images/featureGraphic.png index 00071b077..f3a5ff209 100644 Binary files a/fastlane/metadata/android/sk/images/featureGraphic.png and b/fastlane/metadata/android/sk/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/tr/images/featureGraphic.png b/fastlane/metadata/android/tr/images/featureGraphic.png index 11d0ca7af..293632231 100644 Binary files a/fastlane/metadata/android/tr/images/featureGraphic.png and b/fastlane/metadata/android/tr/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/uk/images/featureGraphic.png b/fastlane/metadata/android/uk/images/featureGraphic.png old mode 100644 new mode 100755 index 5fa1a582a..ada0f6087 Binary files a/fastlane/metadata/android/uk/images/featureGraphic.png and b/fastlane/metadata/android/uk/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/vi/images/featureGraphic.png b/fastlane/metadata/android/vi/images/featureGraphic.png index e63150519..8529af752 100644 Binary files a/fastlane/metadata/android/vi/images/featureGraphic.png and b/fastlane/metadata/android/vi/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/zh-CN/images/featureGraphic.png b/fastlane/metadata/android/zh-CN/images/featureGraphic.png index 9b6d5510b..2194bc4e0 100644 Binary files a/fastlane/metadata/android/zh-CN/images/featureGraphic.png and b/fastlane/metadata/android/zh-CN/images/featureGraphic.png differ diff --git a/fastlane/metadata/android/zh-Hant/images/featureGraphic.png b/fastlane/metadata/android/zh-Hant/images/featureGraphic.png index 9b0a090c9..e5a223fd6 100644 Binary files a/fastlane/metadata/android/zh-Hant/images/featureGraphic.png and b/fastlane/metadata/android/zh-Hant/images/featureGraphic.png differ diff --git a/lib/theme/themes.dart b/lib/theme/themes.dart index 0cd22c883..6875c6ae0 100644 --- a/lib/theme/themes.dart +++ b/lib/theme/themes.dart @@ -61,6 +61,13 @@ class Themes { // COMPONENT THEMES checkboxTheme: _checkboxTheme(colors), floatingActionButtonTheme: _floatingActionButtonTheme(colors), + navigationRailTheme: NavigationRailThemeData( + backgroundColor: colors.background, + selectedIconTheme: IconThemeData(color: colors.primary), + unselectedIconTheme: IconThemeData(color: _unselectedWidgetColor(colors)), + selectedLabelTextStyle: TextStyle(color: colors.primary), + unselectedLabelTextStyle: TextStyle(color: _unselectedWidgetColor(colors)), + ), radioTheme: _radioTheme(colors), sliderTheme: _sliderTheme(colors), tooltipTheme: _tooltipTheme, diff --git a/lib/widgets/common/identity/aves_logo.dart b/lib/widgets/common/identity/aves_logo.dart index 2273ef3de..2c35137e2 100644 --- a/lib/widgets/common/identity/aves_logo.dart +++ b/lib/widgets/common/identity/aves_logo.dart @@ -38,10 +38,7 @@ class AvesLogo extends StatelessWidget { child: CircleAvatar( backgroundColor: Colors.white, radius: size / 2 - AvesBorder.curvedBorderWidth(context), - child: Padding( - padding: EdgeInsets.only(top: size / 15), - child: child, - ), + child: child, ), ); } @@ -54,74 +51,90 @@ class AvesLogoPainter extends CustomPainter { final strokePaint = Paint() ..style = PaintingStyle.stroke ..color = Colors.black - ..strokeWidth = dim * 2.346 + ..strokeWidth = dim * 3.050970 + ..strokeCap = StrokeCap.round ..strokeJoin = StrokeJoin.round; final path0 = Path(); - path0.moveTo(dim * 3.925, dim * 16.034); - path0.relativeLineTo(dim * 56.9, dim * 56.9); - path0.relativeArcToPoint(Offset(dim * 3.423, dim * 0), radius: Radius.circular(dim * 2.42), rotation: 0.001, clockwise: false); - path0.lineTo(dim * 74.852, dim * 62.33); - path0.relativeArcToPoint(Offset(dim * 0, dim * -9.601), radius: Radius.circular(dim * 6.79), rotation: 90.001, clockwise: false); - path0.lineTo(dim * 34.067, dim * 11.942); - path0.relativeArcToPoint(Offset(dim * -5.844, dim * -2.42), radius: Radius.circular(dim * 8.264), rotation: 22.5, clockwise: false); - path0.relativeLineTo(dim * -21.6, dim * 0); - path0.relativeArcToPoint(Offset(dim * -2.697, dim * 6.512), radius: Radius.circular(dim * 3.815), rotation: 112.5, clockwise: false); + path0.moveTo(31.784 * dim, 63.612 * dim); + path0.lineTo(48.252 * dim, 80.08 * dim); + final radius = Radius.elliptical(2.911 * dim, 2.911 * dim); + path0.arcToPoint(Offset(48.252 * dim, 84.196 * dim), radius: radius, rotation: 0, largeArc: false, clockwise: true); + path0.lineTo(40.379000000000005 * dim, 92.069 * dim); + path0.arcToPoint(Offset(19.072000000000006 * dim, 92.069 * dim), radius: Radius.elliptical(15.067 * dim, 15.067 * dim), rotation: 0, largeArc: false, clockwise: true); + path0.lineTo(11.2 * dim, 84.197 * dim); + path0.arcToPoint(Offset(11.2 * dim, 80.08 * dim), radius: radius, rotation: 0, largeArc: false, clockwise: true); + path0.lineTo(27.668 * dim, 63.611999999999995 * dim); + path0.arcToPoint(Offset(31.785 * dim, 63.611999999999995 * dim), radius: radius, rotation: 0, largeArc: false, clockwise: true); path0.close(); - Path path1 = Path(); - path1.moveTo(dim * 36.36, dim * 65.907); - path1.lineTo(dim * 36.36, dim * 94.65); - path1.relativeArcToPoint(Offset(dim * 4.364, dim * 1.808), radius: Radius.circular(dim * 2.557), rotation: 22.5, clockwise: false); - path1.relativeLineTo(dim * 13.093, dim * -13.094); - path1.relativeArcToPoint(Offset(dim * 0, dim * -8.728), radius: Radius.circular(dim * 6.172), rotation: 90, clockwise: false); - path1.lineTo(dim * 42.532, dim * 63.35); - path1.relativeArcToPoint(Offset(dim * -6.172, dim * 2.557), radius: Radius.circular(dim * 3.616), rotation: 157.5, clockwise: false); + final path1 = Path(); + path1.moveTo(56.368 * dim, 39.026 * dim); + path1.lineTo(72.837 * dim, 55.494 * dim); + final radius2 = Radius.elliptical(2.904 * dim, 2.904 * dim); + path1.arcToPoint(Offset(72.837 * dim, 59.611 * dim), radius: radius2, rotation: 0, largeArc: false, clockwise: true); + path1.lineTo(56.367000000000004 * dim, 76.079 * dim); + path1.arcToPoint(Offset(52.252 * dim, 76.079 * dim), radius: radius2, rotation: 0, largeArc: false, clockwise: true); + path1.lineTo(35.784 * dim, 59.611 * dim); + path1.arcToPoint(Offset(35.784 * dim, 55.495 * dim), radius: radius2, rotation: 0, largeArc: false, clockwise: true); + path1.lineTo(52.251999999999995 * dim, 39.027 * dim); + path1.arcToPoint(Offset(56.367999999999995 * dim, 39.027 * dim), radius: radius2, rotation: 0, largeArc: false, clockwise: true); path1.close(); - Path path2 = Path(); - path2.moveTo(dim * 79.653, dim * 40.078); - path2.lineTo(dim * 79.653, dim * 11.335); - path2.relativeArcToPoint(Offset(dim * -4.364, dim * -1.808), radius: Radius.circular(dim * 2.557), rotation: 22.5, clockwise: false); - path2.lineTo(dim * 62.195, dim * 22.62); - path2.relativeArcToPoint(Offset(dim * 0, dim * 8.729), radius: Radius.circular(dim * 6.172), rotation: 90, clockwise: false); - path2.relativeLineTo(dim * 11.286, dim * 11.285); - path2.relativeArcToPoint(Offset(dim * 6.172, dim * -2.556), radius: Radius.circular(dim * 3.616), rotation: 157.5, clockwise: false); + final path2 = Path(); + path2.moveTo(60.37 * dim, 30.908 * dim); + final radius4 = Radius.elliptical(2.91 * dim, 2.91 * dim); + path2.arcToPoint(Offset(60.37 * dim, 35.025 * dim), radius: radius4, rotation: 0, largeArc: false, clockwise: false); + path2.lineTo(76.838 * dim, 51.492 * dim); + path2.arcToPoint(Offset(80.954 * dim, 51.492 * dim), radius: radius4, rotation: 0, largeArc: false, clockwise: false); + path2.lineTo(97.422 * dim, 35.025 * dim); + path2.arcToPoint(Offset(97.422 * dim, 30.907999999999998 * dim), radius: radius4, rotation: 0, largeArc: false, clockwise: false); + path2.lineTo(89.24799999999999 * dim, 22.733999999999998 * dim); + path2.arcToPoint(Offset(68.54399999999998 * dim, 22.733999999999998 * dim), radius: Radius.elliptical(14.64 * dim, 14.64 * dim), rotation: 0, largeArc: false, clockwise: false); + path2.close(); + path2.moveTo(76.624 * dim, 30.695 * dim); + final radius5 = Radius.elliptical(3.213 * dim, 3.213 * dim); + path2.arcToPoint(Offset(81.167 * dim, 30.695 * dim), radius: radius5, rotation: 0, largeArc: false, clockwise: true); + path2.arcToPoint(Offset(81.167 * dim, 35.237 * dim), radius: radius5, rotation: 0, largeArc: false, clockwise: true); + path2.arcToPoint(Offset(76.624 * dim, 35.237 * dim), radius: radius5, rotation: 0, largeArc: false, clockwise: true); + path2.arcToPoint(Offset(76.624 * dim, 30.694000000000003 * dim), radius: radius5, rotation: 0, largeArc: false, clockwise: true); path2.close(); - Path path3 = Path(); - path3.moveTo(dim * 96.613, dim * 16.867); - path3.relativeLineTo(dim * -7.528, dim * -7.528); - path3.relativeArcToPoint(Offset(dim * -3.273, dim * 1.355), radius: Radius.circular(dim * 1.917), rotation: 157.5, clockwise: false); - path3.relativeLineTo(dim * 0, dim * 6.173); - path3.relativeArcToPoint(Offset(dim * 4.629, dim * 4.629), radius: Radius.circular(dim * 4.63), rotation: 45, clockwise: false); - path3.relativeLineTo(dim * 4.255, dim * 0); - path3.relativeArcToPoint(Offset(dim * 1.917, dim * -4.63), radius: Radius.circular(dim * 2.712), rotation: 112.5, clockwise: false); + final path3 = Path(); + path3.moveTo(24.305 * dim, 6.96 * dim); + path3.lineTo(48.35 * dim, 31.004 * dim); + path3.arcToPoint(Offset(48.35 * dim, 35.121 * dim), radius: radius, rotation: 0, largeArc: false, clockwise: true); + path3.lineTo(31.882 * dim, 51.588 * dim); + path3.arcToPoint(Offset(27.765 * dim, 51.588 * dim), radius: radius, rotation: 0, largeArc: false, clockwise: true); + path3.lineTo(17.084 * dim, 40.907 * dim); + path3.arcToPoint(Offset(17.084 * dim, 8.75 * dim), radius: Radius.elliptical(22.738 * dim, 22.738 * dim), rotation: 0, largeArc: false, clockwise: true); + path3.lineTo(18.874 * dim, 6.96 * dim); + path3.arcToPoint(Offset(24.305 * dim, 6.96 * dim), radius: Radius.elliptical(3.84 * dim, 3.84 * dim), rotation: 0, largeArc: false, clockwise: true); path3.close(); canvas.drawPath( - path0, - Paint() - ..style = PaintingStyle.fill - ..color = const Color(0xff3f51b5), - ); + path0, + Paint() + ..style = PaintingStyle.fill + ..color = const Color(0xffef435a)); + canvas.drawPath( - path1, - Paint() - ..style = PaintingStyle.fill - ..color = const Color(0xff4caf50), - ); + path1, + Paint() + ..style = PaintingStyle.fill + ..color = const Color(0xffe0e0e0)); + canvas.drawPath( - path2, - Paint() - ..style = PaintingStyle.fill - ..color = const Color(0xffffc107), - ); + path2, + Paint() + ..style = PaintingStyle.fill + ..color = const Color(0xffffc11f)); + canvas.drawPath( path3, Paint() ..style = PaintingStyle.fill - ..color = const Color(0xffff5722)); + ..color = const Color(0xff1cc8eb)); // stroke should be painted over fill canvas.drawPath(path0, strokePaint); diff --git a/lib/widgets/navigation/tv_rail.dart b/lib/widgets/navigation/tv_rail.dart index a8dbae57c..ff4c458f9 100644 --- a/lib/widgets/navigation/tv_rail.dart +++ b/lib/widgets/navigation/tv_rail.dart @@ -116,16 +116,18 @@ class _TvRailState extends State { ) : logo; + final railTheme = Theme.of(context).navigationRailTheme; + const double labelFontSize = 16; final rail = Focus( focusNode: _focusNode, skipTraversal: true, child: NavigationRail( - backgroundColor: Theme.of(context).colorScheme.background, extended: extended, destinations: navEntries .map((v) => NavigationRailDestination( icon: v.icon, label: v.label, + padding: const EdgeInsets.symmetric(vertical: 8), )) .toList(), selectedIndex: max(0, navEntries.indexWhere(((v) => v.isSelected))), @@ -133,6 +135,8 @@ class _TvRailState extends State { controller.focusedIndex = index; navEntries[index].onSelection(); }, + unselectedLabelTextStyle: railTheme.unselectedLabelTextStyle?.copyWith(fontSize: labelFontSize), + selectedLabelTextStyle: railTheme.selectedLabelTextStyle?.copyWith(fontSize: labelFontSize), minExtendedWidth: TvRail.minExtendedWidth, ), ); diff --git a/lib/widgets/viewer/info/info_page.dart b/lib/widgets/viewer/info/info_page.dart index 1ef8fd5da..95bfd9642 100644 --- a/lib/widgets/viewer/info/info_page.dart +++ b/lib/widgets/viewer/info/info_page.dart @@ -5,6 +5,7 @@ import 'package:aves/model/entry/extensions/multipage.dart'; import 'package:aves/model/events.dart'; import 'package:aves/model/filters/filters.dart'; import 'package:aves/model/selection.dart'; +import 'package:aves/model/settings/settings.dart'; import 'package:aves/model/source/collection_lens.dart'; import 'package:aves/theme/durations.dart'; import 'package:aves/widgets/common/basic/insets.dart'; @@ -264,10 +265,11 @@ class _InfoPageContentState extends State<_InfoPageContent> { metadataNotifier: _metadataNotifier, ), ), - SliverPadding( - padding: horizontalPadding + const EdgeInsets.only(bottom: 8), - sliver: ColorSectionSliver(entry: entry), - ), + if (!settings.useTvLayout) + SliverPadding( + padding: horizontalPadding + const EdgeInsets.only(bottom: 8), + sliver: ColorSectionSliver(entry: entry), + ), const BottomPaddingSliver(), ], ), diff --git a/test_driver/assets/shaders/aves_logo.svg b/test_driver/assets/shaders/aves_logo.svg index a3c89f30d..59d626928 100644 --- a/test_driver/assets/shaders/aves_logo.svg +++ b/test_driver/assets/shaders/aves_logo.svg @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file