From 8c56c9536a17e88834a9d18db3d0bd92f3d67881 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Thu, 3 Mar 2022 09:18:43 +0100 Subject: [PATCH] Reorganize and rename image assets (#712) - organize image assets into subdirs named after pages to make it clear where each image is used - use more generic and flavor-friendly asset names that don't assume the content (e.g. "mascot" -> "logo") of the vanilla image assets Ref: #700 Ref: ubuntu-mate/ubuntu-mate-installer#1 --- .../ubuntu_desktop_installer/assets/2.0x/rst.png | Bin 7460 -> 0 bytes .../dark-theme.png} | Bin .../light-theme.png} | Bin .../logo.png} | Bin .../background.png | Bin .../icons/access.png | Bin .../icons/chromium.png | Bin .../icons/firefox.png | Bin .../icons/gimp.png | Bin .../icons/languages.png | Bin .../icons/libreoffice-calc.png | Bin .../icons/libreoffice-impress.png | Bin .../icons/libreoffice-writer.png | Bin .../icons/rhythmbox.png | Bin .../icons/shotcut.png | Bin .../icons/shotwell.png | Bin .../icons/spotify.png | Bin .../icons/themes.png | Bin .../icons/thunderbird.png | Bin .../icons/vlc.png | Bin .../screenshots/music.png | Bin .../screenshots/office.png | Bin .../screenshots/photos.png | Bin .../screenshots/settings.png | Bin .../screenshots/software.png | Bin .../screenshots/web.png | Bin .../{slides => installation_slides}/welcome.png | Bin .../ubuntu.svg} | 0 .../{ => try_or_install}/2.0x/hard-drive.png | Bin .../{ => try_or_install}/2.0x/repair-wrench.png | Bin .../{ => try_or_install}/2.0x/steering-wheel.png | Bin .../assets/{ => try_or_install}/hard-drive.png | Bin .../{ => try_or_install}/repair-wrench.png | Bin .../{ => try_or_install}/steering-wheel.png | Bin .../qr-code.svg} | 0 .../assets/{rst.svg => turn_off_rst/qr-code.svg} | 0 .../{mascot_white.svg => welcome/logo.svg} | 0 .../ubuntu_desktop_installer/lib/installer.dart | 2 +- .../lib/pages/choose_your_look_page.dart | 4 ++-- .../installation_complete_page.dart | 2 +- .../installation_slides_model.dart | 2 +- .../select_guided_storage_page.dart | 2 +- .../try_or_install/try_or_install_page.dart | 8 +++++--- .../turn_off_bitlocker_page.dart | 2 +- .../pages/turn_off_rst/turn_off_rst_page.dart | 2 +- .../lib/pages/welcome/welcome_page.dart | 2 +- .../lib/slides/default_slides.dart | 7 ++++--- packages/ubuntu_desktop_installer/pubspec.yaml | 13 ++++++++++--- .../choose_your_look_page_test.dart | 4 ++-- 49 files changed, 30 insertions(+), 20 deletions(-) delete mode 100644 packages/ubuntu_desktop_installer/assets/2.0x/rst.png rename packages/ubuntu_desktop_installer/assets/{Theme_thumbnails-Dark.png => choose_your_look/dark-theme.png} (100%) rename packages/ubuntu_desktop_installer/assets/{Theme_thumbnails-Light.png => choose_your_look/light-theme.png} (100%) rename packages/ubuntu_desktop_installer/assets/{version.png => installation_complete/logo.png} (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/background.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/access.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/chromium.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/firefox.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/gimp.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/languages.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/libreoffice-calc.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/libreoffice-impress.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/libreoffice-writer.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/rhythmbox.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/shotcut.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/shotwell.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/spotify.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/themes.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/thunderbird.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/icons/vlc.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/screenshots/music.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/screenshots/office.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/screenshots/photos.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/screenshots/settings.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/screenshots/software.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/screenshots/web.png (100%) rename packages/ubuntu_desktop_installer/assets/{slides => installation_slides}/welcome.png (100%) rename packages/ubuntu_desktop_installer/assets/{cof_orange_hex.svg => select_guided_storage/ubuntu.svg} (100%) rename packages/ubuntu_desktop_installer/assets/{ => try_or_install}/2.0x/hard-drive.png (100%) rename packages/ubuntu_desktop_installer/assets/{ => try_or_install}/2.0x/repair-wrench.png (100%) rename packages/ubuntu_desktop_installer/assets/{ => try_or_install}/2.0x/steering-wheel.png (100%) rename packages/ubuntu_desktop_installer/assets/{ => try_or_install}/hard-drive.png (100%) rename packages/ubuntu_desktop_installer/assets/{ => try_or_install}/repair-wrench.png (100%) rename packages/ubuntu_desktop_installer/assets/{ => try_or_install}/steering-wheel.png (100%) rename packages/ubuntu_desktop_installer/assets/{qrbitlocker.svg => turn_off_bitlocker/qr-code.svg} (100%) rename packages/ubuntu_desktop_installer/assets/{rst.svg => turn_off_rst/qr-code.svg} (100%) rename packages/ubuntu_desktop_installer/assets/{mascot_white.svg => welcome/logo.svg} (100%) diff --git a/packages/ubuntu_desktop_installer/assets/2.0x/rst.png b/packages/ubuntu_desktop_installer/assets/2.0x/rst.png deleted file mode 100644 index db9ca8e3dc5511c9afb5aad61ef73dd5afdc83bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 7460 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 r+=Q4cI09x precacheSlideImages(BuildContext context) { final assets = _resolveAssetsDirectory(); - return Directory('$assets/assets/slides') + return Directory('$assets/assets/installation_slides') .list(recursive: true) .forEach((slide) { if (slide is File) { diff --git a/packages/ubuntu_desktop_installer/lib/pages/select_guided_storage/select_guided_storage_page.dart b/packages/ubuntu_desktop_installer/lib/pages/select_guided_storage/select_guided_storage_page.dart index 93bd0ab940..b83fa08c5a 100644 --- a/packages/ubuntu_desktop_installer/lib/pages/select_guided_storage/select_guided_storage_page.dart +++ b/packages/ubuntu_desktop_installer/lib/pages/select_guided_storage/select_guided_storage_page.dart @@ -93,7 +93,7 @@ class _SelectGuidedStoragePageState extends State { mainAxisSize: MainAxisSize.min, children: [ SvgPicture.asset( - 'assets/cof_orange_hex.svg', + 'assets/select_guided_storage/ubuntu.svg', width: 48, height: 48, ), diff --git a/packages/ubuntu_desktop_installer/lib/pages/try_or_install/try_or_install_page.dart b/packages/ubuntu_desktop_installer/lib/pages/try_or_install/try_or_install_page.dart index e3a9697097..7f96bf3353 100644 --- a/packages/ubuntu_desktop_installer/lib/pages/try_or_install/try_or_install_page.dart +++ b/packages/ubuntu_desktop_installer/lib/pages/try_or_install/try_or_install_page.dart @@ -40,7 +40,8 @@ class TryOrInstallPageState extends State { Expanded( child: OptionCard( selected: model.option == Option.repairUbuntu, - image: FlavorImage.asset('assets/repair-wrench.png'), + image: + FlavorImage.asset('assets/try_or_install/repair-wrench.png'), title: Text(lang.repairInstallation), body: Text(lang.repairInstallationDescription), onSelected: () => model.selectOption(Option.repairUbuntu), @@ -50,7 +51,8 @@ class TryOrInstallPageState extends State { Expanded( child: OptionCard( selected: model.option == Option.tryUbuntu, - image: FlavorImage.asset('assets/steering-wheel.png'), + image: + FlavorImage.asset('assets/try_or_install/steering-wheel.png'), title: Text(lang.tryUbuntu(flavor.name)), body: Text(lang.tryUbuntuDescription(flavor.name)), onSelected: () => model.selectOption(Option.tryUbuntu), @@ -60,7 +62,7 @@ class TryOrInstallPageState extends State { Expanded( child: OptionCard( selected: model.option == Option.installUbuntu, - image: FlavorImage.asset('assets/hard-drive.png'), + image: FlavorImage.asset('assets/try_or_install/hard-drive.png'), title: Text(lang.installUbuntu(flavor.name)), body: Text(lang.installUbuntuDescription(flavor.name)), onSelected: () => model.selectOption(Option.installUbuntu), diff --git a/packages/ubuntu_desktop_installer/lib/pages/turn_off_bitlocker/turn_off_bitlocker_page.dart b/packages/ubuntu_desktop_installer/lib/pages/turn_off_bitlocker/turn_off_bitlocker_page.dart index 34eb4ae506..0c4447e92a 100644 --- a/packages/ubuntu_desktop_installer/lib/pages/turn_off_bitlocker/turn_off_bitlocker_page.dart +++ b/packages/ubuntu_desktop_installer/lib/pages/turn_off_bitlocker/turn_off_bitlocker_page.dart @@ -39,7 +39,7 @@ class TurnOffBitLockerPage extends StatelessWidget { onLinkTap: (url, _, __, ___) => launchUrl(url!), ), const SizedBox(height: 60), - SvgPicture.asset('assets/qrbitlocker.svg') + SvgPicture.asset('assets/turn_off_bitlocker/qr-code.svg') ], ), actions: [ diff --git a/packages/ubuntu_desktop_installer/lib/pages/turn_off_rst/turn_off_rst_page.dart b/packages/ubuntu_desktop_installer/lib/pages/turn_off_rst/turn_off_rst_page.dart index a708b8123e..a1582eae9f 100644 --- a/packages/ubuntu_desktop_installer/lib/pages/turn_off_rst/turn_off_rst_page.dart +++ b/packages/ubuntu_desktop_installer/lib/pages/turn_off_rst/turn_off_rst_page.dart @@ -44,7 +44,7 @@ class TurnOffRSTPage extends StatelessWidget { ), const SizedBox(height: 60), SvgPicture.asset( - 'assets/rst.svg', + 'assets/turn_off_rst/qr-code.svg', color: Theme.of(context).textTheme.bodyText1!.color, ), ], diff --git a/packages/ubuntu_desktop_installer/lib/pages/welcome/welcome_page.dart b/packages/ubuntu_desktop_installer/lib/pages/welcome/welcome_page.dart index e8b7c3b6bf..b2ceb5948e 100644 --- a/packages/ubuntu_desktop_installer/lib/pages/welcome/welcome_page.dart +++ b/packages/ubuntu_desktop_installer/lib/pages/welcome/welcome_page.dart @@ -87,7 +87,7 @@ class _WelcomePageState extends State { const SizedBox(width: 20), Expanded( child: SvgPicture.asset( - 'assets/mascot_white.svg', + 'assets/welcome/logo.svg', height: height / 4, color: Theme.of(context).primaryColor, ), diff --git a/packages/ubuntu_desktop_installer/lib/slides/default_slides.dart b/packages/ubuntu_desktop_installer/lib/slides/default_slides.dart index 61b301ecba..c584cb4583 100644 --- a/packages/ubuntu_desktop_installer/lib/slides/default_slides.dart +++ b/packages/ubuntu_desktop_installer/lib/slides/default_slides.dart @@ -13,9 +13,10 @@ const _kInsets = EdgeInsets.fromLTRB(72, 56, 48, 24); const _kSmallSpacing = 8.0; const _kLargeSpacing = 16.0; -String _slideAsset(String name) => 'assets/slides/$name.png'; -String _slideIcon(String name) => 'assets/slides/icons/$name.png'; -String _slideScreenshot(String name) => 'assets/slides/screenshots/$name.png'; +String _slideAsset(String name) => 'assets/installation_slides/$name.png'; +String _slideIcon(String name) => 'assets/installation_slides/icons/$name.png'; +String _slideScreenshot(String name) => + 'assets/installation_slides/screenshots/$name.png'; /// The list of default installation slides. final defaultSlides = [ diff --git a/packages/ubuntu_desktop_installer/pubspec.yaml b/packages/ubuntu_desktop_installer/pubspec.yaml index 385af63d0f..0e93fc25bb 100644 --- a/packages/ubuntu_desktop_installer/pubspec.yaml +++ b/packages/ubuntu_desktop_installer/pubspec.yaml @@ -66,6 +66,13 @@ flutter: uses-material-design: true assets: - assets/ - - assets/slides/ - - assets/slides/icons/ - - assets/slides/screenshots/ + - assets/choose_your_look/ + - assets/installation_complete/ + - assets/installation_slides/ + - assets/installation_slides/icons/ + - assets/installation_slides/screenshots/ + - assets/select_guided_storage/ + - assets/try_or_install/ + - assets/turn_off_bitlocker/ + - assets/turn_off_rst/ + - assets/welcome/ diff --git a/packages/ubuntu_desktop_installer/test/choose_your_look/choose_your_look_page_test.dart b/packages/ubuntu_desktop_installer/test/choose_your_look/choose_your_look_page_test.dart index a3e717c22d..112d49e5a8 100644 --- a/packages/ubuntu_desktop_installer/test/choose_your_look/choose_your_look_page_test.dart +++ b/packages/ubuntu_desktop_installer/test/choose_your_look/choose_your_look_page_test.dart @@ -24,7 +24,7 @@ void main() { final lightOptionCard = find.widgetWithImage( YaruSelectableContainer, - AssetImage('assets/Theme_thumbnails-Light.png'), + AssetImage('assets/choose_your_look/light-theme.png'), ); expect(lightOptionCard, findsOneWidget); await tester.tap(lightOptionCard); @@ -32,7 +32,7 @@ void main() { final darkOptionCard = find.widgetWithImage( YaruSelectableContainer, - AssetImage('assets/Theme_thumbnails-Dark.png'), + AssetImage('assets/choose_your_look/dark-theme.png'), ); expect(darkOptionCard, findsOneWidget); await tester.tap(darkOptionCard);