Improved favorite language

ManeraKai · Mar 25, 2024 · fb557ab · fb557ab
1 parent dc03f22
commit fb557ab
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/lib/data.dart b/lib/data.dart
@@ -258,14 +258,16 @@ enum FromTo { from, to }
   langUsage.removeWhere((key, value) => value == 0);
   langUsage.forEach((key, value) {
     if (max1 == null || max1!.$2 < value) {
+      max3 = max2;
+      max2 = max1;
       max1 = (key, value);
     } else if (max2 == null || max2!.$2 < value) {
+      max3 = max2;
       max2 = (key, value);
     } else if (max3 == null || max3!.$2 < value) {
       max3 = (key, value);
     }
   });
-
   return (max1?.$1, max2?.$1, max3?.$1);
 }
 

diff --git a/lib/screens/translate/widgets/lang_selector/lang.dart b/lib/screens/translate/widgets/lang_selector/lang.dart
@@ -2,8 +2,6 @@ import 'package:flutter/material.dart';
 import 'package:simplytranslate_mobile/simplytranslate.dart';
 import '/data.dart';
 
-bool _isFirstClick = false;
-
 class GoogleLang extends StatefulWidget {
   final FromTo fromto;
   GoogleLang(
@@ -15,6 +13,8 @@ class GoogleLang extends StatefulWidget {
   State<GoogleLang> createState() => _GoogleLangState();
 }
 
+bool _isFirstClick = true;
+
 class _GoogleLangState extends State<GoogleLang> {
   Widget build(BuildContext context) {
     final size = MediaQuery.of(context).size;
@@ -66,7 +66,7 @@ class _GoogleLangState extends State<GoogleLang> {
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: options.indexed.map((item) {
-                        final option = item.$2;
+                        final (idx, option) = item;
                         return Container(
                           color: theme == Brightness.dark ? greyColor : Colors.white,
                           child: GestureDetector(
@@ -105,10 +105,9 @@ class _GoogleLangState extends State<GoogleLang> {
                                   fontSize: 18,
                                   color: () {
                                     final (max1, max2, max3) = lastUsed(widget.fromto);
-                                    final idx = item.$1 + 1;
-                                    if ((idx == 1 && option == (widget.fromto == FromTo.from ? fromSelLangMap[max1] : toSelLangMap[max1])) ||
-                                        (idx == 2 && option == (widget.fromto == FromTo.from ? fromSelLangMap[max2] : toSelLangMap[max2])) ||
-                                        (idx == 3 && option == (widget.fromto == FromTo.from ? fromSelLangMap[max3] : toSelLangMap[max3]))) {
+                                    if ((idx == 0 && option == (widget.fromto == FromTo.from ? fromSelLangMap[max1] : toSelLangMap[max1])) ||
+                                        (idx == 1 && option == (widget.fromto == FromTo.from ? fromSelLangMap[max2] : toSelLangMap[max2])) ||
+                                        (idx == 2 && option == (widget.fromto == FromTo.from ? fromSelLangMap[max3] : toSelLangMap[max3]))) {
                                       return greenColor;
                                     }
                                   }(),

diff --git a/lib/simplytranslate.dart b/lib/simplytranslate.dart
@@ -20,15 +20,15 @@ Future<Uint8List> tts(String text, String language) async {
 }
 
 Future<Map<String, dynamic>> translate(String text, String from, String to) async {
+  if (text.isEmpty) return {};
   Map<String, dynamic> fromSession = jsonDecode(session.read("fromLangUsage") ?? "{}");
   Map<String, dynamic> fromLangUsage = fromSession.isEmpty ? Map.fromIterable(fromSelLangMap.keys, key: (k) => k, value: (_) => 0) : fromSession;
+  fromLangUsage[from] = fromLangUsage[from]! + 1;
+  session.write("fromLangUsage", jsonEncode(fromLangUsage));
+
   Map<String, dynamic> toSession = jsonDecode(session.read("toLangUsage") ?? "{}");
   Map<String, dynamic> toLangUsage = toSession.isEmpty ? Map.fromIterable(toSelLangMap.keys, key: (k) => k, value: (_) => 0) : toSession;
-
-  fromLangUsage[from] = fromLangUsage[from]! + 1;
   toLangUsage[to] = toLangUsage[to]! + 1;
-
-  session.write("fromLangUsage", jsonEncode(fromLangUsage));
   session.write("toLangUsage", jsonEncode(toLangUsage));
 
   return translate_(text, from, to);