fix: friends list not scrollable with mouse drag

KRTirtho · Feb 24, 2024 · ab08c82 · ab08c82
1 parent b6d4265
commit ab08c82
Show file tree

Hide file tree

Showing 10 changed files with 71 additions and 44 deletions.
diff --git a/.github/workflows/spotube-release-binary.yml b/.github/workflows/spotube-release-binary.yml
@@ -190,7 +190,7 @@ jobs:
             dist/spotube-linux-${{ env.BUILD_VERSION }}-x86_64.tar.xz
 
       - name: Debug With SSH When fails
-        if: ${{ inputs.debug && inputs.channel == 'nightly' }}
+        if: ${{ failure() && inputs.debug && inputs.channel == 'nightly' }}
         uses: mxschmitt/action-tmate@v3
         with:
           limit-access-to-actor: true

diff --git a/ios/Flutter/AppFrameworkInfo.plist b/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/ios/Podfile b/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -196,7 +196,7 @@ SPEC CHECKSUMS:
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
   file_selector_ios: 8c25d700d625e1dcdd6599f2d927072f2254647b
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_inappwebview: acd4fc0f012cefd09015000c241137d82f01ba62
   flutter_keyboard_visibility: 0339d06371254c3eb25eeb90ba8d17dca8f9c069
   flutter_mailer: 2ef5a67087bc8c6c4cefd04a178bf1ae2c94cd83
@@ -221,6 +221,6 @@ SPEC CHECKSUMS:
   Toast: 91b396c56ee72a5790816f40d3a94dd357abc196
   url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
 
-PODFILE CHECKSUM: e36c7ad9836dfd8d22934c7680185432a658e28f
+PODFILE CHECKSUM: 5129d2e80ab0dfc533f262cedf032011b1dfe4fd
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2
diff --git a/ios/Runner.xcodeproj/project.pbxproj b/ios/Runner.xcodeproj/project.pbxproj
@@ -406,7 +406,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {

diff --git a/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/lib/components/home/sections/friends.dart b/lib/components/home/sections/friends.dart
@@ -1,3 +1,6 @@
+import 'dart:ffi';
+import 'dart:ui';
+
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:skeletonizer/skeletonizer.dart';
@@ -69,22 +72,27 @@ class HomePageFriendsSection extends HookConsumerWidget {
             ),
           ),
           SliverToBoxAdapter(
-            child: SingleChildScrollView(
-              scrollDirection: Axis.horizontal,
-              child: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  for (final group in friendGroup)
-                    Row(
-                      children: [
-                        for (final friend in group)
-                          Padding(
-                            padding: const EdgeInsets.all(8.0),
-                            child: FriendItem(friend: friend),
-                          ),
-                      ],
-                    ),
-                ],
+            child: ScrollConfiguration(
+              behavior: ScrollConfiguration.of(context).copyWith(
+                dragDevices: PointerDeviceKind.values.toSet(),
+              ),
+              child: SingleChildScrollView(
+                scrollDirection: Axis.horizontal,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    for (final group in friendGroup)
+                      Row(
+                        children: [
+                          for (final friend in group)
+                            Padding(
+                              padding: const EdgeInsets.all(8.0),
+                              child: FriendItem(friend: friend),
+                            ),
+                        ],
+                      ),
+                  ],
+                ),
               ),
             ),
           ),

diff --git a/lib/l10n/app_en.arb b/lib/l10n/app_en.arb
@@ -293,5 +293,6 @@
   "replace_queue_question": "Do you want to replace the current queue or append to it?",
   "endless_playback": "Endless Playback",
   "delete_playlist": "Delete Playlist",
-  "delete_playlist_confirmation": "Are you sure you want to delete this playlist?"
+  "delete_playlist_confirmation": "Are you sure you want to delete this playlist?",
+  "local_tracks": "Local Tracks"
 }
diff --git a/lib/pages/library/library.dart b/lib/pages/library/library.dart
@@ -27,7 +27,7 @@ class LibraryPage extends HookConsumerWidget {
             leading: ThemedButtonsTabBar(
               tabs: [
                 Tab(text: "  ${context.l10n.playlists}  "),
-                Tab(text: "  ${context.l10n.tracks}  "),
+                Tab(text: "  ${context.l10n.local_tracks}  "),
                 Tab(
                   child: Badge(
                     isLabelVisible: downloadingCount > 0,

diff --git a/untranslated_messages.json b/untranslated_messages.json
@@ -6,7 +6,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "bn": [
@@ -16,7 +17,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "ca": [
@@ -26,7 +28,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "de": [
@@ -36,7 +39,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "es": [
@@ -46,7 +50,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "fa": [
@@ -56,7 +61,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "fr": [
@@ -66,7 +72,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "hi": [
@@ -76,7 +83,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "it": [
@@ -86,7 +94,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "ja": [
@@ -96,7 +105,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "ne": [
@@ -106,7 +116,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "nl": [
@@ -117,7 +128,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "pl": [
@@ -127,7 +139,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "pt": [
@@ -137,7 +150,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "ru": [
@@ -147,7 +161,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "tr": [
@@ -157,7 +172,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "uk": [
@@ -167,7 +183,8 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ],
 
   "zh": [
@@ -177,6 +194,7 @@
     "replace_queue_question",
     "endless_playback",
     "delete_playlist",
-    "delete_playlist_confirmation"
+    "delete_playlist_confirmation",
+    "local_tracks"
   ]
 }