pr comments fixes

Author: FlutterOd

.flutter-plugins-dependencies

@@ -1 +1 @@
-{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.1.0/","native_build":true,"dependencies":[]},{"name":"shared_preferences","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-2.0.2/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.1.0/","native_build":true,"dependencies":[]},{"name":"shared_preferences","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-2.0.2/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus_macos","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.6/","native_build":true,"dependencies":[]},{"name":"shared_preferences_macos","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-2.0.2/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus_linux","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.1.0/","native_build":false,"dependencies":[]},{"name":"path_provider_linux","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-2.1.6/","native_build":false,"dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-2.0.4/","native_build":false,"dependencies":["path_provider_linux"]}],"windows":[{"name":"connectivity_plus_windows","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/","native_build":true,"dependencies":[]},{"name":"path_provider_windows","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-2.0.6/","native_build":false,"dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-2.0.4/","native_build":false,"dependencies":["path_provider_windows"]}],"web":[{"name":"connectivity_plus_web","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.1.0+1/","dependencies":[]},{"name":"shared_preferences_web","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-2.0.4/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":["connectivity_plus_linux","connectivity_plus_macos","connectivity_plus_web","connectivity_plus_windows"]},{"name":"connectivity_plus_linux","dependencies":[]},{"name":"connectivity_plus_macos","dependencies":[]},{"name":"connectivity_plus_web","dependencies":[]},{"name":"connectivity_plus_windows","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2023-02-19 23:03:53.495512","version":"3.3.10"}
+{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"connectivity_plus","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.1.0/","native_build":true,"dependencies":[]},{"name":"shared_preferences","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-2.0.2/","native_build":true,"dependencies":[]}],"android":[{"name":"connectivity_plus","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus-2.1.0/","native_build":true,"dependencies":[]},{"name":"shared_preferences","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences-2.0.2/","native_build":true,"dependencies":[]}],"macos":[{"name":"connectivity_plus_macos","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_macos-1.2.6/","native_build":true,"dependencies":[]},{"name":"shared_preferences_macos","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_macos-2.0.2/","native_build":true,"dependencies":[]}],"linux":[{"name":"connectivity_plus_linux","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_linux-1.1.0/","native_build":false,"dependencies":[]},{"name":"path_provider_linux","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_linux-2.1.6/","native_build":false,"dependencies":[]},{"name":"shared_preferences_linux","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_linux-2.0.4/","native_build":false,"dependencies":["path_provider_linux"]}],"windows":[{"name":"connectivity_plus_windows","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_windows-1.2.2/","native_build":true,"dependencies":[]},{"name":"path_provider_windows","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/path_provider_windows-2.0.6/","native_build":false,"dependencies":[]},{"name":"shared_preferences_windows","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_windows-2.0.4/","native_build":false,"dependencies":["path_provider_windows"]}],"web":[{"name":"connectivity_plus_web","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/connectivity_plus_web-1.1.0+1/","dependencies":[]},{"name":"shared_preferences_web","path":"/Users/yurii/src/flutter/.pub-cache/hosted/pub.dartlang.org/shared_preferences_web-2.0.4/","dependencies":[]}]},"dependencyGraph":[{"name":"connectivity_plus","dependencies":["connectivity_plus_linux","connectivity_plus_macos","connectivity_plus_web","connectivity_plus_windows"]},{"name":"connectivity_plus_linux","dependencies":[]},{"name":"connectivity_plus_macos","dependencies":[]},{"name":"connectivity_plus_web","dependencies":[]},{"name":"connectivity_plus_windows","dependencies":[]},{"name":"path_provider_linux","dependencies":[]},{"name":"path_provider_windows","dependencies":[]},{"name":"shared_preferences","dependencies":["shared_preferences_linux","shared_preferences_macos","shared_preferences_web","shared_preferences_windows"]},{"name":"shared_preferences_linux","dependencies":["path_provider_linux"]},{"name":"shared_preferences_macos","dependencies":[]},{"name":"shared_preferences_web","dependencies":[]},{"name":"shared_preferences_windows","dependencies":["path_provider_windows"]}],"date_created":"2023-02-22 15:48:18.008821","version":"3.3.10"}

.gitignore

@@ -9,6 +9,8 @@
 .history
 .svn/
 migrate_working_dir/
+.flutter-plugins
+.flutter-plugins-dependencies
 
 # IntelliJ related
 *.iml
@@ -29,4 +31,8 @@ migrate_working_dir/
 .packages
 build/
 
+.pub-cache/
+.pub/
+/build/
+
 *.env

example/README.md

@@ -1,16 +1,25 @@
 # example
 
-example project
+Simple project to demonstrate how to use Crowdin SDK
 
 ## Getting Started
 
-This project is a starting point for a Flutter application.
+To run example project follow next steps:
 
-A few resources to get you started if this is your first Flutter project:
-
-- [Lab: Write your first Flutter app](https://docs.flutter.dev/get-started/codelab)
-- [Cookbook: Useful Flutter samples](https://docs.flutter.dev/cookbook)
-
-For help getting started with Flutter development, view the
-[online documentation](https://docs.flutter.dev/), which offers tutorials,
-samples, guidance on mobile development, and a full API reference.
+1. Clone repository from GitHub
+2. Create project on [Crowdin](https://crowdin.com/). Use texts_en.arb file from this project (flutter-sdk/example/lib/l10n/texts_en.arb) as source file.
+3. Run 'pup get' command to get project dependencies
+4. Run 'flutter gen-l10n'
+5. Run 'flutter pub run crowdin_sdk:gen' to generate Crowdin localization
+6. Provide your distribution hash to Crowdin initialization in 'main' function
+   ```
+   void main() async {
+     WidgetsFlutterBinding.ensureInitialized();
+     Crowdin.init(
+       distributionHash: 'your distribution hash',
+       ...
+     );
+   ...
+   }
+   ```
+8. Run the application

example/lib/main.dart

@@ -1,26 +1,14 @@
 import 'package:crowdin_sdk/crowdin_sdk.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_gen/gen_l10n/app_localizations.dart';
-
 import 'package:flutter_gen/gen_l10n/crowdin_localizations.dart';
-import 'dart:io';
-
-import 'package:flutter_dotenv/flutter_dotenv.dart';
 
-final GlobalKey<ScaffoldState> _key = GlobalKey();
-
-List<Locale> locales = const [
-  Locale('en'),
-  Locale('uk'),
-  Locale('it'),
-  Locale('he'),
-];
+import 'package:intl/intl.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
-  await dotenv.load(fileName: ".env");
   Crowdin.init(
-    distributionHash: dotenv.env['DISTRIBUTION_HASH'] ?? '', //your distribution hash
+    distributionHash: 'your distribution hash', //your distribution hash
     connectionType: InternetConnectionType.mobileData,
     distributionTtl: const Duration(minutes: 25),
   );
@@ -40,18 +28,18 @@ class _MyHomePageState extends State<MyHomePage> {
     super.initState();
   }
 
-  Locale currentLocale = Locale(Locale(Platform.localeName).toLanguageTag());
+  Locale currentLocale = Locale(Intl.shortLocale(Intl.systemLocale));
 
   @override
   Widget build(BuildContext context) {
     return MaterialApp(
       locale: currentLocale,
       localizationsDelegates: CrowdinLocalization.localizationsDelegates,
-      supportedLocales: locales,
+      supportedLocales: AppLocalizations.supportedLocales,
       theme: ThemeData(
         primarySwatch: Colors.blue,
       ),
-      home: Home(
+      home: MainScreen(
         changeLocale: (locale) => {
           setState(() {
             currentLocale = locale;
@@ -62,20 +50,18 @@ class _MyHomePageState extends State<MyHomePage> {
   }
 }
 
-class Home extends StatefulWidget {
+class MainScreen extends StatefulWidget {
   final void Function(Locale locale) changeLocale;
 
-  const Home({Key? key, required this.changeLocale}) : super(key: key);
+  const MainScreen({Key? key, required this.changeLocale}) : super(key: key);
 
   @override
-  State<Home> createState() => _HomeState();
+  State<MainScreen> createState() => _MainScreenState();
 }
 
-class _HomeState extends State<Home> {
-  String dropdownValue = locales.first.languageCode;
+class _MainScreenState extends State<MainScreen> {
 
   int _counter = 0;
-
   void _incrementCounter() {
     setState(() {
       _counter++;
@@ -86,7 +72,6 @@ class _HomeState extends State<Home> {
   Widget build(BuildContext context) {
     return Scaffold(
       drawer: Drawer(
-        key: _key,
         child: ListView(
           padding: EdgeInsets.zero,
           children: [
@@ -142,11 +127,6 @@ class _HomeState extends State<Home> {
               AppLocalizations.of(context)!.counter(_counter),
               style: const TextStyle(fontSize: 30),
             ),
-            const SizedBox(height: 16),
-            Text(
-              AppLocalizations.of(context)!.nThings(0, 'thing'),
-              style: const TextStyle(fontSize: 30),
-            ),
           ],
         ),
       ),
@@ -188,15 +168,12 @@ class _SettingsScreenState extends State<SettingsScreen> {
               iconSize: 40,
               value: AppLocalizations.of(context)!.localeName,
               items: [
-                ...locales
+                ...AppLocalizations.supportedLocales
                     .map((locale) => DropdownMenuItem<String>(
                           value: locale.languageCode,
                           onTap: () async {
                             await Crowdin.getDistribution(locale);
                             widget.onLanguageChanged(locale);
-                            setState(() {
-                              // dropdownValue = locale.languageCode;
-                            });
                           },
                           child: Text(locale.languageCode),
                         ))

example/pubspec.lock

@@ -132,13 +132,6 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
-  flutter_dotenv:
-    dependency: "direct main"
-    description:
-      name: flutter_dotenv
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "5.0.2"
   flutter_lints:
     dependency: "direct dev"
     description:

example/pubspec.yaml

@@ -1,96 +1,38 @@
 name: example
-description: example project
+description: Simple project to demonstrate how to use Crowdin SDK
+
 
-# The following line prevents the package from being accidentally published to
-# pub.dev using `flutter pub publish`. This is preferred for private packages.
 publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 
-# The following defines the version and build number for your application.
-# A version number is three numbers separated by dots, like 1.2.43
-# followed by an optional build number separated by a +.
-# Both the version and the builder number may be overridden in flutter
-# build by specifying --build-name and --build-number, respectively.
-# In Android, build-name is used as versionName while build-number used as versionCode.
-# Read more about Android versioning at https://developer.android.com/studio/publish/versioning
-# In iOS, build-name is used as CFBundleShortVersionString while build-number is used as CFBundleVersion.
-# Read more about iOS versioning at
-# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-# In Windows, build-name is used as the major, minor, and patch parts
-# of the product and file versions while build-number is used as the build suffix.
 version: 1.0.0+1
 
 environment:
   sdk: '>=2.18.6 <3.0.0'
 
-# Dependencies specify other packages that your package needs in order to work.
-# To automatically upgrade your package dependencies to the latest versions
-# consider running `flutter pub upgrade --major-versions`. Alternatively,
-# dependencies can be manually updated by changing the version numbers below to
-# the latest version available on pub.dev. To see which dependencies have newer
-# versions available, run `flutter pub outdated`.
 dependencies:
   flutter:
     sdk: flutter
   flutter_localizations:
     sdk: flutter
   intl: 0.17.0
-  flutter_dotenv: 5.0.2
 
+  # In your real app use:
+  #   crowdin_sdk: x.x.x
   crowdin_sdk:
     path: ../
 
-  # The following adds the Cupertino Icons font to your application.
-  # Use with the CupertinoIcons class for iOS style icons.
+
   cupertino_icons: ^1.0.2
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
 
-  # The "flutter_lints" package below contains a set of recommended lints to
-  # encourage good coding practices. The lint set provided by the package is
-  # activated in the `analysis_options.yaml` file located at the root of your
-  # package. See that file for information about deactivating specific lint
-  # rules and activating additional ones.
   flutter_lints: ^2.0.0
 
-# For information on the generic Dart part of this file, see the
-# following page: https://dart.dev/tools/pub/pubspec
-
 # The following section is specific to Flutter packages.
 flutter:
   generate: true
-  # The following line ensures that the Material Icons font is
-  # included with your application, so that you can use the icons in
-  # the material Icons class.
-  uses-material-design: true
 
-  # To add assets to your application, add an assets section, like this:
-  assets:
-     - .env
-
-  # An image asset can refer to one or more resolution-specific "variants", see
-  # https://flutter.dev/assets-and-images/#resolution-aware
-
-  # For details regarding adding assets from package dependencies, see
-  # https://flutter.dev/assets-and-images/#from-packages
+  uses-material-design: true
 
-  # To add custom fonts to your application, add a fonts section here,
-  # in this "flutter" section. Each entry in this list should have a
-  # "family" key with the font family name, and a "fonts" key with a
-  # list giving the asset and other descriptors for the font. For
-  # example:
-  # fonts:
-  #   - family: Schyler
-  #     fonts:
-  #       - asset: fonts/Schyler-Regular.ttf
-  #       - asset: fonts/Schyler-Italic.ttf
-  #         style: italic
-  #   - family: Trajan Pro
-  #     fonts:
-  #       - asset: fonts/TrajanPro.ttf
-  #       - asset: fonts/TrajanPro_Bold.ttf
-  #         weight: 700
-  #
-  # For details regarding fonts from package dependencies,
-  # see https://flutter.dev/custom-fonts/#from-packages

example/test/widget_test.dart

@@ -1,30 +1,26 @@
-// // This is a basic Flutter widget test.
-// //
-// // To perform an interaction with a widget in your test, use the WidgetTester
-// // utility in the flutter_test package. For example, you can send tap and scroll
-// // gestures. You can also use WidgetTester to find child widgets in the widget
-// // tree, read text, and verify that the values of widget properties are correct.
+// This is a basic Flutter widget test.
 //
-// import 'package:flutter/material.dart';
-// import 'package:flutter_test/flutter_test.dart';
-//
-// import 'package:example/main.dart';
-//
-// void main() {
-//   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
-//     // Build our app and trigger a frame.
-//     await tester.pumpWidget(const MyApp());
-//
-//     // Verify that our counter starts at 0.
-//     expect(find.text('0'), findsOneWidget);
-//     expect(find.text('1'), findsNothing);
-//
-//     // Tap the '+' icon and trigger a frame.
-//     await tester.tap(find.byIcon(Icons.add));
-//     await tester.pump();
-//
-//     // Verify that our counter has incremented.
-//     expect(find.text('0'), findsNothing);
-//     expect(find.text('1'), findsOneWidget);
-//   });
-// }
+// To perform an interaction with a widget in your test, use the WidgetTester
+// utility in the flutter_test package. For example, you can send tap and scroll
+// gestures. You can also use WidgetTester to find child widgets in the widget
+// tree, read text, and verify that the values of widget properties are correct.
+
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+
+import 'package:example/main.dart';
+
+void main() {
+  testWidgets('Counter increments smoke test', (WidgetTester tester) async {
+    // Build our app and trigger a frame.
+    await tester.pumpWidget(const MyHomePage());
+
+    expect(find.text('1'), findsNothing);
+
+    // Tap the '+' icon and trigger a frame.
+    await tester.tap(find.byIcon(Icons.add));
+    await tester.pump();
+
+    expect(find.text('0'), findsNothing);
+  });
+}

lib/src/crowdin.dart

@@ -79,7 +79,6 @@ class Crowdin {
       }
     } catch (ex) {
       throw CrowdinException('No translations on Crowdin');
-      // throw CrowdinException('$ex');
     }
   }
 

lib/src/crowdin_extractor.dart

@@ -153,17 +153,6 @@ class Extractor {
       other: extractedPlurals[5],
     );
   }
-
-// String? _findPlural(String formattedMessage, String pluralKey) {
-//   final exp = RegExp('($pluralKey)\\s*{([^}]+)}');
-//   final RegExpMatch? match = exp.firstMatch(formattedMessage);
-//   if (match != null && match.groupCount == 2) {
-//     return match.group(2)!;
-//   } else {
-//     return null;
-//   }
-// }
-
 }
 
 @visibleForTesting