diff --git a/fediverse_archive_browser/lib/src/components/tree_entry_card.dart b/fediverse_archive_browser/lib/src/components/tree_entry_card.dart index 25f131f..1cc0d1b 100644 --- a/fediverse_archive_browser/lib/src/components/tree_entry_card.dart +++ b/fediverse_archive_browser/lib/src/components/tree_entry_card.dart @@ -25,10 +25,6 @@ class TreeEntryCard extends StatelessWidget { @override Widget build(BuildContext context) { - if (Scrollable.recommendDeferredLoadingForContext(context)) { - return const SizedBox(); - } - const double spacingHeight = 5.0; final formatter = Provider.of(context).dateTimeFormatter; diff --git a/fediverse_archive_browser/lib/src/home.dart b/fediverse_archive_browser/lib/src/home.dart index 6e0d9d7..355d29a 100644 --- a/fediverse_archive_browser/lib/src/home.dart +++ b/fediverse_archive_browser/lib/src/home.dart @@ -88,25 +88,13 @@ class _HomeState extends State { } Widget _buildNavBar() { - return LayoutBuilder(builder: (context, constraint) { - return Scrollbar( - isAlwaysShown: true, - child: SingleChildScrollView( - child: ConstrainedBox( - constraints: BoxConstraints(minHeight: constraint.maxHeight), - child: IntrinsicHeight( - child: NavigationRail( - destinations: - _pageData.map((p) => p.navRailDestination).toList(), - selectedIndex: _selectedIndex, - onDestinationSelected: _setSelectedIndex, - labelType: NavigationRailLabelType.all, - ), - ), - ), - ), - ); - }); + return NavigationRail( + destinations: + _pageData.map((p) => p.navRailDestination).toList(), + selectedIndex: _selectedIndex, + onDestinationSelected: _setSelectedIndex, + labelType: NavigationRailLabelType.all, + ); } Widget _buildMainArea() { diff --git a/fediverse_archive_browser/lib/src/screens/entries_screen.dart b/fediverse_archive_browser/lib/src/screens/entries_screen.dart index d8737cc..a6b05d5 100644 --- a/fediverse_archive_browser/lib/src/screens/entries_screen.dart +++ b/fediverse_archive_browser/lib/src/screens/entries_screen.dart @@ -86,7 +86,7 @@ class _FriendicaEntriesScreenWidget extends StatelessWidget { behavior: ScrollConfiguration.of(context).copyWith(scrollbars: false), child: ListView.separated( - primary: true, + primary: false, physics: const RangeMaintainingScrollPhysics(), restorationId: 'friendicaEntriesListView', itemCount: items.length, diff --git a/fediverse_archive_browser/lib/src/utils/scrolling_behavior.dart b/fediverse_archive_browser/lib/src/utils/scrolling_behavior.dart index 0459c7a..eda8fe4 100644 --- a/fediverse_archive_browser/lib/src/utils/scrolling_behavior.dart +++ b/fediverse_archive_browser/lib/src/utils/scrolling_behavior.dart @@ -7,5 +7,6 @@ class AppScrollingBehavior extends MaterialScrollBehavior { Set get dragDevices => { PointerDeviceKind.touch, PointerDeviceKind.mouse, + PointerDeviceKind.trackpad, }; } diff --git a/fediverse_archive_browser/macos/Podfile b/fediverse_archive_browser/macos/Podfile index dade8df..fe73390 100644 --- a/fediverse_archive_browser/macos/Podfile +++ b/fediverse_archive_browser/macos/Podfile @@ -1,4 +1,4 @@ -platform :osx, '10.11' +platform :osx, '10.13' # CocoaPods analytics sends network stats synchronously affecting flutter build latency. ENV['COCOAPODS_DISABLE_STATS'] = 'true' diff --git a/fediverse_archive_browser/macos/Podfile.lock b/fediverse_archive_browser/macos/Podfile.lock index ddebf10..64f0b50 100644 --- a/fediverse_archive_browser/macos/Podfile.lock +++ b/fediverse_archive_browser/macos/Podfile.lock @@ -1,40 +1,73 @@ PODS: + - audio_session (0.0.1): + - FlutterMacOS - desktop_window (0.0.1): - FlutterMacOS - FlutterMacOS (1.0.0) + - FMDB (2.7.5): + - FMDB/standard (= 2.7.5) + - FMDB/standard (2.7.5) + - just_audio (0.0.1): + - FlutterMacOS - path_provider_macos (0.0.1): - FlutterMacOS - shared_preferences_macos (0.0.1): - FlutterMacOS + - sqflite (0.0.2): + - FlutterMacOS + - FMDB (>= 2.7.5) - url_launcher_macos (0.0.1): - FlutterMacOS + - wakelock_macos (0.0.1): + - FlutterMacOS DEPENDENCIES: + - audio_session (from `Flutter/ephemeral/.symlinks/plugins/audio_session/macos`) - desktop_window (from `Flutter/ephemeral/.symlinks/plugins/desktop_window/macos`) - FlutterMacOS (from `Flutter/ephemeral`) + - just_audio (from `Flutter/ephemeral/.symlinks/plugins/just_audio/macos`) - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`) - shared_preferences_macos (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos`) + - sqflite (from `Flutter/ephemeral/.symlinks/plugins/sqflite/macos`) - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`) + - wakelock_macos (from `Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos`) + +SPEC REPOS: + trunk: + - FMDB EXTERNAL SOURCES: + audio_session: + :path: Flutter/ephemeral/.symlinks/plugins/audio_session/macos desktop_window: :path: Flutter/ephemeral/.symlinks/plugins/desktop_window/macos FlutterMacOS: :path: Flutter/ephemeral + just_audio: + :path: Flutter/ephemeral/.symlinks/plugins/just_audio/macos path_provider_macos: :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos shared_preferences_macos: :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos + sqflite: + :path: Flutter/ephemeral/.symlinks/plugins/sqflite/macos url_launcher_macos: :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos + wakelock_macos: + :path: Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos SPEC CHECKSUMS: + audio_session: dea1f41890dbf1718f04a56f1d6150fd50039b72 desktop_window: fb7c4f12c1129f947ac482296b6f14059d57a3c3 - FlutterMacOS: 57701585bf7de1b3fc2bb61f6378d73bbdea8424 - path_provider_macos: 160cab0d5461f0c0e02995469a98f24bdb9a3f1f - shared_preferences_macos: 480ce071d0666e37cef23fe6c702293a3d21799e - url_launcher_macos: 45af3d61de06997666568a7149c1be98b41c95d4 + FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811 + FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a + just_audio: 9b67ca7b97c61cfc9784ea23cd8cc55eb226d489 + path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19 + shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727 + sqflite: a5789cceda41d54d23f31d6de539d65bb14100ea + url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3 + wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9 -PODFILE CHECKSUM: 6eac6b3292e5142cfc23bdeb71848a40ec51c14c +PODFILE CHECKSUM: a884f6dd3f7494f3892ee6c81feea3a3abbf9153 -COCOAPODS: 1.10.2 +COCOAPODS: 1.11.3 diff --git a/fediverse_archive_browser/macos/Runner.xcodeproj/project.pbxproj b/fediverse_archive_browser/macos/Runner.xcodeproj/project.pbxproj index ecdd05b..9ec4470 100644 --- a/fediverse_archive_browser/macos/Runner.xcodeproj/project.pbxproj +++ b/fediverse_archive_browser/macos/Runner.xcodeproj/project.pbxproj @@ -405,7 +405,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule; @@ -486,7 +486,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -533,7 +533,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.13; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; SWIFT_COMPILATION_MODE = wholemodule;