Partial migration to new deps

RblSb · Jan 29, 2024 · ef6c563 · ef6c563
1 parent 420f9c9
commit ef6c563
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 98 deletions.
diff --git a/lib/app.dart b/lib/app.dart
@@ -111,7 +111,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
           direction: orientation == Orientation.landscape
               ? Axis.horizontal
               : Axis.vertical,
-          children: <Widget>[
+          children: [
             Selector<AppModel, bool>(
                 selector: (context, app) => app.isChatVisible,
                 builder: (context, isChatVisible, child) {
@@ -155,7 +155,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
                   visible: isChatVisible,
                   child: Expanded(
                     child: Column(
-                      children: <Widget>[
+                      children: [
                         if (orientation == Orientation.portrait &&
                             !_isKeyboardVisible())
                           ChatPanel(),
@@ -248,7 +248,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
       builder: (context) => AlertDialog(
         title: const Text('Are you sure?'),
         content: const Text('Do you want to exit channel?'),
-        actions: <Widget>[
+        actions: [
           TextButton(
             onPressed: () => Navigator.of(context).pop(false),
             child: const Text('No'),
@@ -302,7 +302,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
                 child: Column(
                   crossAxisAlignment: CrossAxisAlignment.stretch,
                   mainAxisSize: MainAxisSize.min,
-                  children: <Widget>[
+                  children: [
                     TextFormField(
                       initialValue: data.item.url,
                       autofocus: url == defaultUrl,
@@ -327,7 +327,7 @@ class _AppState extends State<App> with WidgetsBindingObserver {
                   ],
                 ),
               ),
-              actions: <Widget>[
+              actions: [
                 TextButton(
                   child: const Text('Queue next'),
                   onPressed: () {

diff --git 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: <Widget>[
+          children: [
             const Spacer(flex: 3),
             IconButton(
               onPressed: () => panel.togglePanel(MainTab.playlist),

diff --git 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<ServerListPage> {
   final List<ServerListItem> 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<ServerListPage> {
   }
 
   Future<int> 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
@@ -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: <Widget>[
+          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
@@ -12,7 +12,7 @@ class Settings extends StatelessWidget {
   Widget build(BuildContext context) {
     final app = context.watch<AppModel>();
     return ListView(
-      children: <Widget>[
+      children: [
         ListTile(
           title: const Text('Orientation'),
           trailing: Text('${app.prefferedOrientationType()}'),