Merge pull request #11 from StringCare/develop

Develop

Author: efraespada

.pubignore

@@ -0,0 +1,6 @@
+stringcare.iml
+
+*.lock
+.dart_tool
+.DS_Store
+.idea/

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.1.0
+
+* Added `string()` method for getting resources.
+* Added `withLang` for overriding current language (string format).
+* Added `withLocale` for overriding current language (locale format).
+* Added `RemoteLanguages` for overriding translations at runtime.
+
 ## 0.0.1
 
-* TODO: Describe initial release.
+* Initial version.

README.md

@@ -13,11 +13,7 @@ Flutter plugin for encrypt/decrypt `String` and `Uint8List` objects easily with
 
 -----
 
-Simplify the way you work with secured resources, Strings and Uint8List objects:
-
-```dart
-"my_secret".obfuscate();
-```
+Retrieve any string resource quickly and easily, anywhere:
 
 `en.json`
 
@@ -28,7 +24,13 @@ Simplify the way you work with secured resources, Strings and Uint8List objects:
 ```
 
 ```dart
-R.strings.hello_there.on(context);
+R.strings.hello_there.string();
+```
+
+Simplify the way you work with secured resources, Strings and Uint8List objects:
+
+```dart
+"my_secret".obfuscate();
 ```
 
 -----

bin/obfuscate.dart

@@ -1,7 +1,7 @@
 import 'package:stringcare/src/compile/utils.dart';
 
 void main(List<String> arguments) async {
-  print(introMessage('0.0.2'));
+  print(introMessage('0.1.0'));
 
   var config = loadConfigFile();
 
@@ -12,4 +12,4 @@ void main(List<String> arguments) async {
   var stringKeys = await processLangObfuscation(config);
 
   buildRFile(config, assetsPaths, stringKeys);
-}
+}

bin/reveal.dart

@@ -1,7 +1,7 @@
 import 'package:stringcare/src/compile/utils.dart';
 
 void main(List<String> arguments) async {
-  print(introMessage('0.0.2'));
+  print(introMessage('0.1.0'));
 
   var config = loadConfigFile();
 

example/lib/main.dart

@@ -8,7 +8,7 @@ import 'presenter.dart';
 import 'r.dart';
 
 void main() {
-  Stringcare.locales = [
+  Stringcare().locales = [
     Locale('en', ''),
     Locale('es', ''),
     Locale('es', 'AR'),
@@ -29,17 +29,22 @@ class _MyAppState extends State<MyApp> {
   @override
   Widget build(BuildContext context) {
     return new MaterialApp(
-        supportedLocales: Stringcare.locales,
-        localizationsDelegates: Stringcare.delegates,
-        localeResolutionCallback: Stringcare.localeResolutionCallback,
-        home: MyAppPage(presenter: widget.presenter));
+      navigatorKey: Stringcare().navigatorKey,
+      supportedLocales: Stringcare().locales,
+      localizationsDelegates: Stringcare().delegates,
+      localeResolutionCallback: Stringcare().localeResolutionCallback,
+      home: MyAppPage(presenter: widget.presenter),
+    );
   }
 }
 
 class MyAppPage extends StatefulWidget {
   final Presenter presenter;
 
-  MyAppPage({Key key, this.presenter}) : super(key: key);
+  MyAppPage({
+    Key? key,
+    required this.presenter,
+  }) : super(key: key);
 
   @override
   MyAppPageState createState() => MyAppPageState();
@@ -62,10 +67,10 @@ class MyAppPageState extends State<MyAppPage> {
 
   // Platform messages are asynchronous, so we initialize in an async method.
   Future<void> initPlatformState() async {
-    String platformVersion;
+    String? platformVersion;
     // Platform messages may fail, so we use a try/catch PlatformException.
     try {
-      platformVersion = await Stringcare.platformVersion;
+      platformVersion = await Stringcare().platformVersion;
     } on PlatformException {
       platformVersion = 'Failed to get platform version.';
     }
@@ -76,7 +81,7 @@ class MyAppPageState extends State<MyAppPage> {
     if (!mounted) return;
 
     setState(() {
-      _platformVersion = platformVersion;
+      _platformVersion = platformVersion ?? '';
     });
   }
 
@@ -106,20 +111,23 @@ class MyAppPageState extends State<MyAppPage> {
                         ListTile(
                           title: Text("Test hash"),
                         ),
-                        Text(Stringcare.testHash([])),
+                        Text(Stringcare().testHash([])),
                         ListTile(
                           title: Text("Test sign"),
                         ),
-                        Text(Stringcare.testSign([])),
+                        Text(Stringcare().testSign([])),
                         ListTile(
                           title: Text("Lang resource"),
                         ),
-                        Text(R.strings.hello_there.on(context)),
+                        Text(R.strings.hello_there.string()),
                         ListTile(
                           title: Text("Lang pattern resource"),
                         ),
-                        Text(R.strings.hello_format
-                            .on(context, values: ["Tom"])),
+                        Text(
+                          R.strings.hello_format.string(
+                            values: ["Tom"],
+                          ),
+                        ),
                         ListTile(
                           title: Text("Retrieving specific lang"),
                         ),
@@ -271,14 +279,18 @@ class MyAppPageState extends State<MyAppPage> {
                           width: 400,
                         ),
                         Container(
-                            decoration: BoxDecoration(
-                                image: DecorationImage(
+                          height: 400,
+                          width: 400,
+                          decoration: BoxDecoration(
+                            image: DecorationImage(
                               fit: BoxFit.none,
                               image: ScAssetImageProvider(
                                   R.assets.images_voyager_jpeg),
                               repeat: ImageRepeat.repeat,
-                            )),
-                            child: Text("Voyager")),
+                            ),
+                          ),
+                          child: Text("Voyager"),
+                        ),
                       ],
                     ),
                   ),

example/lib/presenter.dart

@@ -6,23 +6,23 @@ class Presenter {
   String p2 = "sfvsfdgvsdfvsfdvsfvsrf";
   String p3 = "dtlbkjdnsfvsftrglbjknd";
 
-  String obfuscatedBlank;
-  String revealedBlank;
-  String obfuscatedHello;
-  String revealedHello;
-  String obfuscatedEmoji;
-  String revealedEmoji;
-  String signatureEmoji;
-  String readableEmoji;
-  bool sameSignatureTestEmoji;
-  bool otherSignatureTestEmoji;
+  String obfuscatedBlank = '';
+  String revealedBlank = '';
+  String obfuscatedHello = '';
+  String revealedHello = '';
+  String obfuscatedEmoji = '';
+  String revealedEmoji = '';
+  String signatureEmoji = '';
+  String readableEmoji = '';
+  bool sameSignatureTestEmoji = false;
+  bool otherSignatureTestEmoji = false;
 
-  String obfuscatedLorem;
-  String revealedLorem;
-  String signatureLorem;
-  String readableLorem;
-  bool sameSignatureTestLorem;
-  bool otherSignatureTestLorem;
+  String obfuscatedLorem = '';
+  String revealedLorem = '';
+  String signatureLorem = '';
+  String readableLorem = '';
+  bool sameSignatureTestLorem = false;
+  bool otherSignatureTestLorem = false;
 
   Presenter() {
     obfuscatedBlank = Vars.blank.obfuscate();
@@ -32,20 +32,20 @@ class Presenter {
 
     obfuscatedEmoji = Vars.emojis.obfuscateWith([p2, p1, p3]);
     revealedEmoji = obfuscatedEmoji.revealWith([p1, p3, p2]);
-    signatureEmoji = Stringcare.getSignature([p1, p2, p3]);
+    signatureEmoji = Stringcare().getSignature([p1, p2, p3]);
     readableEmoji = obfuscatedEmoji.readableObfuscate();
     sameSignatureTestEmoji =
-        Stringcare.validSignature(signatureEmoji, [p3, p1, p2]);
+        Stringcare().validSignature(signatureEmoji, [p3, p1, p2]);
     otherSignatureTestEmoji =
-        Stringcare.validSignature(signatureEmoji, [p2, p3]);
+        Stringcare().validSignature(signatureEmoji, [p2, p3]);
 
     obfuscatedLorem = Vars.loremipsu.obfuscateWith([p2, p1, p3]);
     revealedLorem = obfuscatedLorem.revealWith([p2, p1, p3]);
-    signatureLorem = Stringcare.getSignature([p1, p2, p3]);
+    signatureLorem = Stringcare().getSignature([p1, p2, p3]);
     readableLorem = obfuscatedLorem.readableObfuscate();
     sameSignatureTestLorem =
-        Stringcare.validSignature(signatureLorem, [p3, p1, p2]);
+        Stringcare().validSignature(signatureLorem, [p3, p1, p2]);
     otherSignatureTestLorem =
-        Stringcare.validSignature(signatureLorem, [p2, p3]);
+        Stringcare().validSignature(signatureLorem, [p2, p3]);
   }
 }

example/lib/r.dart

@@ -4,24 +4,24 @@
 /// 
 
 // ignore_for_file: non_constant_identifier_names
-class _Assets {
-  _Assets();
+class Assets {
+  Assets();
 
-  final String images_coding_svg = "assets/images/coding.svg";
-	final String images_voyager_jpeg = "assets/images/voyager.jpeg";
+  final String images_coding_svg = 'assets/images/coding.svg';
+	final String images_voyager_jpeg = 'assets/images/voyager.jpeg';
 
 }
 
-class _Strings {
-  _Strings();
+class Strings {
+  Strings();
 
-  final String hello_there = "hello_there";
-	final String hello_format = "hello_format";
+  final String hello_there = 'hello_there';
+	final String hello_format = 'hello_format';
 
 }
 
 class R {
-  static _Assets assets = _Assets();
-  static _Strings strings = _Strings();
+  static Assets assets = Assets();
+  static Strings strings = Strings();
 }
 

example/pubspec.yaml

@@ -4,7 +4,7 @@ description: Demonstrates how to use the stringcare plugin.
 publish_to: 'none'
 
 environment:
-  sdk: ">=2.7.0 <3.0.0"
+  sdk: '>=2.19.6 <3.0.0'
 
 dependencies:
   flutter:
@@ -14,7 +14,7 @@ dependencies:
   stringcare:
     path: ../
 
-  cupertino_icons: ^1.0.5
+  cupertino_icons: ^1.0.6
 
 stringcare:
   assets:
@@ -34,9 +34,7 @@ dev_dependencies:
     sdk: flutter
 
 flutter:
-
   uses-material-design: true
-
   assets:
     - lang/en.json
     - lang/es.json

example/test/widget_test.dart

@@ -7,7 +7,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
-
 import 'package:stringcare_example/main.dart';
 
 void main() {
@@ -18,8 +17,8 @@ void main() {
     // Verify that platform version is retrieved.
     expect(
       find.byWidgetPredicate(
-        (Widget widget) => widget is Text &&
-                           widget.data.startsWith('Running on:'),
+            (Widget widget) =>
+        widget is Text && widget.data?.startsWith('Running on:') == true,
       ),
       findsOneWidget,
     );