Merge branch 'feat-special-emojis' into develop

xsoulspace · Nov 17, 2021 · 100cb12 · 100cb12
2 parents daad393 + 5e6ffaf
commit 100cb12
Show file tree

Hide file tree

Showing 23 changed files with 635 additions and 207 deletions.
diff --git a/assets/special_emoji.json b/assets/special_emoji.json
@@ -0,0 +1,122 @@
+[
+  {
+    "category": "special-emojis",
+    "emoji": "① ",
+    "keywords": "1,one"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "②",
+    "keywords": "2,two"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "③",
+    "keywords": "3,three"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "④",
+    "keywords": "4,four"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑤",
+    "keywords": "5,five"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑥",
+    "keywords": "6,six"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑦",
+    "keywords": "7,seven"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑧",
+    "keywords": "8,eight"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑨",
+    "keywords": "9,nine"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑩",
+    "keywords": "10,ten"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑪",
+    "keywords": "11,eleven"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑫",
+    "keywords": "12,twelve"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑬",
+    "keywords": "13,thirteen"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑭",
+    "keywords": "14,fourteen"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑮",
+    "keywords": "15,fifteen"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑯",
+    "keywords": "16,sixteen"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑰",
+    "keywords": "17,seventeen"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑱",
+    "keywords": "18,eighteen"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑲",
+    "keywords": "19,nineteen"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "⑳",
+    "keywords": "20,twenty"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "—",
+    "keywords": "long line"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "–",
+    "keywords": "line"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "▸",
+    "keywords": "play,arrow right"
+  },
+  {
+    "category": "special-emojis",
+    "emoji": "•",
+    "keywords": "dot"
+  }
+]
diff --git a/lib/abstract/greetings.dart b/lib/abstract/greetings.dart
@@ -3,7 +3,7 @@ part of abstract;
 class Greeting {
   Greeting() : _random = Random();
   final Random _random;
-  int get _randomMax => morning.values.length - 1;
+  int get _randomMax => morning.values.length;
   int get _randomMin => 0;
   int _nextRandom() => _randomMin + _random.nextInt(_randomMax - _randomMin);
 

diff --git a/lib/gen/assets.gen.dart b/lib/gen/assets.gen.dart
diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart
@@ -8,6 +8,7 @@
 // ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
 // ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
 // ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
+// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
 
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';

diff --git a/lib/generated/intl/messages_it.dart b/lib/generated/intl/messages_it.dart
@@ -8,6 +8,7 @@
 // ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
 // ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
 // ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
+// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
 
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';

diff --git a/lib/generated/intl/messages_ru.dart b/lib/generated/intl/messages_ru.dart
@@ -8,6 +8,7 @@
 // ignore_for_file:prefer_single_quotes,comment_references, directives_ordering
 // ignore_for_file:annotate_overrides,prefer_generic_function_type_aliases
 // ignore_for_file:unused_import, file_names, avoid_escaping_inner_quotes
+// ignore_for_file:unnecessary_string_interpolations, unnecessary_string_escapes
 
 import 'package:intl/intl.dart';
 import 'package:intl/message_lookup_by_library.dart';

diff --git a/lib/library/widgets/button_popup.dart b/lib/library/widgets/button_popup.dart
@@ -0,0 +1,59 @@
+part of widgets;
+
+class ButtonPopup extends StatelessWidget {
+  const ButtonPopup({
+    required final this.children,
+    final this.height,
+    final this.hideBorder = false,
+    final Key? key,
+  }) : super(key: key);
+  final List<Widget> children;
+  final double? height;
+  final bool hideBorder;
+  @override
+  Widget build(final BuildContext context) {
+    final theme = Theme.of(context);
+    Color borderColor;
+    if (hideBorder) {
+      borderColor = Colors.transparent;
+    } else if (theme.brightness == Brightness.dark) {
+      borderColor = AppColors.cleanBlack;
+    } else {
+      borderColor = AppColors.grey4;
+    }
+    return Card(
+      elevation: 0,
+      clipBehavior: Clip.hardEdge,
+      color: Colors.transparent,
+      shape: RoundedRectangleBorder(
+        borderRadius: defaultBorderRadius,
+        side: BorderSide(
+          color: borderColor,
+        ),
+      ),
+      child: SizedBox(
+        height: height ?? 320,
+        width: 250,
+        child: Stack(
+          children: [
+            ColoredBox(
+              color: theme.canvasColor.withOpacity(0),
+              child: const SizedBox.expand(),
+            ).frosted(
+              blur: theme.brightness == Brightness.dark ? 15 : 12,
+              frostOpacity: 0.1,
+              frostColor: theme.brightness == Brightness.dark
+                  ? AppColors.black
+                  : AppColors.white,
+            ),
+            Column(
+              mainAxisSize: MainAxisSize.min,
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: children,
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/library/widgets/emoji_button.dart b/lib/library/widgets/emoji_button.dart
@@ -0,0 +1,22 @@
+part of widgets;
+
+class EmojiButton extends StatelessWidget {
+  const EmojiButton({
+    required final this.onPressed,
+    required final this.emoji,
+    final Key? key,
+  }) : super(key: key);
+  final Emoji emoji;
+  final VoidCallback onPressed;
+  @override
+  Widget build(final BuildContext context) {
+    return CupertinoButton(
+      minSize: 0,
+      padding: EdgeInsets.zero,
+      onPressed: onPressed,
+      child: Center(
+        child: Text(emoji.emoji),
+      ),
+    );
+  }
+}