From 54950c4284b81a5e7618e98196b36c2b093a5f66 Mon Sep 17 00:00:00 2001 From: Brett Morgan Date: Tue, 7 Feb 2023 13:59:06 +1000 Subject: [PATCH] Tidyup `varfont_shader_puzzle` (#1629) * Tidyup `varfont_shader_puzzle` * Add a rebuild script and a test * Simplify fragment shaders * Drop web * Enable `beta` CI * make it `beta` inclusive * Pull out the program loading code --- experimental/varfont_shader_puzzle/.metadata | 31 ++- .../android/app/build.gradle | 2 +- .../android/app/src/debug/AndroidManifest.xml | 2 +- .../android/app/src/main/AndroidManifest.xml | 4 +- .../MainActivity.kt | 2 +- .../app/src/profile/AndroidManifest.xml | 2 +- .../android/build.gradle | 2 +- .../codelab_rebuild.yaml | 19 ++ .../varfont_shader_puzzle/ios/Podfile | 3 - .../ios/Runner.xcodeproj/project.pbxproj | 224 ++---------------- .../xcshareddata/xcschemes/Runner.xcscheme | 11 - .../ios/Runner/Info.plist | 4 +- .../ios/RunnerTests/RunnerTests.swift | 12 - .../lib/components/fragment_shaded.dart | 47 ++-- .../lib/components/rotator_puzzle.dart | 12 +- .../varfont_shader_puzzle/lib/main.dart | 1 + .../page_content/page_ascender_descender.dart | 2 +- .../lib/page_content/page_narrative_post.dart | 1 + .../lib/page_content/page_narrative_pre.dart | 1 + .../lib/page_content/page_optical_size.dart | 3 +- .../lib/page_content/page_weight.dart | 3 +- .../lib/page_content/page_width.dart | 3 +- .../lib/page_content/pages.dart | 1 + .../lib/page_content/pages_flow.dart | 1 + .../lib/page_content/wallpapers_flow.dart | 1 + .../varfont_shader_puzzle/lib/styles.dart | 1 + .../linux/CMakeLists.txt | 4 +- .../linux/my_application.cc | 4 +- .../varfont_shader_puzzle/macos/Podfile | 3 - .../macos/Runner.xcodeproj/project.pbxproj | 204 ++-------------- .../xcshareddata/xcschemes/Runner.xcscheme | 19 +- .../macos/Runner/Configs/AppInfo.xcconfig | 4 +- .../macos/RunnerTests/RunnerTests.swift | 12 - .../varfont_shader_puzzle/pubspec.yaml | 58 +---- .../shaders/bw_split.frag | 11 +- .../shaders/color_split.frag | 11 +- .../shaders/nothing.frag | 11 +- .../shaders/row_offset.frag | 11 +- .../varfont_shader_puzzle/shaders/wavy.frag | 11 +- .../varfont_shader_puzzle/shaders/wavy2.frag | 11 +- .../shaders/wavy_circ.frag | 11 +- .../test/widget_test.dart | 26 ++ .../varfont_shader_puzzle/web/favicon.png | Bin 917 -> 0 bytes .../web/icons/Icon-192.png | Bin 5292 -> 0 bytes .../web/icons/Icon-512.png | Bin 8252 -> 0 bytes .../web/icons/Icon-maskable-192.png | Bin 5594 -> 0 bytes .../web/icons/Icon-maskable-512.png | Bin 20998 -> 0 bytes .../varfont_shader_puzzle/web/index.html | 59 ----- .../varfont_shader_puzzle/web/manifest.json | 35 --- .../windows/CMakeLists.txt | 4 +- .../windows/runner/Runner.rc | 8 +- .../windows/runner/main.cpp | 2 +- 52 files changed, 228 insertions(+), 686 deletions(-) rename experimental/varfont_shader_puzzle/android/app/src/main/kotlin/com/example/{type_jam_github => varfont_shader_puzzle}/MainActivity.kt (69%) create mode 100644 experimental/varfont_shader_puzzle/codelab_rebuild.yaml delete mode 100644 experimental/varfont_shader_puzzle/ios/RunnerTests/RunnerTests.swift delete mode 100644 experimental/varfont_shader_puzzle/macos/RunnerTests/RunnerTests.swift create mode 100644 experimental/varfont_shader_puzzle/test/widget_test.dart delete mode 100644 experimental/varfont_shader_puzzle/web/favicon.png delete mode 100644 experimental/varfont_shader_puzzle/web/icons/Icon-192.png delete mode 100644 experimental/varfont_shader_puzzle/web/icons/Icon-512.png delete mode 100644 experimental/varfont_shader_puzzle/web/icons/Icon-maskable-192.png delete mode 100644 experimental/varfont_shader_puzzle/web/icons/Icon-maskable-512.png delete mode 100644 experimental/varfont_shader_puzzle/web/index.html delete mode 100644 experimental/varfont_shader_puzzle/web/manifest.json diff --git a/experimental/varfont_shader_puzzle/.metadata b/experimental/varfont_shader_puzzle/.metadata index 0372c0d84..f0a0035aa 100644 --- a/experimental/varfont_shader_puzzle/.metadata +++ b/experimental/varfont_shader_puzzle/.metadata @@ -4,8 +4,8 @@ # This file should be version controlled. version: - revision: b938dc13df32cd510844863a66856dd240dc3302 - channel: master + revision: 7048ed95a5ad3e43d697e0c397464193991fc230 + channel: stable project_type: app @@ -13,26 +13,23 @@ project_type: app migration: platforms: - platform: root - create_revision: b938dc13df32cd510844863a66856dd240dc3302 - base_revision: b938dc13df32cd510844863a66856dd240dc3302 + create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 + base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 - platform: android - create_revision: b938dc13df32cd510844863a66856dd240dc3302 - base_revision: b938dc13df32cd510844863a66856dd240dc3302 + create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 + base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 - platform: ios - create_revision: b938dc13df32cd510844863a66856dd240dc3302 - base_revision: b938dc13df32cd510844863a66856dd240dc3302 + create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 + base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 - platform: linux - create_revision: b938dc13df32cd510844863a66856dd240dc3302 - base_revision: b938dc13df32cd510844863a66856dd240dc3302 + create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 + base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 - platform: macos - create_revision: b938dc13df32cd510844863a66856dd240dc3302 - base_revision: b938dc13df32cd510844863a66856dd240dc3302 - - platform: web - create_revision: b938dc13df32cd510844863a66856dd240dc3302 - base_revision: b938dc13df32cd510844863a66856dd240dc3302 + create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 + base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 - platform: windows - create_revision: b938dc13df32cd510844863a66856dd240dc3302 - base_revision: b938dc13df32cd510844863a66856dd240dc3302 + create_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 + base_revision: 7048ed95a5ad3e43d697e0c397464193991fc230 # User provided section diff --git a/experimental/varfont_shader_puzzle/android/app/build.gradle b/experimental/varfont_shader_puzzle/android/app/build.gradle index 54e8cae96..11b4983b9 100644 --- a/experimental/varfont_shader_puzzle/android/app/build.gradle +++ b/experimental/varfont_shader_puzzle/android/app/build.gradle @@ -44,7 +44,7 @@ android { defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). - applicationId "com.example.type_jam_github" + applicationId "com.example.varfont_shader_puzzle" // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration. minSdkVersion flutter.minSdkVersion diff --git a/experimental/varfont_shader_puzzle/android/app/src/debug/AndroidManifest.xml b/experimental/varfont_shader_puzzle/android/app/src/debug/AndroidManifest.xml index 4873ef591..eed7cc9b1 100644 --- a/experimental/varfont_shader_puzzle/android/app/src/debug/AndroidManifest.xml +++ b/experimental/varfont_shader_puzzle/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="com.example.varfont_shader_puzzle"> - - - - - - - - - - - - - - - - type_jam_github - - - - - - - - - - diff --git a/experimental/varfont_shader_puzzle/web/manifest.json b/experimental/varfont_shader_puzzle/web/manifest.json deleted file mode 100644 index c3e55bdbb..000000000 --- a/experimental/varfont_shader_puzzle/web/manifest.json +++ /dev/null @@ -1,35 +0,0 @@ -{ - "name": "type_jam_github", - "short_name": "type_jam_github", - "start_url": ".", - "display": "standalone", - "background_color": "#0175C2", - "theme_color": "#0175C2", - "description": "A new Flutter project.", - "orientation": "portrait-primary", - "prefer_related_applications": false, - "icons": [ - { - "src": "icons/Icon-192.png", - "sizes": "192x192", - "type": "image/png" - }, - { - "src": "icons/Icon-512.png", - "sizes": "512x512", - "type": "image/png" - }, - { - "src": "icons/Icon-maskable-192.png", - "sizes": "192x192", - "type": "image/png", - "purpose": "maskable" - }, - { - "src": "icons/Icon-maskable-512.png", - "sizes": "512x512", - "type": "image/png", - "purpose": "maskable" - } - ] -} diff --git a/experimental/varfont_shader_puzzle/windows/CMakeLists.txt b/experimental/varfont_shader_puzzle/windows/CMakeLists.txt index f295f30f4..29bc61876 100644 --- a/experimental/varfont_shader_puzzle/windows/CMakeLists.txt +++ b/experimental/varfont_shader_puzzle/windows/CMakeLists.txt @@ -1,10 +1,10 @@ # Project-level configuration. cmake_minimum_required(VERSION 3.14) -project(type_jam_github LANGUAGES CXX) +project(varfont_shader_puzzle LANGUAGES CXX) # The name of the executable created for the application. Change this to change # the on-disk name of your application. -set(BINARY_NAME "type_jam_github") +set(BINARY_NAME "varfont_shader_puzzle") # Explicitly opt in to modern CMake behaviors to avoid warnings with recent # versions of CMake. diff --git a/experimental/varfont_shader_puzzle/windows/runner/Runner.rc b/experimental/varfont_shader_puzzle/windows/runner/Runner.rc index db18601ec..c6f7bda3f 100644 --- a/experimental/varfont_shader_puzzle/windows/runner/Runner.rc +++ b/experimental/varfont_shader_puzzle/windows/runner/Runner.rc @@ -90,12 +90,12 @@ BEGIN BLOCK "040904e4" BEGIN VALUE "CompanyName", "com.example" "\0" - VALUE "FileDescription", "type_jam_github" "\0" + VALUE "FileDescription", "varfont_shader_puzzle" "\0" VALUE "FileVersion", VERSION_AS_STRING "\0" - VALUE "InternalName", "type_jam_github" "\0" + VALUE "InternalName", "varfont_shader_puzzle" "\0" VALUE "LegalCopyright", "Copyright (C) 2023 com.example. All rights reserved." "\0" - VALUE "OriginalFilename", "type_jam_github.exe" "\0" - VALUE "ProductName", "type_jam_github" "\0" + VALUE "OriginalFilename", "varfont_shader_puzzle.exe" "\0" + VALUE "ProductName", "varfont_shader_puzzle" "\0" VALUE "ProductVersion", VERSION_AS_STRING "\0" END END diff --git a/experimental/varfont_shader_puzzle/windows/runner/main.cpp b/experimental/varfont_shader_puzzle/windows/runner/main.cpp index 03b60cd84..b709e9fda 100644 --- a/experimental/varfont_shader_puzzle/windows/runner/main.cpp +++ b/experimental/varfont_shader_puzzle/windows/runner/main.cpp @@ -27,7 +27,7 @@ int APIENTRY wWinMain(_In_ HINSTANCE instance, _In_opt_ HINSTANCE prev, FlutterWindow window(project); Win32Window::Point origin(10, 10); Win32Window::Size size(1280, 720); - if (!window.Create(L"type_jam_github", origin, size)) { + if (!window.Create(L"varfont_shader_puzzle", origin, size)) { return EXIT_FAILURE; } window.SetQuitOnClose(true);