From 341aa1f1a3d5441045ec1f819ca5b05234bc5e5f Mon Sep 17 00:00:00 2001 From: RblSb Date: Mon, 29 Jan 2024 06:09:46 +0300 Subject: [PATCH] Partial migration to new deps --- lib/app.dart | 10 +-- lib/chat_panel.dart | 2 +- lib/main.dart | 6 +- lib/playlist.dart | 6 +- lib/settings.dart | 2 +- pubspec.lock | 168 +++++++++++++++++++++++--------------------- pubspec.yaml | 8 +-- 7 files changed, 105 insertions(+), 97 deletions(-) diff --git a/lib/app.dart b/lib/app.dart index 7725f69..c9a209e 100644 --- a/lib/app.dart +++ b/lib/app.dart @@ -111,7 +111,7 @@ class _AppState extends State with WidgetsBindingObserver { direction: orientation == Orientation.landscape ? Axis.horizontal : Axis.vertical, - children: [ + children: [ Selector( selector: (context, app) => app.isChatVisible, builder: (context, isChatVisible, child) { @@ -155,7 +155,7 @@ class _AppState extends State with WidgetsBindingObserver { visible: isChatVisible, child: Expanded( child: Column( - children: [ + children: [ if (orientation == Orientation.portrait && !_isKeyboardVisible()) ChatPanel(), @@ -248,7 +248,7 @@ class _AppState extends State with WidgetsBindingObserver { builder: (context) => AlertDialog( title: const Text('Are you sure?'), content: const Text('Do you want to exit channel?'), - actions: [ + actions: [ TextButton( onPressed: () => Navigator.of(context).pop(false), child: const Text('No'), @@ -302,7 +302,7 @@ class _AppState extends State with WidgetsBindingObserver { child: Column( crossAxisAlignment: CrossAxisAlignment.stretch, mainAxisSize: MainAxisSize.min, - children: [ + children: [ TextFormField( initialValue: data.item.url, autofocus: url == defaultUrl, @@ -327,7 +327,7 @@ class _AppState extends State with WidgetsBindingObserver { ], ), ), - actions: [ + actions: [ TextButton( child: const Text('Queue next'), onPressed: () { diff --git a/lib/chat_panel.dart b/lib/chat_panel.dart index 172401e..aa97ddc 100644 --- a/lib/chat_panel.dart +++ b/lib/chat_panel.dart @@ -18,7 +18,7 @@ class ChatPanel extends StatelessWidget { // padding: EdgeInsets.symmetric(horizontal: paddingNum), color: Theme.of(context).chatPanelBackground, child: Row( - children: [ + children: [ const Spacer(flex: 3), IconButton( onPressed: () => panel.togglePanel(MainTab.playlist), diff --git a/lib/main.dart b/lib/main.dart index febac2d..e944144 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -26,7 +26,7 @@ class Main extends StatelessWidget { @override Widget build(BuildContext context) { final theme = ThemeData.from( - // useMaterial3: true, + useMaterial3: false, colorScheme: ColorScheme.fromSwatch( brightness: Brightness.dark, primarySwatch: Colors.blue, @@ -62,7 +62,8 @@ class ServerListPage extends StatefulWidget { class _ServerListPageState extends State { final List items = []; Offset? _tapPosition; - final latestApkUrl = 'https://tube.syncme.site/SyncTubeApp/SyncTube.apk'; + final latestApkUrl = 'http://82.146.45.136/SyncTubeApp/SyncTube.apk'; + final pubspecUrl = 'http://82.146.45.136/SyncTubeApp/pubspec.yaml'; @override void initState() { @@ -384,7 +385,6 @@ class _ServerListPageState extends State { } Future checkUpdateBuildNumber() async { - final pubspecUrl = 'https://tube.syncme.site/SyncTubeApp/pubspec.yaml'; http.Response res; try { res = await http.get(Uri.parse(pubspecUrl)).timeout(Duration(seconds: 5)); diff --git a/lib/playlist.dart b/lib/playlist.dart index 6f0959d..b076894 100644 --- a/lib/playlist.dart +++ b/lib/playlist.dart @@ -9,7 +9,7 @@ import 'wsdata.dart'; class Playlist extends StatelessWidget { const Playlist({Key? key}) : super(key: key); - Widget plailistItem( + Widget playlistItem( BuildContext context, PlaylistModel playlist, { required VideoList item, @@ -42,7 +42,7 @@ class Playlist extends StatelessWidget { ), padding: containerPadding, child: Wrap( - children: [ + children: [ GestureDetector( onLongPress: () { Clipboard.setData(ClipboardData(text: item.url)); @@ -157,7 +157,7 @@ class Playlist extends StatelessWidget { itemCount: playlist.length, itemBuilder: (context, index) { final item = playlist.getItem(index)!; - return plailistItem( + return playlistItem( context, playlist, item: item, diff --git a/lib/settings.dart b/lib/settings.dart index cb463c8..1ac1cb8 100644 --- a/lib/settings.dart +++ b/lib/settings.dart @@ -12,7 +12,7 @@ class Settings extends StatelessWidget { Widget build(BuildContext context) { final app = context.watch(); return ListView( - children: [ + children: [ ListTile( title: const Text('Orientation'), trailing: Text('${app.prefferedOrientationType()}'), diff --git a/pubspec.lock b/pubspec.lock index df40cdf..628853f 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -5,10 +5,10 @@ packages: dependency: "direct main" description: name: app_links - sha256: eb83c2b15b78a66db04e95132678e910fcdb8dc3a9b0aed0c138f50b2bef0dae + sha256: "4e392b5eba997df356ca6021f28431ce1cfeb16758699553a94b13add874a3bb" url: "https://pub.dev" source: hosted - version: "3.4.5" + version: "3.5.0" args: dependency: transitive description: @@ -53,10 +53,10 @@ packages: dependency: transitive description: name: collection - sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a url: "https://pub.dev" source: hosted - version: "1.17.2" + version: "1.18.0" crypto: dependency: "direct main" description: @@ -77,18 +77,18 @@ packages: dependency: transitive description: name: dbus - sha256: "6f07cba3f7b3448d42d015bfd3d53fe12e5b36da2423f23838efc1d5fb31a263" + sha256: "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac" url: "https://pub.dev" source: hosted - version: "0.7.8" + version: "0.7.10" device_info_plus: dependency: "direct main" description: name: device_info_plus - sha256: "86add5ef97215562d2e090535b0a16f197902b10c369c558a100e74ea06e8659" + sha256: "0042cb3b2a76413ea5f8a2b40cec2a33e01d0c937e91f0f7c211fde4f7739ba6" url: "https://pub.dev" source: hosted - version: "9.0.3" + version: "9.1.1" device_info_plus_platform_interface: dependency: transitive description: @@ -144,6 +144,14 @@ packages: url: "https://pub.dev" source: hosted version: "2.4.1" + gtk: + dependency: transitive + description: + name: gtk + sha256: e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c + url: "https://pub.dev" + source: hosted + version: "2.1.0" html: dependency: transitive description: @@ -156,10 +164,10 @@ packages: dependency: "direct main" description: name: http - sha256: "759d1a329847dd0f39226c688d3e06a6b8679668e350e2891a6474f8b4bb8525" + sha256: a2bbf9d017fcced29139daa8ed2bba4ece450ab222871df93ca9eec6f80c34ba url: "https://pub.dev" source: hosted - version: "1.1.0" + version: "1.2.0" http_parser: dependency: transitive description: @@ -204,18 +212,18 @@ packages: dependency: transitive description: name: meta - sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e url: "https://pub.dev" source: hosted - version: "1.9.1" + version: "1.10.0" native_device_orientation: dependency: "direct main" description: name: native_device_orientation - sha256: c0b52f6bb2310dc5d5efc71e48644ad029f77d8ce007f91f635e9a00ddfbd5d5 + sha256: "3834eb93f8b98bf130f654a24572f7df8971bbb1255aa99d562f703df9e09d59" url: "https://pub.dev" source: hosted - version: "1.2.0" + version: "2.0.2" nested: dependency: transitive description: @@ -228,18 +236,18 @@ packages: dependency: "direct main" description: name: ota_update - sha256: "7ce0af2119458cb7cc3122ecdc4e18ec3c0108162bfab9a4b064d686e1a5fc22" + sha256: "8c47531b655f8fcf9961dc7758a933a9ccbcbe1c77a7ec52e5c5cfc2ec367ba7" url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "6.0.0" package_info_plus: dependency: "direct main" description: name: package_info_plus - sha256: "6ff267fcd9d48cb61c8df74a82680e8b82e940231bb5f68356672fde0397334a" + sha256: "7e76fad405b3e4016cd39d08f455a4eb5199723cf594cd1b8916d47140d93017" url: "https://pub.dev" source: hosted - version: "4.1.0" + version: "4.2.0" package_info_plus_platform_interface: dependency: transitive description: @@ -268,10 +276,10 @@ packages: dependency: transitive description: name: path_provider_platform_interface - sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" + sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" path_provider_windows: dependency: transitive description: @@ -292,34 +300,34 @@ packages: dependency: transitive description: name: petitparser - sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + sha256: c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27 url: "https://pub.dev" source: hosted - version: "5.4.0" + version: "6.0.2" platform: dependency: transitive description: name: platform - sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59" + sha256: "12220bb4b65720483f8fa9450b4332347737cf8213dd2840d8b2c823e47243ec" url: "https://pub.dev" source: hosted - version: "3.1.3" + version: "3.1.4" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d + sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02" url: "https://pub.dev" source: hosted - version: "2.1.6" + version: "2.1.8" provider: dependency: "direct main" description: name: provider - sha256: cdbe7530b12ecd9eb455bdaa2fcb8d4dad22e80b8afb4798b41479d5ce26847f + sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096" url: "https://pub.dev" source: hosted - version: "6.0.5" + version: "6.1.1" shared_preferences: dependency: "direct main" description: @@ -340,10 +348,10 @@ packages: dependency: transitive description: name: shared_preferences_foundation - sha256: "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7" + sha256: "7708d83064f38060c7b39db12aefe449cb8cdc031d6062280087bc4cdb988f5c" url: "https://pub.dev" source: hosted - version: "2.3.4" + version: "2.3.5" shared_preferences_linux: dependency: transitive description: @@ -356,18 +364,18 @@ packages: dependency: transitive description: name: shared_preferences_platform_interface - sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a + sha256: "22e2ecac9419b4246d7c22bfbbda589e3acf5c0351137d87dd2939d984d37c3b" url: "https://pub.dev" source: hosted - version: "2.3.1" + version: "2.3.2" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + sha256: "7b15ffb9387ea3e237bb7a66b8a23d2147663d391cafc5c8f37b2e7b4bde5d21" url: "https://pub.dev" source: hosted - version: "2.2.1" + version: "2.2.2" shared_preferences_windows: dependency: transitive description: @@ -393,18 +401,18 @@ packages: dependency: transitive description: name: stack_trace - sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b" url: "https://pub.dev" source: hosted - version: "1.11.0" + version: "1.11.1" stream_channel: dependency: transitive description: name: stream_channel - sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7 url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.2" string_scanner: dependency: transitive description: @@ -425,10 +433,10 @@ packages: dependency: transitive description: name: test_api - sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b" url: "https://pub.dev" source: hosted - version: "0.6.0" + version: "0.6.1" typed_data: dependency: transitive description: @@ -441,66 +449,66 @@ packages: dependency: "direct main" description: name: url_launcher - sha256: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27" + sha256: c512655380d241a337521703af62d2c122bf7b77a46ff7dd750092aa9433499c url: "https://pub.dev" source: hosted - version: "6.1.14" + version: "6.2.4" url_launcher_android: dependency: transitive description: name: url_launcher_android - sha256: b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330 + sha256: "507dc655b1d9cb5ebc756032eb785f114e415f91557b73bf60b7e201dfedeb2f" url: "https://pub.dev" source: hosted - version: "6.1.0" + version: "6.2.2" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - sha256: "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f" + sha256: "75bb6fe3f60070407704282a2d295630cab232991eb52542b18347a8a941df03" url: "https://pub.dev" source: hosted - version: "6.1.5" + version: "6.2.4" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - sha256: b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e + sha256: ab360eb661f8879369acac07b6bb3ff09d9471155357da8443fd5d3cf7363811 url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.1.1" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - sha256: b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88 + sha256: b7244901ea3cf489c5335bdacda07264a6e960b1c1b1a9f91e4bc371d9e68234 url: "https://pub.dev" source: hosted - version: "3.0.7" + version: "3.1.0" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - sha256: "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618" + sha256: a932c3a8082e118f80a475ce692fde89dc20fddb24c57360b96bc56f7035de1f url: "https://pub.dev" source: hosted - version: "2.1.5" + version: "2.3.1" url_launcher_web: dependency: transitive description: name: url_launcher_web - sha256: "2942294a500b4fa0b918685aff406773ba0a4cd34b7f42198742a94083020ce5" + sha256: fff0932192afeedf63cdd50ecbb1bc825d31aed259f02bb8dba0f3b729a5e88b url: "https://pub.dev" source: hosted - version: "2.0.20" + version: "2.2.3" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - sha256: "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069" + sha256: ecf9725510600aa2bb6d7ddabe16357691b6d2805f66216a97d1b881e21beff7 url: "https://pub.dev" source: hosted - version: "3.0.8" + version: "3.1.1" vector_math: dependency: transitive description: @@ -513,50 +521,50 @@ packages: dependency: "direct main" description: name: video_player - sha256: "74b86e63529cf5885130c639d74cd2f9232e7c8a66cbecbddd1dcb9dbd060d1e" + sha256: fbf28ce8bcfe709ad91b5789166c832cb7a684d14f571a81891858fefb5bb1c2 url: "https://pub.dev" source: hosted - version: "2.7.2" + version: "2.8.2" video_player_android: dependency: transitive description: name: video_player_android - sha256: "3fe89ab07fdbce786e7eb25b58532d6eaf189ceddc091cb66cba712f8d9e8e55" + sha256: "7f8f25d7ad56819a82b2948357f3c3af071f6a678db33833b26ec36bbc221316" url: "https://pub.dev" source: hosted - version: "2.4.10" + version: "2.4.11" video_player_avfoundation: dependency: transitive description: name: video_player_avfoundation - sha256: "6387c2de77763b45104256b3b00b660089be4f909ded8631457dc11bf635e38f" + sha256: "309e3962795e761be010869bae65c0b0e45b5230c5cee1bec72197ca7db040ed" url: "https://pub.dev" source: hosted - version: "2.5.0" + version: "2.5.6" video_player_platform_interface: dependency: transitive description: name: video_player_platform_interface - sha256: be72301bf2c0150ab35a8c34d66e5a99de525f6de1e8d27c0672b836fe48f73a + sha256: "236454725fafcacf98f0f39af0d7c7ab2ce84762e3b63f2cbb3ef9a7e0550bc6" url: "https://pub.dev" source: hosted - version: "6.2.1" + version: "6.2.2" video_player_web: dependency: transitive description: name: video_player_web - sha256: "2dd24f7ba46bfb5d070e9c795001db95e0ca5f2a3d025e98f287c10c9f0fd62f" + sha256: "34beb3a07d4331a24f7e7b2f75b8e2b103289038e07e65529699a671b6a6e2cb" url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.3" wakelock_plus: dependency: "direct main" description: name: wakelock_plus - sha256: "268e56b9c63f850406f54e9acb2a7d2ddf83c26c8ff9e7a125a96c3a513bf65f" + sha256: f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.4" wakelock_plus_platform_interface: dependency: transitive description: @@ -569,10 +577,10 @@ packages: dependency: transitive description: name: web - sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152 url: "https://pub.dev" source: hosted - version: "0.1.4-beta" + version: "0.3.0" web_socket_channel: dependency: "direct main" description: @@ -585,10 +593,10 @@ packages: dependency: transitive description: name: win32 - sha256: "350a11abd2d1d97e0cc7a28a81b781c08002aa2864d9e3f192ca0ffa18b06ed3" + sha256: "464f5674532865248444b4c3daca12bd9bf2d7c47f759ce2617986e7229494a8" url: "https://pub.dev" source: hosted - version: "5.0.9" + version: "5.2.0" win32_registry: dependency: transitive description: @@ -601,26 +609,26 @@ packages: dependency: transitive description: name: xdg_directories - sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2" + sha256: faea9dee56b520b55a566385b84f2e8de55e7496104adada9962e0bd11bcff1d url: "https://pub.dev" source: hosted - version: "1.0.3" + version: "1.0.4" xml: dependency: transitive description: name: xml - sha256: "5bc72e1e45e941d825fd7468b9b4cc3b9327942649aeb6fc5cdbf135f0a86e84" + sha256: b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226 url: "https://pub.dev" source: hosted - version: "6.3.0" + version: "6.5.0" youtube_explode_dart: dependency: "direct main" description: name: youtube_explode_dart - sha256: "98fd11b51adbbca76cbdb17f560168f1d7a9835cecceea965f49eb1e5eed155c" + sha256: "77a55747579c76b5d071bca3941cfca141207f064b3f0322994573cb4a0c2831" url: "https://pub.dev" source: hosted - version: "2.0.2" + version: "2.1.0" sdks: - dart: ">=3.1.0 <4.0.0" - flutter: ">=3.13.0" + dart: ">=3.2.0 <4.0.0" + flutter: ">=3.16.0" diff --git a/pubspec.yaml b/pubspec.yaml index 48d12c2..0c0f9c5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -34,7 +34,7 @@ dependencies: perfect_volume_control: ^1.0.5 - web_socket_channel: ^2.3.0 + web_socket_channel: ^2.4.0 http: ^1.1.0 @@ -44,15 +44,15 @@ dependencies: wakelock_plus: ^1.1.1 - native_device_orientation: ^1.1.4 + native_device_orientation: ^2.0.2 device_info_plus: ^9.0.3 - package_info_plus: ^4.1.0 + package_info_plus: ^4.2.0 app_links: ^3.4.2 - ota_update: ^5.1.0 + ota_update: ^6.0.0 # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons.