Skip to content

Commit b6fb185

Browse files
feat(ref: no-ref): fix comments
1 parent 58e9afd commit b6fb185

File tree

9 files changed

+44
-46
lines changed

9 files changed

+44
-46
lines changed

lib/common/app-translation/app-translation.dart

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import '../../screens/home/todo/add-task/add-task.translation.dart'
55
as home_add_task;
66
import '../../screens/home/todo/filter-panel/filter-panel.translation.dart'
77
as home_filter_panel;
8-
import '../items-left/items-left.translation.dart' as items_left;
8+
import '../remaining-items/remaining-items.translation.dart' as remaining_items;
99

1010
class AppTranslation extends GetxService {
1111
AppTranslation();
@@ -50,9 +50,9 @@ class AppTranslation extends GetxService {
5050
);
5151

5252
_combineTranslations(
53-
items_left.en,
54-
items_left.uk,
55-
items_left.ru,
53+
remaining_items.en,
54+
remaining_items.uk,
55+
remaining_items.ru,
5656
);
5757

5858
return translationsKeys;

lib/common/items-left/items-left.translation.dart

Lines changed: 0 additions & 25 deletions
This file was deleted.

lib/common/items-left/items-left.extensions.dart renamed to lib/common/remaining-items/remaining-items.extensions.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ import 'package:get/get.dart';
22
import 'package:intl/intl.dart';
33

44
import '../app-translation/translation.extensions.dart';
5-
import 'items-left.translation.dart';
5+
import 'remaining-items.translation.dart';
66

7-
extension ItemsLeftFormatting on int {
8-
String get itemsLeft => _getPlural(
7+
extension RemainingItemsFormatter on int {
8+
String get remainingItemsText => _getPlural(
99
this,
10-
one: ItemsLeftTranslationNames.oneItem.tr,
11-
few: ItemsLeftTranslationNames.fewItems.tr,
12-
many: ItemsLeftTranslationNames.manyItems.tr,
10+
one: RemainingItemsTranslationNames.oneItem.tr,
11+
few: RemainingItemsTranslationNames.fewItems.tr,
12+
many: RemainingItemsTranslationNames.manyItems.tr,
1313
).trim();
1414

1515
String _getPlural(int value,
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
import '../../../../common/app-translation/translation.extensions.dart';
2+
3+
enum RemainingItemsTranslationNames implements Translation {
4+
oneItem,
5+
fewItems,
6+
manyItems,
7+
}
8+
9+
final Map<String, String> en = <RemainingItemsTranslationNames, String>{
10+
RemainingItemsTranslationNames.oneItem: 'item left',
11+
RemainingItemsTranslationNames.fewItems: 'items left',
12+
RemainingItemsTranslationNames.manyItems: 'items left',
13+
}.st;
14+
15+
final Map<String, String> ru = <RemainingItemsTranslationNames, String>{
16+
RemainingItemsTranslationNames.oneItem: 'элемент остался',
17+
RemainingItemsTranslationNames.fewItems: 'элемента осталось',
18+
RemainingItemsTranslationNames.manyItems: 'элементов осталось',
19+
}.st;
20+
21+
final Map<String, String> uk = <RemainingItemsTranslationNames, String>{
22+
RemainingItemsTranslationNames.oneItem: 'елемент залишився',
23+
RemainingItemsTranslationNames.fewItems: 'елементи залишились',
24+
RemainingItemsTranslationNames.manyItems: 'елементів залишилось',
25+
}.st;

lib/main.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import 'common/app-translation/app-translation.dart';
44
import 'screens/home/home.binding.dart';
55
import 'screens/home/home.screen.dart';
66

7-
Future<void> main() async {
8-
await HomeBinding().dependencies();
7+
void main() {
8+
Get.lazyPut(AppTranslation.new);
99

1010
runApp(const MyApp());
1111
}

lib/screens/home/home.screen.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:flutter/material.dart';
2-
import 'language-switcher/language-switcher.dart';
2+
import 'language-switcher/language-switcher.widget.dart';
33
import 'todo/todo.widget.dart';
44
import '../home/title/title.widget.dart';
55

@@ -14,7 +14,7 @@ class HomeScreen extends StatelessWidget {
1414
Padding(
1515
padding: EdgeInsets.only(bottom: 20),
1616
child: Center(
17-
child: LanguageSwitcher(),
17+
child: LanguageSwitcherWidget(),
1818
),
1919
),
2020
TodoWidget(),

lib/screens/home/language-switcher/language-switcher.controller.dart

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@ import 'language-switcher.enum.dart';
44
class LanguageSwitcherController extends GetxController {
55
final Rx<Language> currentLanguage = Language.en.obs;
66

7-
List<Language> get languages => Language.values;
8-
97
void updateLocale(Language language) {
108
currentLanguage.value = language;
119
Get.updateLocale(language.locale);

lib/screens/home/language-switcher/language-switcher.dart renamed to lib/screens/home/language-switcher/language-switcher.widget.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import 'package:get/get.dart';
33
import 'language-switcher.controller.dart';
44
import 'language-switcher.enum.dart';
55

6-
class LanguageSwitcher extends GetView<LanguageSwitcherController> {
7-
const LanguageSwitcher({super.key});
6+
class LanguageSwitcherWidget extends GetView<LanguageSwitcherController> {
7+
const LanguageSwitcherWidget({super.key});
88

99
@override
1010
Widget build(BuildContext context) => Obx(() => DropdownButton<Language>(
@@ -14,7 +14,7 @@ class LanguageSwitcher extends GetView<LanguageSwitcherController> {
1414
controller.updateLocale(language);
1515
}
1616
},
17-
items: controller.languages
17+
items: Language.values
1818
.map<DropdownMenuItem<Language>>(
1919
(Language language) => DropdownMenuItem<Language>(
2020
value: language,

lib/screens/home/todo/filter-panel/filter-panel.widget.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
22
import 'package:get/get.dart';
33
import '../../../../common/app-translation/translation.extensions.dart';
44
import '../../../../common/button/button.widget.dart';
5-
import '../../../../common/items-left/items-left.extensions.dart';
5+
import '../../../../common/remaining-items/remaining-items.extensions.dart';
66
import 'filter-panel-buttons/filter-panel-buttons.dart';
77
import 'filter-panel.controller.dart';
88
import 'filter-panel.translation.dart';
@@ -24,7 +24,7 @@ class FilterPanelWidget extends GetView<FilterPanelController> {
2424
mainAxisAlignment: MainAxisAlignment.spaceBetween,
2525
children: <Widget>[
2626
Text(
27-
controller.activeCount.itemsLeft,
27+
controller.activeCount.remainingItemsText,
2828
style: const TextStyle(fontSize: 14, color: Colors.grey),
2929
),
3030
ButtonWidget(

0 commit comments

Comments
 (0)