Merge branch 'main' into feature/transparency

Author: aguilaair

.all-contributorsrc

@@ -162,6 +162,25 @@
       "contributions": [
         "translation"
       ]
+    },
+    {
+      "login": "LosDanieloss",
+      "name": "Daniel Łojewski",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10536371?v=4",
+      "profile": "https://github.com/LosDanieloss",
+      "contributions": [
+        "translation"
+      ]
+    },
+    {
+      "login": "federicoviceconti",
+      "name": "Federico",
+      "avatar_url": "https://avatars.githubusercontent.com/u/25590766?v=4",
+      "profile": "http://federicoviceconti.com",
+      "contributions": [
+        "translation",
+        "bug"
+      ]
     }
   ],
   "projectName": "sidekick",

README.md

@@ -49,6 +49,10 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
     <td align="center"><a href="http://petner.kr"><img src="https://avatars.githubusercontent.com/u/37838834?v=4?s=50" width="50px;" alt=""/><br /><sub><b>seenewmax</b></sub></a><br /><a href="#translation-seenewmax" title="Translation">🌍</a></td>
     <td align="center"><a href="https://github.com/Chrg1001"><img src="https://avatars.githubusercontent.com/u/40189653?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Chrg1001</b></sub></a><br /><a href="#translation-Chrg1001" title="Translation">🌍</a></td>
   </tr>
+  <tr>
+    <td align="center"><a href="https://github.com/LosDanieloss"><img src="https://avatars.githubusercontent.com/u/10536371?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Daniel Łojewski</b></sub></a><br /><a href="#translation-LosDanieloss" title="Translation">🌍</a></td>
+    <td align="center"><a href="http://federicoviceconti.com"><img src="https://avatars.githubusercontent.com/u/25590766?v=4?s=50" width="50px;" alt=""/><br /><sub><b>Federico</b></sub></a><br /><a href="#translation-federicoviceconti" title="Translation">🌍</a> <a href="https://github.com/leoafarias/sidekick/issues?q=author%3Afedericoviceconti" title="Bug reports">🐛</a></td>
+  </tr>
 </table>
 
 <!-- markdownlint-restore -->

lib/i18n/language_manager.dart

@@ -20,6 +20,8 @@ class LanguageManager {
     const Locale('zh', 'CN'),
     const Locale('ko', 'KR'),
     const Locale('ja', 'JP'),
+    const Locale('pl', 'PL'),
+    const Locale('it', 'IT'),
   ];
 
   List<String> getListOfLocalesAsString() {

lib/src/components/atoms/console.dart

@@ -2,7 +2,6 @@ import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:flutter_spinkit/flutter_spinkit.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:material_design_icons_flutter/material_design_icons_flutter.dart';
 
 import '../../modules/fvm/fvm.provider.dart';
@@ -21,11 +20,11 @@ class Console extends HookWidget {
 
   @override
   Widget build(BuildContext context) {
-    final output = useProvider(fvmStdoutProvider);
+    final output = useStream(fvmStdoutProvider);
     final lines = useState<List<String>>(['']);
 
     useValueChanged(output, (_, __) {
-      lines.value.insert(0, output.data.value);
+      lines.value.insert(0, output.data);
       if (lines.value.length > 100) {
         lines.value.removeAt(lines.value.length - 1);
       }
@@ -65,7 +64,10 @@ class Console extends HookWidget {
                     mainAxisAlignment: MainAxisAlignment.start,
                     crossAxisAlignment: CrossAxisAlignment.center,
                     children: [
-                      ConsoleText(lines.value.first),
+                      Container(
+                          width: MediaQuery.of(context).size.width - 100,
+                          child: ConsoleText(lines.value.first)
+                      ),
                     ],
                   ),
                 ),

lib/src/components/atoms/sliver_header_delegate.dart

@@ -41,7 +41,7 @@ class SliverHeaderDelegate extends SliverPersistentHeaderDelegate {
         ),
         trailing: Text(
           I18Next.of(context).t('components:atoms.countFound', variables: {
-            'count': count.toString(),
+            'count': count,
           }),
         ),
         onTap: onPress,

lib/src/components/molecules/version_install_button.dart

@@ -89,7 +89,7 @@ class VersionInstallButton extends HookWidget {
       child: Opacity(
         opacity: (version?.isCached ?? false) ? 0.3 : 1,
         child: IconButton(
-          onPressed: (version?.isCached ?? false) ? onInstall : onInstall,
+          onPressed: onInstall,
           splashRadius: 20,
           icon: Tooltip(
               message:

lib/src/components/organisms/app_bottom_bar.dart

@@ -17,7 +17,7 @@ class AppBottomBar extends HookWidget {
       expand.value = !expand.value;
     }
 
-    if (processing == false) {
+    if (!processing) {
       return Container(height: 0);
     }
 

lib/src/modules/common/app_shell.dart

@@ -22,6 +22,12 @@ import 'constants.dart';
 
 final _scaffoldKey = GlobalKey<ScaffoldState>();
 
+const pages = [
+  FVMScreen(),
+  ProjectsScreen(),
+  ReleasesScreen(),
+];
+
 /// Main widget of the app
 class AppShell extends HookWidget {
   /// Constructor
@@ -59,17 +65,6 @@ class AppShell extends HookWidget {
       }
     });
 
-    // Render corret page widget based on index
-    Widget renderPage(int index) {
-      const pages = [
-        FVMScreen(),
-        ProjectsScreen(),
-        ReleasesScreen(),
-      ];
-
-      return pages[index];
-    }
-
     NavigationRailDestination renderNavButton(String label, IconData iconData) {
       return NavigationRailDestination(
         icon: Icon(iconData, size: 20),
@@ -115,7 +110,10 @@ class AppShell extends HookWidget {
                 ),
               ],
             ),
-            const VerticalDivider(thickness: 1, width: 1),
+            const VerticalDivider(
+              thickness: 1,
+              width: 1,
+            ),
             Expanded(
               child: Stack(
                 fit: StackFit.expand,
@@ -144,7 +142,7 @@ class AppShell extends HookWidget {
                                   child: child,
                                 );
                               },
-                              child: renderPage(selectedIndex.value),
+                              child: pages[selectedIndex.value],
                             ),
                           ),
                         ],

lib/src/modules/fvm/fvm.provider.dart

@@ -118,16 +118,17 @@ class FvmCacheProvider extends StateNotifier<List<CacheVersion>> {
   }
 }
 
-final fvmStdoutProvider = StreamProvider.autoDispose((ref) {
-  return StreamGroup.merge([
+final fvmStdoutProvider = StreamGroup
+    .mergeBroadcast(_getConsoleStreams())
+    .transform(utf8.decoder);
+
+List<Stream<List<int>>> _getConsoleStreams() {
+  return [
     FVMClient.console.stdout.stream,
     FVMClient.console.stderr.stream,
     FVMClient.console.warning.stream,
     FVMClient.console.info.stream,
     FVMClient.console.fine.stream,
     FVMClient.console.error.stream,
-  ])
-      .transform(utf8.decoder)
-      // .transform(const LineSplitter())
-      .asBroadcastStream();
-});
+  ];
+}

localizations/ar-SA/settings.json

@@ -9,7 +9,9 @@
       "ja-JP": "日本語",
       "sv-SE": "Svenska",
       "zh-CN": "中文",
-      "ko-KR": "한국어"
+      "ko-KR": "한국어",
+      "pl-PL": "Polski",
+      "it-IT": "Italiano"
     }
   }
 }

localizations/de-DE/settings.json

@@ -9,7 +9,9 @@
       "ja-JP": "日本語",
       "sv-SE": "Svenska",
       "zh-CN": "中文",
-      "ko-KR": "한국어"
+      "ko-KR": "한국어",
+      "pl-PL": "Polski",
+      "it-IT": "Italiano"
     }
   }
 }

localizations/en-GB/settings.json

@@ -9,7 +9,9 @@
       "ja-JP": "日本語",
       "sv-SE": "Svenska",
       "zh-CN": "中文",
-      "ko-KR": "한국어"
+      "ko-KR": "한국어",
+      "pl-PL": "Polski",
+      "it-IT": "Italiano"
     }
   }
 }

localizations/en-US/settings.json

@@ -9,7 +9,9 @@
       "ja-JP": "日本語",
       "sv-SE": "Svenska",
       "zh-CN": "中文",
-      "ko-KR": "한국어"
+      "ko-KR": "한국어",
+      "pl-PL": "Polski",
+      "it-IT": "Italiano"
     }
   }
 }

localizations/es-ES/settings.json

@@ -9,7 +9,9 @@
       "ja-JP": "日本語",
       "sv-SE": "Svenska",
       "zh-CN": "中文",
-      "ko-KR": "한국어"
+      "ko-KR": "한국어",
+      "pl-PL": "Polski",
+      "it-IT": "Italiano"
     }
   }
 }

localizations/it-IT/components.json

@@ -0,0 +1,12 @@
+{
+    "atoms": {
+        "copiedToClipboard": "Copiato negli appunti",
+        "refresh": "Aggiorna",
+        "countFound": "{{count}} risultato/i"
+    },
+    "molecules": {
+        "master": "Master",
+        "versionIsInstalled": "La versione è installata",
+        "versionNotInstalledClickToInstall": "Versione non installata. Premi per installare."
+    }
+}