diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ecb791b59..344aeeda2 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -301,25 +301,3 @@ jobs: push: ${{ github.event_name != 'pull_request' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - build-android-remote: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - submodules: recursive - - uses: subosito/flutter-action@v2 - with: - channel: stable - flutter-version-file: "crates/ui/pubspec.yaml" - - name: Generate FFI bindings - run: make generate_bindings - working-directory: crates/ui - - name: Build - run: flutter build apk -t lib/mobile/main.dart - working-directory: crates/ui - - uses: actions/upload-artifact@v4 - with: - name: android-remote - path: crates/ui/build/app/outputs/flutter-apk/app-release.apk - if-no-files-found: error diff --git a/.github/workflows/mobile.yml b/.github/workflows/mobile.yml new file mode 100644 index 000000000..0336de65e --- /dev/null +++ b/.github/workflows/mobile.yml @@ -0,0 +1,64 @@ +--- +on: + push: + branches: [main] + paths: + - ".github/workflows/mobile.yml" + - "crates/ui/android/**" + - "crates/ui/lib/mobile/**" + - "crates/ui/pubspec.yaml" + - "crates/ui/pubspec.lock" + +name: Mobile App + +concurrency: + group: ${{ github.workflow }} + cancel-in-progress: true + +jobs: + build-android-remote: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + with: + submodules: recursive + # Build android release bundle + - uses: subosito/flutter-action@v2 + with: + channel: stable + flutter-version-file: "crates/ui/pubspec.yaml" + - name: Decode keystore + env: + ANDROID_KEYSTORE: ${{ secrets.ANDROID_KEYSTORE }} + run: echo "$ANDROID_KEYSTORE" | base64 -d > keystore.jks + working-directory: crates/ui/android/app + - name: Create properties file + env: + ANDROID_KEYSTORE_PASSWORD: ${{ secrets.ANDROID_KEYSTORE_PASSWORD }} + ANDROID_SIGNING_KEY_PASSWORD: ${{ secrets.ANDROID_SIGNING_KEY_PASSWORD }} + ANDROID_SIGNING_KEY_ALIAS: ${{ secrets.ANDROID_SIGNING_KEY_ALIAS }} + run: | + echo "storePassword=$ANDROID_KEYSTORE_PASSWORD" > key.properties + echo "keyPassword=$ANDROID_SIGNING_KEY_PASSWORD" >> key.properties + echo "keyAlias=$ANDROID_SIGNING_KEY_ALIAS" >> key.properties + echo "storeFile=keystore.jks" >> key.properties + working-directory: crates/ui/android + - name: Build + run: make android_bundle + working-directory: crates/ui + # Upload to play store + - name: Decode service account file + env: + SERVICE_ACCOUNT_KEY_JSON: ${{ secrets.SERVICE_ACCOUNT_KEY_JSON }} + run: echo $SERVICE_ACCOUNT_KEY_JSON | base64 -d > service_account_key.json + working-directory: crates/ui/android + - name: Set up ruby env + uses: ruby/setup-ruby@v1 + with: + ruby-version: 2.7.2 + bundler-cache: true + - name: Deploy + run: | + bundle install + bundle exec fastlane beta + working-directory: crates/ui/android diff --git a/crates/ui/Makefile b/crates/ui/Makefile index ba60555a2..4b85c28cd 100644 --- a/crates/ui/Makefile +++ b/crates/ui/Makefile @@ -49,3 +49,6 @@ icons: companion: flutter run -t lib/mobile/main.dart + +android_bundle: generate_bindings + flutter build appbundle --release -t lib/mobile/main.dart diff --git a/crates/ui/android/.gitignore b/crates/ui/android/.gitignore index 0a741cb43..bfe558a11 100644 --- a/crates/ui/android/.gitignore +++ b/crates/ui/android/.gitignore @@ -9,3 +9,4 @@ GeneratedPluginRegistrant.java # Remember to never publicly share your keystore. # See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app key.properties +service_account_key.json diff --git a/crates/ui/android/Gemfile b/crates/ui/android/Gemfile new file mode 100644 index 000000000..cdd3a6b34 --- /dev/null +++ b/crates/ui/android/Gemfile @@ -0,0 +1,6 @@ +source "https://rubygems.org" + +gem "fastlane" + +plugins_path = File.join(File.dirname(__FILE__), 'fastlane', 'Pluginfile') +eval_gemfile(plugins_path) if File.exist?(plugins_path) diff --git a/crates/ui/android/Gemfile.lock b/crates/ui/android/Gemfile.lock new file mode 100644 index 000000000..78bbfa6de --- /dev/null +++ b/crates/ui/android/Gemfile.lock @@ -0,0 +1,224 @@ +GEM + remote: https://rubygems.org/ + specs: + CFPropertyList (3.0.7) + base64 + nkf + rexml + addressable (2.8.7) + public_suffix (>= 2.0.2, < 7.0) + artifactory (3.0.17) + atomos (0.1.3) + aws-eventstream (1.3.0) + aws-partitions (1.1003.0) + aws-sdk-core (3.212.0) + aws-eventstream (~> 1, >= 1.3.0) + aws-partitions (~> 1, >= 1.992.0) + aws-sigv4 (~> 1.9) + jmespath (~> 1, >= 1.6.1) + aws-sdk-kms (1.95.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sigv4 (~> 1.5) + aws-sdk-s3 (1.170.0) + aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (~> 1) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.10.1) + aws-eventstream (~> 1, >= 1.0.2) + babosa (1.0.4) + base64 (0.2.0) + claide (1.1.0) + colored (1.2) + colored2 (3.1.2) + commander (4.6.0) + highline (~> 2.0.0) + declarative (0.0.20) + digest-crc (0.6.5) + rake (>= 12.0.0, < 14.0.0) + domain_name (0.6.20240107) + dotenv (2.8.1) + emoji_regex (3.2.3) + excon (0.112.0) + faraday (1.10.4) + faraday-em_http (~> 1.0) + faraday-em_synchrony (~> 1.0) + faraday-excon (~> 1.1) + faraday-httpclient (~> 1.0) + faraday-multipart (~> 1.0) + faraday-net_http (~> 1.0) + faraday-net_http_persistent (~> 1.0) + faraday-patron (~> 1.0) + faraday-rack (~> 1.0) + faraday-retry (~> 1.0) + ruby2_keywords (>= 0.0.4) + faraday-cookie_jar (0.0.7) + faraday (>= 0.8.0) + http-cookie (~> 1.0.0) + faraday-em_http (1.0.0) + faraday-em_synchrony (1.0.0) + faraday-excon (1.1.0) + faraday-httpclient (1.0.1) + faraday-multipart (1.0.4) + multipart-post (~> 2) + faraday-net_http (1.0.2) + faraday-net_http_persistent (1.2.0) + faraday-patron (1.0.0) + faraday-rack (1.0.0) + faraday-retry (1.0.3) + faraday_middleware (1.2.1) + faraday (~> 1.0) + fastimage (2.3.1) + fastlane (2.225.0) + CFPropertyList (>= 2.3, < 4.0.0) + addressable (>= 2.8, < 3.0.0) + artifactory (~> 3.0) + aws-sdk-s3 (~> 1.0) + babosa (>= 1.0.3, < 2.0.0) + bundler (>= 1.12.0, < 3.0.0) + colored (~> 1.2) + commander (~> 4.6) + dotenv (>= 2.1.1, < 3.0.0) + emoji_regex (>= 0.1, < 4.0) + excon (>= 0.71.0, < 1.0.0) + faraday (~> 1.0) + faraday-cookie_jar (~> 0.0.6) + faraday_middleware (~> 1.0) + fastimage (>= 2.1.0, < 3.0.0) + fastlane-sirp (>= 1.0.0) + gh_inspector (>= 1.1.2, < 2.0.0) + google-apis-androidpublisher_v3 (~> 0.3) + google-apis-playcustomapp_v1 (~> 0.1) + google-cloud-env (>= 1.6.0, < 2.0.0) + google-cloud-storage (~> 1.31) + highline (~> 2.0) + http-cookie (~> 1.0.5) + json (< 3.0.0) + jwt (>= 2.1.0, < 3) + mini_magick (>= 4.9.4, < 5.0.0) + multipart-post (>= 2.0.0, < 3.0.0) + naturally (~> 2.2) + optparse (>= 0.1.1, < 1.0.0) + plist (>= 3.1.0, < 4.0.0) + rubyzip (>= 2.0.0, < 3.0.0) + security (= 0.1.5) + simctl (~> 1.6.3) + terminal-notifier (>= 2.0.0, < 3.0.0) + terminal-table (~> 3) + tty-screen (>= 0.6.3, < 1.0.0) + tty-spinner (>= 0.8.0, < 1.0.0) + word_wrap (~> 1.0.0) + xcodeproj (>= 1.13.0, < 2.0.0) + xcpretty (~> 0.3.0) + xcpretty-travis-formatter (>= 0.0.3, < 2.0.0) + fastlane-plugin-increment_version_code (0.4.3) + fastlane-sirp (1.0.0) + sysrandom (~> 1.0) + gh_inspector (1.1.3) + google-apis-androidpublisher_v3 (0.54.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-core (0.11.3) + addressable (~> 2.5, >= 2.5.1) + googleauth (>= 0.16.2, < 2.a) + httpclient (>= 2.8.1, < 3.a) + mini_mime (~> 1.0) + representable (~> 3.0) + retriable (>= 2.0, < 4.a) + rexml + google-apis-iamcredentials_v1 (0.17.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-playcustomapp_v1 (0.13.0) + google-apis-core (>= 0.11.0, < 2.a) + google-apis-storage_v1 (0.31.0) + google-apis-core (>= 0.11.0, < 2.a) + google-cloud-core (1.7.1) + google-cloud-env (>= 1.0, < 3.a) + google-cloud-errors (~> 1.0) + google-cloud-env (1.6.0) + faraday (>= 0.17.3, < 3.0) + google-cloud-errors (1.4.0) + google-cloud-storage (1.47.0) + addressable (~> 2.8) + digest-crc (~> 0.4) + google-apis-iamcredentials_v1 (~> 0.1) + google-apis-storage_v1 (~> 0.31.0) + google-cloud-core (~> 1.6) + googleauth (>= 0.16.2, < 2.a) + mini_mime (~> 1.0) + googleauth (1.8.1) + faraday (>= 0.17.3, < 3.a) + jwt (>= 1.4, < 3.0) + multi_json (~> 1.11) + os (>= 0.9, < 2.0) + signet (>= 0.16, < 2.a) + highline (2.0.3) + http-cookie (1.0.7) + domain_name (~> 0.5) + httpclient (2.8.3) + jmespath (1.6.2) + json (2.8.1) + jwt (2.9.3) + base64 + mini_magick (4.13.2) + mini_mime (1.1.5) + multi_json (1.15.0) + multipart-post (2.4.1) + nanaimo (0.4.0) + naturally (2.2.1) + nkf (0.2.0) + optparse (0.6.0) + os (1.1.4) + plist (3.7.1) + public_suffix (6.0.1) + rake (13.2.1) + representable (3.2.0) + declarative (< 0.1.0) + trailblazer-option (>= 0.1.1, < 0.2.0) + uber (< 0.2.0) + retriable (3.1.2) + rexml (3.3.9) + rouge (2.0.7) + ruby2_keywords (0.0.5) + rubyzip (2.3.2) + security (0.1.5) + signet (0.19.0) + addressable (~> 2.8) + faraday (>= 0.17.5, < 3.a) + jwt (>= 1.5, < 3.0) + multi_json (~> 1.10) + simctl (1.6.10) + CFPropertyList + naturally + sysrandom (1.0.5) + terminal-notifier (2.0.0) + terminal-table (3.0.2) + unicode-display_width (>= 1.1.1, < 3) + trailblazer-option (0.1.2) + tty-cursor (0.7.1) + tty-screen (0.8.2) + tty-spinner (0.9.3) + tty-cursor (~> 0.7) + uber (0.1.0) + unicode-display_width (2.6.0) + word_wrap (1.0.0) + xcodeproj (1.27.0) + CFPropertyList (>= 2.3.3, < 4.0) + atomos (~> 0.1.3) + claide (>= 1.0.2, < 2.0) + colored2 (~> 3.1) + nanaimo (~> 0.4.0) + rexml (>= 3.3.6, < 4.0) + xcpretty (0.3.0) + rouge (~> 2.0.7) + xcpretty-travis-formatter (1.0.1) + xcpretty (~> 0.2, >= 0.0.7) + +PLATFORMS + ruby + x86_64-linux + +DEPENDENCIES + fastlane + fastlane-plugin-increment_version_code + +BUNDLED WITH + 2.5.23 diff --git a/crates/ui/android/app/build.gradle b/crates/ui/android/app/build.gradle index 47d10c153..42921140b 100644 --- a/crates/ui/android/app/build.gradle +++ b/crates/ui/android/app/build.gradle @@ -11,16 +11,17 @@ if (flutterRoot == null) { throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.") } -def flutterVersionCode = localProperties.getProperty('flutter.versionCode') -if (flutterVersionCode == null) { - flutterVersionCode = '1' -} - def flutterVersionName = localProperties.getProperty('flutter.versionName') if (flutterVersionName == null) { flutterVersionName = '1.0' } +def keystoreProperties = new Properties() +def keystorePropertiesFile = rootProject.file("key.properties") +if (keystorePropertiesFile.exists()) { + keystoreProperties.load(new FileInputStream(keystorePropertiesFile)) +} + apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" @@ -35,16 +36,23 @@ android { defaultConfig { applicationId "me.maxjoehnk.mizer" minSdkVersion 19 - targetSdkVersion 31 - versionCode flutterVersionCode.toInteger() + targetSdkVersion 34 + versionCode 1 versionName flutterVersionName } + signingConfigs { + release { + keyAlias keystoreProperties['keyAlias'] + keyPassword keystoreProperties['keyPassword'] + storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null + storePassword keystoreProperties['storePassword'] + } + } + buildTypes { release { - // TODO: Add your own signing config for the release build. - // Signing with the debug keys for now, so `flutter run --release` works. - signingConfig signingConfigs.debug + signingConfig signingConfigs.release } } } diff --git a/crates/ui/android/app/src/debug/AndroidManifest.xml b/crates/ui/android/app/src/debug/AndroidManifest.xml index c39370bad..a09ee751f 100644 --- a/crates/ui/android/app/src/debug/AndroidManifest.xml +++ b/crates/ui/android/app/src/debug/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="me.maxjoehnk.mizer"> diff --git a/crates/ui/android/app/src/main/AndroidManifest.xml b/crates/ui/android/app/src/main/AndroidManifest.xml index 1496ea9a7..aef13071c 100644 --- a/crates/ui/android/app/src/main/AndroidManifest.xml +++ b/crates/ui/android/app/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="me.maxjoehnk.mizer"> + + diff --git a/crates/ui/android/app/src/main/kotlin/me/maxjoehnk/ui/MainActivity.kt b/crates/ui/android/app/src/main/kotlin/me/maxjoehnk/mizer/MainActivity.kt similarity index 78% rename from crates/ui/android/app/src/main/kotlin/me/maxjoehnk/ui/MainActivity.kt rename to crates/ui/android/app/src/main/kotlin/me/maxjoehnk/mizer/MainActivity.kt index fae096725..9964cb220 100644 --- a/crates/ui/android/app/src/main/kotlin/me/maxjoehnk/ui/MainActivity.kt +++ b/crates/ui/android/app/src/main/kotlin/me/maxjoehnk/mizer/MainActivity.kt @@ -1,4 +1,4 @@ -package me.maxjoehnk.ui +package me.maxjoehnk.mizer import io.flutter.embedding.android.FlutterActivity diff --git a/crates/ui/android/app/src/profile/AndroidManifest.xml b/crates/ui/android/app/src/profile/AndroidManifest.xml index c39370bad..a09ee751f 100644 --- a/crates/ui/android/app/src/profile/AndroidManifest.xml +++ b/crates/ui/android/app/src/profile/AndroidManifest.xml @@ -1,5 +1,5 @@ + package="me.maxjoehnk.mizer"> diff --git a/crates/ui/android/fastlane/Appfile b/crates/ui/android/fastlane/Appfile new file mode 100644 index 000000000..d43bf3625 --- /dev/null +++ b/crates/ui/android/fastlane/Appfile @@ -0,0 +1,2 @@ +json_key_file("service_account_key.json") +package_name("me.maxjoehnk.mizer") diff --git a/crates/ui/android/fastlane/Fastfile b/crates/ui/android/fastlane/Fastfile new file mode 100644 index 000000000..20c38ebf6 --- /dev/null +++ b/crates/ui/android/fastlane/Fastfile @@ -0,0 +1,31 @@ +default_platform(:android) + +platform :android do + lane :build do + gradle(task: "clean") + gradle(task: "bundle", build_type: "Release") + end + + lane :beta do + increment_build_num + build + upload_to_play_store( + track: 'beta', + aab: '../build/app/outputs/bundle/release/app-release.aab', + skip_upload_apk: true + ) + end + + lane :increment_build_num do + previous_build_number = google_play_track_version_codes( + track: "beta", + )[0] + + current_build_number = previous_build_number + 1 + + increment_version_code( + gradle_file_path: "./app/build.gradle", + version_code: current_build_number + ) + end +end diff --git a/crates/ui/android/fastlane/Pluginfile b/crates/ui/android/fastlane/Pluginfile new file mode 100644 index 000000000..412c2ff98 --- /dev/null +++ b/crates/ui/android/fastlane/Pluginfile @@ -0,0 +1,5 @@ +# Autogenerated by fastlane +# +# Ensure this file is checked in to source control! + +gem 'fastlane-plugin-increment_version_code' diff --git a/crates/ui/android/fastlane/README.md b/crates/ui/android/fastlane/README.md new file mode 100644 index 000000000..dea9b5094 --- /dev/null +++ b/crates/ui/android/fastlane/README.md @@ -0,0 +1,48 @@ +fastlane documentation +---- + +# Installation + +Make sure you have the latest version of the Xcode command line tools installed: + +```sh +xcode-select --install +``` + +For _fastlane_ installation instructions, see [Installing _fastlane_](https://docs.fastlane.tools/#installing-fastlane) + +# Available Actions + +## Android + +### android build + +```sh +[bundle exec] fastlane android build +``` + + + +### android beta + +```sh +[bundle exec] fastlane android beta +``` + + + +### android increment_build_num + +```sh +[bundle exec] fastlane android increment_build_num +``` + + + +---- + +This README.md is auto-generated and will be re-generated every time [_fastlane_](https://fastlane.tools) is run. + +More information about _fastlane_ can be found on [fastlane.tools](https://fastlane.tools). + +The documentation of _fastlane_ can be found on [docs.fastlane.tools](https://docs.fastlane.tools). diff --git a/crates/ui/android/fastlane/metadata/android/en-US/full_description.txt b/crates/ui/android/fastlane/metadata/android/en-US/full_description.txt new file mode 100644 index 000000000..a0a723d24 --- /dev/null +++ b/crates/ui/android/fastlane/metadata/android/en-US/full_description.txt @@ -0,0 +1,3 @@ +Control Mizer from the same network. + +View your patch and highlight fixtures to quickly diagnose any dmx issues. diff --git a/crates/ui/android/fastlane/metadata/android/en-US/images/featureGraphic.png b/crates/ui/android/fastlane/metadata/android/en-US/images/featureGraphic.png new file mode 100644 index 000000000..6acc40437 Binary files /dev/null and b/crates/ui/android/fastlane/metadata/android/en-US/images/featureGraphic.png differ diff --git a/crates/ui/android/fastlane/metadata/android/en-US/images/icon.png b/crates/ui/android/fastlane/metadata/android/en-US/images/icon.png new file mode 100644 index 000000000..a1140709a Binary files /dev/null and b/crates/ui/android/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png b/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png new file mode 100644 index 000000000..6bfa9a49f Binary files /dev/null and b/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/1_en-US.png differ diff --git a/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png b/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png new file mode 100644 index 000000000..2703cde08 Binary files /dev/null and b/crates/ui/android/fastlane/metadata/android/en-US/images/phoneScreenshots/2_en-US.png differ diff --git a/crates/ui/android/fastlane/metadata/android/en-US/short_description.txt b/crates/ui/android/fastlane/metadata/android/en-US/short_description.txt new file mode 100644 index 000000000..11cd39c70 --- /dev/null +++ b/crates/ui/android/fastlane/metadata/android/en-US/short_description.txt @@ -0,0 +1 @@ +Remote Client for Mizer \ No newline at end of file diff --git a/crates/ui/android/fastlane/metadata/android/en-US/title.txt b/crates/ui/android/fastlane/metadata/android/en-US/title.txt new file mode 100644 index 000000000..5ea5880a0 --- /dev/null +++ b/crates/ui/android/fastlane/metadata/android/en-US/title.txt @@ -0,0 +1 @@ +Mizer \ No newline at end of file diff --git a/crates/ui/android/fastlane/metadata/android/en-US/video.txt b/crates/ui/android/fastlane/metadata/android/en-US/video.txt new file mode 100644 index 000000000..e69de29bb diff --git a/crates/ui/lib/api/demo/fixtures.dart b/crates/ui/lib/api/demo/fixtures.dart new file mode 100644 index 000000000..7b31d9fdb --- /dev/null +++ b/crates/ui/lib/api/demo/fixtures.dart @@ -0,0 +1,51 @@ +import 'package:mizer/protos/fixtures.pbgrpc.dart'; + +import '../contracts/fixtures.dart'; + +class FixturesDemoApi implements FixturesApi { + @override + Future addFixtures(AddFixturesRequest request) { + // TODO: implement addFixtures + throw UnimplementedError(); + } + + @override + Future deleteFixtures(List fixtureIds) { + // TODO: implement deleteFixtures + throw UnimplementedError(); + } + + @override + Future getFixtureDefinitions() { + // TODO: implement getFixtureDefinitions + throw UnimplementedError(); + } + + @override + Future getFixtures() async { + return Fixtures(fixtures: List.generate(10, (index) => Fixture( + id: index + 1, + name: 'Fixture ${index + 1}', + channel: 1 + (index * 10), + universe: 1, + ))); + } + + @override + Future updateFixture(int fixtureId, UpdateFixtureRequest request) { + // TODO: implement updateFixture + throw UnimplementedError(); + } + + @override + Future exportPatch(String path) { + // TODO: implement exportPatch + throw UnimplementedError(); + } + + @override + Future previewFixtures(AddFixturesRequest request) { + // TODO: implement previewFixtures + throw UnimplementedError(); + } +} diff --git a/crates/ui/lib/api/demo/programmer.dart b/crates/ui/lib/api/demo/programmer.dart new file mode 100644 index 000000000..9ffa33e04 --- /dev/null +++ b/crates/ui/lib/api/demo/programmer.dart @@ -0,0 +1,196 @@ +import 'dart:async'; + +import 'package:mizer/api/plugin/ffi/programmer.dart'; +import 'package:mizer/protos/fixtures.pb.dart'; + +import '../contracts/programmer.dart'; + +class ProgrammerDemoApi extends ProgrammerApi { + StreamController _controller = StreamController.broadcast(); + bool _highlight = false; + List _selection = []; + + void _emit() { + _controller.add(ProgrammerState(highlight: _highlight, activeFixtures: _selection)); + } + + @override + Future addGroup(String name) { + // TODO: implement addGroup + throw UnimplementedError(); + } + + @override + Future assignFixtureSelectionToGroup(Group group, StoreGroupMode mode) { + // TODO: implement assignFixtureSelectionToGroup + throw UnimplementedError(); + } + + @override + Future assignFixturesToGroup(List fixtures, Group group, StoreGroupMode mode) { + // TODO: implement assignFixturesToGroup + throw UnimplementedError(); + } + + @override + Future callEffect(int id) { + // TODO: implement callEffect + throw UnimplementedError(); + } + + @override + Future callPreset(PresetId id) { + // TODO: implement callPreset + throw UnimplementedError(); + } + + @override + Future clear() async { + _selection = []; + _emit(); + } + + @override + Future deleteGroup(int id) { + // TODO: implement deleteGroup + throw UnimplementedError(); + } + + @override + Future deletePreset(PresetId id) { + // TODO: implement deletePreset + throw UnimplementedError(); + } + + @override + Future getGroups() { + // TODO: implement getGroups + throw UnimplementedError(); + } + + @override + Future getPresets() { + // TODO: implement getPresets + throw UnimplementedError(); + } + + @override + Future getProgrammerPointer() { + // TODO: implement getProgrammerPointer + throw UnimplementedError(); + } + + @override + Future highlight(bool highlight) async { + _highlight = highlight; + _emit(); + } + + @override + Future next() async { + } + + @override + Stream observe() { + return _controller.stream; + } + + @override + Future prev() async { + } + + @override + Future renameGroup(int id, String name) { + // TODO: implement renameGroup + throw UnimplementedError(); + } + + @override + Future renamePreset(PresetId id, String name) { + // TODO: implement renamePreset + throw UnimplementedError(); + } + + @override + Future selectFixtures(List fixtureIds) async { + _selection.addAll(fixtureIds); + _selection = _selection.toSet().toList(); + _emit(); + } + + @override + Future selectGroup(int id) { + // TODO: implement selectGroup + throw UnimplementedError(); + } + + @override + Future set() async { + } + + @override + Future shuffle() { + // TODO: implement shuffle + throw UnimplementedError(); + } + + @override + Future store(int sequenceId, StoreRequest_Mode storeMode, {int? cueId}) { + // TODO: implement store + throw UnimplementedError(); + } + + @override + Future storePreset(StorePresetRequest request) { + // TODO: implement storePreset + throw UnimplementedError(); + } + + @override + Future unselectFixtures(List fixtureIds) async { + _selection = _selection.where((element) => !fixtureIds.contains(element)).toList(); + _emit(); + } + + @override + Future updateBlockSize(int blockSize) { + // TODO: implement updateBlockSize + throw UnimplementedError(); + } + + @override + Future updateGroups(int groups) { + // TODO: implement updateGroups + throw UnimplementedError(); + } + + @override + Future updateWings(int wings) { + // TODO: implement updateWings + throw UnimplementedError(); + } + + @override + Future writeControl(WriteControlRequest request) { + // TODO: implement writeControl + throw UnimplementedError(); + } + + @override + Future writeEffectOffset(int effectId, double? effectOffset) { + // TODO: implement writeEffectOffset + throw UnimplementedError(); + } + + @override + Future writeEffectRate(int effectId, double effectRate) { + // TODO: implement writeEffectRate + throw UnimplementedError(); + } + + @override + Future setOffline(bool offline) { + // TODO: implement setOffline + throw UnimplementedError(); + } +} diff --git a/crates/ui/lib/api/mobile/provider.dart b/crates/ui/lib/api/mobile/provider.dart index 62450ae9b..1c2d6e2f9 100644 --- a/crates/ui/lib/api/mobile/provider.dart +++ b/crates/ui/lib/api/mobile/provider.dart @@ -6,18 +6,27 @@ import 'package:grpc/grpc.dart'; import 'package:mizer/api/contracts/fixtures.dart'; import 'package:mizer/api/contracts/programmer.dart'; +import '../demo/fixtures.dart'; +import '../demo/programmer.dart'; import 'fixtures.dart'; import 'programmer.dart'; class MobileApiProvider extends StatelessWidget { final Widget child; - final InternetAddress host; + final String host; final int port; const MobileApiProvider({required this.child, required this.host, required this.port}); @override Widget build(BuildContext context) { + if (host == "demo") { + return MultiRepositoryProvider(child: child, providers: [ + RepositoryProvider(create: (context) => FixturesDemoApi()), + RepositoryProvider(create: (context) => ProgrammerDemoApi()), + ]); + } + var clientChannel = ClientChannel(host, port: port, options: ChannelOptions(credentials: ChannelCredentials.insecure())); return MultiRepositoryProvider(child: child, providers: [ diff --git a/crates/ui/lib/mobile/dialogs/direct_connect.dart b/crates/ui/lib/mobile/dialogs/direct_connect.dart new file mode 100644 index 000000000..13157206a --- /dev/null +++ b/crates/ui/lib/mobile/dialogs/direct_connect.dart @@ -0,0 +1,50 @@ +import 'package:flutter/material.dart'; +import 'package:mizer/widgets/dialog/action_dialog.dart'; + +import '../session_selector.dart'; + +const int defaultPort = 50000; + +class DirectConnectDialog extends StatefulWidget { + const DirectConnectDialog({super.key}); + + @override + State createState() => _DirectConnectDialogState(); +} + +class _DirectConnectDialogState extends State { + final TextEditingController _hostController = TextEditingController(); + final TextEditingController _portController = TextEditingController(text: defaultPort.toString()); + + @override + Widget build(BuildContext context) { + return ActionDialog(title: "Direct Connect", content: Column(mainAxisSize: MainAxisSize.min, children: [ + TextFormField( + decoration: InputDecoration(labelText: "Host", border: OutlineInputBorder()), + autofocus: true, + controller: _hostController, + ), + SizedBox(height: 8), + TextFormField( + decoration: InputDecoration(labelText: "Port", border: OutlineInputBorder()), + controller: _portController, + keyboardType: TextInputType.number, + ), + ]), actions: [ + PopupAction( + "Cancel", + () => Navigator.of(context).pop() + ), + PopupAction( + "Connect", + () { + var address = _hostController.text; + var port = int.tryParse(_portController.text) ?? defaultPort; + var host = Host(address, address, port); + + Navigator.of(context).pop(Session(host)); + } + ), + ]); + } +} diff --git a/crates/ui/lib/mobile/fixture_list.dart b/crates/ui/lib/mobile/fixture_list.dart index 96ec90b19..350ec9459 100644 --- a/crates/ui/lib/mobile/fixture_list.dart +++ b/crates/ui/lib/mobile/fixture_list.dart @@ -7,7 +7,9 @@ import 'package:mizer/widgets/panel.dart'; import 'package:provider/provider.dart'; class FixtureList extends StatefulWidget { - const FixtureList({super.key}); + final Function() onDisconnect; + + const FixtureList({super.key, required this.onDisconnect}); @override State createState() => _FixtureListState(); @@ -23,6 +25,9 @@ class _FixtureListState extends State { this._fixtures = Stream.periodic(Duration(seconds: 1)).asyncMap((_) => _fixturesApi.getFixtures()); this._programmer = _programmerApi.observe().asBroadcastStream(); + this._programmer.handleError((_) { + this._programmer = _programmerApi.observe().asBroadcastStream(); + }); } @override @@ -30,6 +35,16 @@ class _FixtureListState extends State { return Scaffold( appBar: AppBar( title: Text('Mizer'), + actions: [ + PopupMenuButton( + itemBuilder: (context) => [ + PopupMenuItem( + child: Text('Disconnect'), + onTap: () => widget.onDisconnect(), + ) + ], + ) + ], ), body: StreamBuilder( stream: _fixtures, diff --git a/crates/ui/lib/mobile/main.dart b/crates/ui/lib/mobile/main.dart index 7f1f74454..166215de4 100644 --- a/crates/ui/lib/mobile/main.dart +++ b/crates/ui/lib/mobile/main.dart @@ -17,8 +17,10 @@ class MizerMobileUi extends StatelessWidget { Widget build(BuildContext context) { return MizerApp( child: SessionSelector( - builder: (context, session) => MobileApiProvider( - child: FixtureList(), host: session.host.host, port: session.host.port)), + builder: (context, connection) => MobileApiProvider( + child: FixtureList(onDisconnect: connection.disconnect), + host: connection.session.host.host, + port: connection.session.host.port)), ); } } diff --git a/crates/ui/lib/mobile/session_selector.dart b/crates/ui/lib/mobile/session_selector.dart index d8aa77f3b..c775200c7 100644 --- a/crates/ui/lib/mobile/session_selector.dart +++ b/crates/ui/lib/mobile/session_selector.dart @@ -1,10 +1,12 @@ +import 'dart:developer'; import 'dart:io'; import 'package:flutter/material.dart'; +import 'package:mizer/mobile/dialogs/direct_connect.dart'; import 'package:multicast_dns/multicast_dns.dart'; class SessionSelector extends StatefulWidget { - final Function(BuildContext, Session) builder; + final Function(BuildContext, SessionContext) builder; const SessionSelector({required this.builder}); @@ -12,6 +14,13 @@ class SessionSelector extends StatefulWidget { State createState() => _SessionSelectorState(); } +class SessionContext { + final Session session; + final Function() disconnect; + + SessionContext(this.session, this.disconnect); +} + class _SessionSelectorState extends State { final MDnsClient _mdns = MDnsClient(); final List _sessions = []; @@ -20,29 +29,74 @@ class _SessionSelectorState extends State { @override void initState() { super.initState(); + _refresh(); + } + + @override + void dispose() { + _mdns.stop(); + super.dispose(); + } + + @override + Widget build(BuildContext context) { + if (_session != null) { + SessionContext sessionContext = SessionContext(_session!, () { + setState(() { + _session = null; + }); + }); + return widget.builder(context, sessionContext); + } + return Scaffold( + appBar: AppBar( + title: Text('Select Session'), + actions: [ + IconButton( + icon: const Icon(Icons.refresh), + onPressed: () => _refresh(), + ), + ], + ), + body: ListView(children: [ + for (final session in _sessions) + ListTile( + title: Text(session.project ?? ""), + isThreeLine: true, + subtitle: Text("${session.host.name}\n${session.host.host}"), + onTap: () { + setState(() { + _session = session; + }); + }, + ), + SizedBox(height: 16), + TextButton(onPressed: () async { + Session? session = await showDialog(context: context, builder: (context) => DirectConnectDialog()); + if (session != null) { + setState(() { + _session = session; + }); + } + }, child: Text("Direct Connect")) + ]), + ); + } + + void _refresh() { + _mdns.stop(); _mdns.start().then((value) { - print("Starting mdns lookup"); + log("Starting mdns lookup"); return _mdns .lookup(ResourceRecordQuery.serverPointer("_mizer._tcp")) .asyncMap((ptr) { - print("Found $ptr"); - // var ip = _mdns - // .lookup(ResourceRecordQuery.addressIPv4(ptr.domainName)) - // .first - // .then((value) { - // print("ip: $value"); - // - // return value; - // }); var host = _mdns .lookup(ResourceRecordQuery.service(ptr.domainName)) .first .then((value) { - print("port: $value"); return InternetAddress.lookup(value.target).then((addresses) { - print("addresses: $addresses"); - return Host(value.target, addresses.first, value.port); + return Host(value.target, addresses.first.address, value.port); }); }); @@ -50,7 +104,6 @@ class _SessionSelectorState extends State { .lookup(ResourceRecordQuery.text(ptr.domainName)) .first .then((value) { - print("project: $value"); return value; }); @@ -59,7 +112,8 @@ class _SessionSelectorState extends State { }).forEach((values) { var host = values[0] as Host; var project = values[1] as TxtResourceRecord; - var session = Session(project.text, host); + var projectName = project.text.replaceFirst("project=", "").trim(); + var session = Session(host, project: projectName); setState(() { if (_sessions.any((s) => s.project == session.project)) { return; @@ -70,54 +124,23 @@ class _SessionSelectorState extends State { }); }); } - - @override - void dispose() { - _mdns.stop(); - super.dispose(); - } - - @override - Widget build(BuildContext context) { - if (_session != null) { - return widget.builder(context, _session!); - } - return Scaffold( - appBar: AppBar( - title: Text('Select Session'), - ), - body: ListView( - children: _sessions.map((session) { - return ListTile( - title: Text(session.host.name), - subtitle: Text(session.project), - onTap: () { - setState(() { - _session = session; - }); - }, - ); - }).toList(), - ), - ); - } } class Session { - final String project; + final String? project; final Host host; - Session(this.project, this.host); + Session(this.host, { this.project }); @override String toString() { - return 'Session{project: ${project.trim()}, host: $host}'; + return 'Session{project: ${project?.trim()}, host: $host}'; } } class Host { final String name; - final InternetAddress host; + final String host; final int port; Host(this.name, this.host, this.port);