diff --git a/flake.nix b/flake.nix index 9fe833a..8f2ed25 100644 --- a/flake.nix +++ b/flake.nix @@ -44,9 +44,10 @@ pkgs.mkShell { packages = with pkgs; [ jdk17 - rustc + cargo flutter android.platform-tools + (pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh)) ]; env = rec { LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath (with pkgs; [ sqlite ])}:$LD_LIBRARY_PATH"; diff --git a/lib/helpers/extension_helper.dart b/lib/helpers/extension_helper.dart index 70265a5..970e81f 100644 --- a/lib/helpers/extension_helper.dart +++ b/lib/helpers/extension_helper.dart @@ -121,7 +121,10 @@ extension ToMessage on Event { } extension ToTheme on ColorScheme { - ThemeData get theme => ThemeData.from( - colorScheme: this, - ).copyWith(appBarTheme: AppBarTheme(titleSpacing: 0)); + ThemeData get theme => ThemeData.from(colorScheme: this).copyWith( + appBarTheme: AppBarTheme( + titleSpacing: 0, + backgroundColor: surfaceContainerLow, + ), + ); } diff --git a/lib/widgets/member_list.dart b/lib/widgets/member_list.dart index 164c312..2de1354 100644 --- a/lib/widgets/member_list.dart +++ b/lib/widgets/member_list.dart @@ -20,9 +20,6 @@ class MemberList extends ConsumerWidget { children: [ AppBar( scrolledUnderElevation: 0, - backgroundColor: Theme.of( - context, - ).colorScheme.surfaceContainerLow, leading: Icon(Icons.people), title: Text("Members"), actionsPadding: EdgeInsets.only(right: 4), diff --git a/lib/widgets/room_appbar.dart b/lib/widgets/room_appbar.dart index c000a4a..cfc3bf5 100644 --- a/lib/widgets/room_appbar.dart +++ b/lib/widgets/room_appbar.dart @@ -33,7 +33,6 @@ class RoomAppbar extends StatelessWidget implements PreferredSizeWidget { ) : DrawerButton(onPressed: () => onOpenDrawer(context)), scrolledUnderElevation: 0, - backgroundColor: Theme.of(context).colorScheme.surfaceContainerLow, actionsPadding: EdgeInsets.symmetric(horizontal: 8), title: Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/linux/flutter/generated_plugins.cmake b/linux/flutter/generated_plugins.cmake index 45f0cc2..3f903b3 100644 --- a/linux/flutter/generated_plugins.cmake +++ b/linux/flutter/generated_plugins.cmake @@ -13,6 +13,7 @@ list(APPEND FLUTTER_PLUGIN_LIST ) list(APPEND FLUTTER_FFI_PLUGIN_LIST + flutter_vodozemac ) set(PLUGIN_BUNDLED_LIBRARIES) diff --git a/nix/fake-rustup.sh b/nix/fake-rustup.sh new file mode 100644 index 0000000..7884c05 --- /dev/null +++ b/nix/fake-rustup.sh @@ -0,0 +1,35 @@ +#!/usr/bin/env bash +# Fake rustup for nix-managed Rust toolchains + +case "$1" in + run) + if [[ "$2" == "stable" ]]; then + shift 2 + if [[ $# -eq 0 ]]; then + echo "fake rustup: no command given" >&2 + exit 1 + fi + exec "$@" + exit 0 + fi + ;; + + toolchain) + if [[ "$2" == "list" ]]; then + echo "stable (default)" + exit 0 + fi + ;; + + target) + if [[ "$2" == "list" && "$3" == "--toolchain" && "$4" == "stable" && "$5" == "--installed" ]]; then + echo "x86_64-unknown-linux-gnu" + exit 0 + fi + ;; +esac + +echo "fake rustup: the command:" >&2 +echo " rustup $*" >&2 +echo "…is not mocked yet" >&2 +exit 1 \ No newline at end of file diff --git a/pubspec.lock b/pubspec.lock index 5900f42..33f5d4a 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -577,6 +577,14 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_vodozemac: + dependency: "direct main" + description: + name: flutter_vodozemac + sha256: "16d4b44dd338689441fe42a80d0184e5c864e9563823de9e7e6371620d2c0590" + url: "https://pub.dev" + source: hosted + version: "0.4.1" flutter_web_plugins: dependency: transitive description: flutter diff --git a/pubspec.yaml b/pubspec.yaml index 0316d23..005da31 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -54,6 +54,7 @@ dependencies: color_hash: ^1.0.1 scaled_app: ^2.3.0 html2md: ^1.3.2 + flutter_vodozemac: ^0.4.1 dev_dependencies: build_runner: ^2.4.11