v1.1.0+3

android/settings.gradle

@@ -19,8 +19,8 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.3.0" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+    id "com.android.application" version "7.3.1" apply false
+    id "org.jetbrains.kotlin.android" version "2.1.0" apply false
 }
 
 include ":app"

assets/schedule.json

@@ -2,7 +2,7 @@
   "rules": [
     {
       "after": "2024-08-01T00:00:00.000",
-      "before": null,
+      "before": "2024-12-16T03:59:99.999",
       "dataset": {
         "monday": "daily-1",
         "tuesday": "daily-1",
@@ -18,6 +18,19 @@
         "2024-11-04": "sunday-1",
         "2024-11-05": "daily-1"
       }
+    },
+    {
+      "after": "2024-12-16T04:00:00.000",
+      "before": null,
+      "dataset": {
+        "monday": "daily-1",
+        "tuesday": "daily-1",
+        "wednesday": "daily-1",
+        "thursday": "daily-1",
+        "friday": "friday-1",
+        "saturday": "saturday-2",
+        "sunday": "sunday-1"
+      }
     }
   ],
   "schedules": {
@@ -56,6 +69,22 @@
       {"duration": 355, "direction": "out_city"},
       {"duration": 5,   "direction": "change"}
     ],
+    "saturday-2": [
+      {"duration": 475, "direction": "out_city"},
+      {"duration": 5,   "direction": "change"},
+      {"duration": 115, "direction": "in_city"},
+      {"duration": 5,   "direction": "change"},
+      {"duration": 115, "direction": "out_city"},
+      {"duration": 5,   "direction": "change"},
+      {"duration": 115, "direction": "in_city"},
+      {"duration": 5,   "direction": "change"},
+      {"duration": 115, "direction": "out_city"},
+      {"duration": 5,   "direction": "change"},
+      {"duration": 115, "direction": "in_city"},
+      {"duration": 5,   "direction": "change"},
+      {"duration": 355, "direction": "out_city"},
+      {"duration": 5,   "direction": "change"}
+    ],
     "sunday-1": [
       {"duration": 235, "direction": "in_city"},
       {"duration": 5,   "direction": "change"},

lib/application.dart

@@ -1,5 +1,10 @@
+import 'dart:developer';
+
 import 'package:flutter/material.dart';
+import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:get/get.dart';
+import 'package:get_storage/get_storage.dart';
+import 'package:reverse_nn/application/controllers/application_controller.dart';
 import 'package:reverse_nn/pages/home_page.dart';
 import 'package:reverse_nn/ui/screens/home_screen.dart';
 
@@ -8,8 +13,22 @@ class ReversNNApplication extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+    final ApplicationController controller = Get.put(ApplicationController());
+    final themeMode = controller.getThemeModeFromStorage();
+    controller.setThemeMode(themeMode);
+
     return GetMaterialApp(
       title: 'Реверс НН',
+      
+      localizationsDelegates: const [
+        GlobalMaterialLocalizations.delegate,
+        GlobalCupertinoLocalizations.delegate
+      ],
+      
+      supportedLocales: const [
+        Locale('ru')
+      ],
+      
       theme: ThemeData(
         colorScheme: ColorScheme.fromSeed(seedColor: Colors.teal, brightness: Brightness.light),
         useMaterial3: true,
@@ -18,6 +37,7 @@ class ReversNNApplication extends StatelessWidget {
         colorScheme: ColorScheme.fromSeed(seedColor: Colors.teal, brightness: Brightness.dark),
         useMaterial3: true,
       ),
+      themeMode: themeMode,
       home: const HomeScreen(),
 
       defaultTransition: Transition.noTransition,

lib/application/controllers/application_controller.dart

@@ -2,18 +2,36 @@ import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:get_storage/get_storage.dart';
 
 class ApplicationController extends GetxController {
+  final _storage = GetStorage();
+
   IconData getThemeIcon() => Get.isDarkMode
       ? Icons.light_mode
       : Icons.dark_mode;
 
+  ThemeMode getThemeModeFromStorage() {
+    ThemeMode mode = ThemeMode.system;
+    final themeKey = _storage.read('current_theme_mode');
+
+    if(themeKey == 'light') { mode = ThemeMode.light; }
+    if(themeKey == 'dark')  { mode = ThemeMode.dark; }
+
+    return mode;
+  }
+
+  void setThemeMode(ThemeMode themeMode) {
+    Get.changeThemeMode(themeMode);
+    update();
+  }
+
   void toggleTheme() {
-    Get.changeThemeMode(
+    _storage.write('current_theme_mode', Get.isDarkMode ? 'light' : 'dark');
+    setThemeMode(
       Get.isDarkMode
         ? ThemeMode.light
         : ThemeMode.dark
     );
-    update();
   }
 }

lib/application/controllers/calendar_schedule_controller.dart

@@ -0,0 +1,39 @@
+import 'package:get/get.dart';
+import 'package:reverse_nn/application/services/schedule.dart';
+import 'package:reverse_nn/ui/screens/calendar_screen.dart';
+
+class CalendarScheduleController extends GetxController {
+  Rx<DateTime> date = DateTime.now().copyWith(hour: 12, minute: 00).obs;
+  RxBool loading = false.obs;
+  Rx<List<Map<String, dynamic>>?> schedule = null.obs;
+
+  @override void onReady() {
+    super.onReady();
+    loadSchedule(date.value);
+  }
+
+  void loadSchedule(DateTime date) async {
+    loading = true.obs; update();
+    schedule = (await ScheduleService().getScheduleByDate(date)).obs;
+    loading = false.obs; update();
+  }
+
+  static void openScreen() async { Get.to(() => const CalendarScreen()); }
+
+  void goToConcreteDay(DateTime day) async {
+    date = (day.copyWith(hour: 12, minute: 0, millisecond: 0, microsecond: 0)).obs;
+    loadSchedule(date.value);
+  }
+
+  void goToPrevDay() async {
+    if(date.value.isBefore(DateTime(2024, 8, 1, 23, 59))) return;
+    date = (date.value.copyWith().subtract(const Duration(days: 1)).copyWith(hour: 12, minute: 0)).obs;
+    loadSchedule(date.value);
+  }
+
+  void goToNextDay() async {
+    if(date.value.isAfter(DateTime(2025, 12, 31))) return;
+    date = (date.value.copyWith().add(const Duration(days: 1)).copyWith(hour: 12, minute: 0)).obs;
+    loadSchedule(date.value);
+  }
+}

lib/application/controllers/schedule_controller.dart

@@ -1,3 +1,6 @@
+import 'dart:developer';
+
+import 'package:flutter/foundation.dart';
 import 'package:get/get.dart';
 import 'package:reverse_nn/application/services/schedule.dart';
 
@@ -6,9 +9,14 @@ class ScheduleController extends GetxController {
 
   @override void onReady() {
     super.onReady();
-    ScheduleService().getCurrentStatus().then((currentSchedule) {
-      this.currentSchedule = currentSchedule.obs;
+    updateCurrentSchedule();
+  }
+
+  void updateCurrentSchedule() async {
+    if(kDebugMode) { log('update current status'); }
+    currentSchedule = (await ScheduleService().getCurrentStatus()).obs;
     update();
-    });
+
+    Future.delayed(const Duration(seconds: 5), updateCurrentSchedule);
   }
 }

lib/application/services/schedule.dart

@@ -1,6 +1,7 @@
 import 'dart:core';
 import 'dart:convert';
 import 'dart:developer';
+import 'package:flutter/material.dart';
 import 'package:intl/intl.dart' show DateFormat;
 
 import 'package:flutter/services.dart';
@@ -65,9 +66,10 @@ class ScheduleService {
     }).toList();
   }
 
-  Future<List<Map<String, dynamic>>?> getScheduleByDate(DateTime datetime) async {
-    final datetimeStartWithOffset = datetime.copyWith(hour: 0, minute: 0, second: 0, microsecond: 0, millisecond: 0)
-      .add(dayOffset);
+  Future<List<Map<String, dynamic>>?> getScheduleByDate(DateTime datetime, {bool force = false}) async {
+    final dateStart = datetime.copyWith(hour: 0, minute: 0, second: 0, microsecond: 0, millisecond: 0);
+    final dateEnd   = datetime.copyWith(hour: 23, minute: 59, second: 59, microsecond: 999, millisecond: 999);
+    final datetimeStartWithOffset = dateStart.copyWith().add(dayOffset);
 
     final DateTime usedScheduleDatetime = datetime.isAfter(datetimeStartWithOffset)
         ? datetime
@@ -85,7 +87,42 @@ class ScheduleService {
 
     if(scheduleKey == null) return null;
 
-    return await getScheduleByKey(scheduleKey);
+    List<Map<String, dynamic>>? schedule = await getScheduleByKey(scheduleKey);
+    if(schedule == null) return null;
+
+    int durationOffset = 0;
+    for (var i = 0; i < schedule.length; i++) {
+      final scheduleItem = schedule[i];
+      final int duration = (scheduleItem['duration'] as int);
+      DateTime start = datetimeStartWithOffset.copyWith().add(Duration(minutes: durationOffset));
+      DateTime end = datetimeStartWithOffset.copyWith().add(Duration(minutes: durationOffset + duration));
+      durationOffset += duration;
+
+      if(!force) {
+        if(i == 0) {
+          final schedulePrevDay = await getScheduleByDate(datetime.copyWith().subtract(const Duration(days: 1)), force: true);
+          final lastScheduleElement = schedulePrevDay?.last;
+          if(lastScheduleElement != null && (lastScheduleElement['direction'] as String) == (scheduleItem['direction'] as String)) {
+            start = start.subtract(Duration(minutes: lastScheduleElement['duration'] as int));
+          }
+        }
+
+        if(i == (schedule.length -1)) {
+          final scheduleNextDay = await getScheduleByDate(datetime.copyWith().add(const Duration(days: 1)), force: true);
+          final firstScheduleElement = scheduleNextDay?.first;
+          if(firstScheduleElement != null && (firstScheduleElement['direction'] as String) == (scheduleItem['direction'] as String)) {
+            end = end.add(Duration(minutes: firstScheduleElement['duration'] as int));
+          }
+        }
+      }
+
+      schedule[i]['start'] = start;
+      schedule[i]['show_start_date'] = !(start.isAfter(dateStart) && start.isBefore(dateEnd));
+      schedule[i]['end'] = end;
+      schedule[i]['show_end_date'] = !(end.isAfter(dateStart) && end.isBefore(dateEnd));
+    }
+
+    return schedule;
   }
 
   Future<Map<String, dynamic>?> getCurrentStatus() async {
@@ -93,40 +130,31 @@ class ScheduleService {
     final List<Map<String, dynamic>>? schedule = await getScheduleByDate(now);
     if(schedule == null) return null;
 
-    DateTime datetimeStartWithOffset = now.copyWith(hour: 0, minute: 0, second: 0, microsecond: 0, millisecond: 0)
-        .add(dayOffset);
-
-    if(now.isBefore(datetimeStartWithOffset)) {
-      datetimeStartWithOffset = datetimeStartWithOffset.subtract(const Duration(days: 1));
-    }
-
-    int durationOffset = 0;
-    for (final Map<String, dynamic> scheduleItem in schedule) {
-      final int duration = (scheduleItem['duration'] as int);
-      final DateTime start = datetimeStartWithOffset.copyWith().add(Duration(minutes: durationOffset));
-      final DateTime end = datetimeStartWithOffset.copyWith().add(Duration(minutes: durationOffset + duration));
-      durationOffset += duration;
+    for(var i = 0; i < schedule.length; i++) {
+      final start = schedule[i]['start'];
+      final end = schedule[i]['end'];
 
       if(now.isAfter(start) && now.isBefore(end)) {
-        return <String, dynamic>{
-          "direction": scheduleItem['direction'] as String,
-          "start": start,
-          "end": end
-        };
+        return schedule[i];
       }
     }
 
     return null;
+  }
 
-
-
-    // final datetimeStartWithOffset = now.copyWith(hour: 0, minute: 0, second: 0, microsecond: 0, millisecond: 0)
-    //     .add(dayOffset);
-    //
-    // final DateTime usedScheduleDatetime = now.isAfter(datetimeStartWithOffset)
-    //     ? now
-    //     : now.copyWith().subtract(const Duration(days: 1));
-
-
+  static String formatDirection(String direction) {
+    switch(direction) {
+      case 'in_city': return 'В город';
+      case 'out_city': return 'Из города';
+      default: return 'Переключение';
+    }
+  }
+
+  static IconData getIconByDirection(String? direction) {
+    switch(direction) {
+      case 'in_city': return Icons.input_outlined;
+      case 'out_city': return Icons.output_outlined;
+      default: return Icons.change_circle_outlined;
+    }
   }
 }

lib/main.dart

@@ -1,6 +1,10 @@
 import 'package:flutter/material.dart';
+import 'package:get_storage/get_storage.dart';
 import 'package:reverse_nn/application.dart';
 
-void main() => runApp(const ReversNNApplication());
+void main() async {
+  await GetStorage.init();
+  runApp(const ReversNNApplication());
+}
 
 

lib/ui/components/current_status_component.dart

@@ -1,7 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
-import 'package:intl/intl.dart' show DateFormat;
 import 'package:reverse_nn/application/controllers/schedule_controller.dart';
+import 'package:reverse_nn/ui/components/schedule_item_component.dart';
 
 class CurrentStatusComponent extends StatelessWidget {
   const CurrentStatusComponent({super.key});
@@ -9,39 +9,13 @@ class CurrentStatusComponent extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     final ScheduleController controller = Get.put(ScheduleController());
-    return Container(
-      decoration: BoxDecoration(
-        color: Theme.of(context).colorScheme.primaryContainer,
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: Padding(
-        padding: const EdgeInsets.all(10),
-        child: GetBuilder<ScheduleController>(
-          builder: (scheduleController) {
-            return Row(
-              mainAxisAlignment: MainAxisAlignment.start,
-              crossAxisAlignment: CrossAxisAlignment.center,
-              children: [
-                const Icon(Icons.exit_to_app, size: 96),
-                const SizedBox(width: 16),
-                Column(
-                  mainAxisAlignment: MainAxisAlignment.start,
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    if(scheduleController.currentSchedule.value != null) ...[
-                      Text(scheduleController.currentSchedule.value?['direction'] ?? '', style: Theme.of(context).textTheme.headlineLarge),
-                      Text('C ${formatDate(scheduleController.currentSchedule.value?['start'])} До ${formatDate(scheduleController.currentSchedule.value!['end'])}', style: Theme.of(context).textTheme.titleMedium)
-                    ]
-                  ],
-                )
-              ],
+
+    return GetBuilder<ScheduleController>(
+      builder: (controller) {
+        if(controller.currentSchedule.value == null) { return Container(); }
+
+        return ScheduleItemComponent(item: controller.currentSchedule.value!);
+      }
     );
   }
-        ),
-      ),
-    );
-  }
-
-  String formatDate(DateTime date) => DateFormat('hh:mm').format(date);
-  
 }

lib/ui/components/schedule_item_component.dart

@@ -0,0 +1,57 @@
+import 'package:flutter/material.dart';
+import 'package:intl/intl.dart' show DateFormat;
+import 'package:reverse_nn/application/services/schedule.dart';
+
+class ScheduleItemComponent extends StatelessWidget {
+  final Map<String, dynamic> item;
+  const ScheduleItemComponent({super.key, required this.item});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      margin: const EdgeInsets.only(top: 10),
+      padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 10),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.secondaryContainer,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      alignment: Alignment.center,
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          Icon(ScheduleService.getIconByDirection(item['direction'] as String), size: 56),
+          const SizedBox(width: 16),
+          Expanded(child: Column(
+            mainAxisAlignment: MainAxisAlignment.start,
+            crossAxisAlignment: CrossAxisAlignment.stretch,
+            children: [
+              _directionText(context),
+              _startText(context),
+              _endText(context),
+            ],
+          ))
+        ],
+      ),
+    );
+  }
+
+  String formatDate(DateTime date, {bool showDate = false}) {
+    return DateFormat(showDate ? 'HH:mm dd.MM.yyyy' : 'HH:mm').format(date);
+  }
+
+  Widget _directionText(BuildContext context) => Text(
+      ScheduleService.formatDirection(item['direction'] ?? ''),
+      style: Theme.of(context).textTheme.headlineLarge
+  );
+
+  Widget _startText(BuildContext context) => Text(
+      'C\t\t\t\t${formatDate(item['start'], showDate: item['show_start_date'] ?? false)}',
+      style: Theme.of(context).textTheme.titleLarge
+  );
+
+  Widget _endText(BuildContext context) => Text(
+      'До\t${formatDate(item['end'], showDate: item['show_end_date'] ?? false)}',
+      style: Theme.of(context).textTheme.titleLarge
+  );
+}

lib/ui/screens/calendar_screen.dart

@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+import 'package:reverse_nn/application/controllers/calendar_schedule_controller.dart';
+import 'package:reverse_nn/application/services/schedule.dart';
+import 'package:reverse_nn/ui/components/schedule_item_component.dart';
+import 'package:reverse_nn/ui/layouts/application_layout.dart';
+import 'package:intl/intl.dart' show DateFormat;
+
+class CalendarScreen extends StatelessWidget {
+  const CalendarScreen({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    final CalendarScheduleController controller = Get.put(CalendarScheduleController());
+
+    return ApplicationLayout(
+      body: RefreshIndicator(
+        onRefresh: () async { controller.loadSchedule(controller.date.value); },
+        child: GetBuilder<CalendarScheduleController>(
+          builder: (controller) {
+            return Padding(
+              padding: const EdgeInsets.all(8.0),
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.start,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  _SelectedDateWidget(
+                    date: controller.date.value,
+                    onSelectDate: controller.goToConcreteDay,
+                    onTapPrev: controller.goToPrevDay,
+                    onTapNext: controller.goToNextDay,
+                  ),
+
+                  if(controller.loading.value) const Padding(
+                    padding: EdgeInsets.all(40),
+                    child: Center(child: CircularProgressIndicator())
+                  ),
+
+                  if(!controller.loading.value && controller.schedule.value != null) Expanded(
+                    child: SingleChildScrollView(
+                      physics: const AlwaysScrollableScrollPhysics(),
+                      child: Column(
+                        mainAxisAlignment: MainAxisAlignment.start,
+                        crossAxisAlignment: CrossAxisAlignment.stretch,
+                        children: controller.schedule.value!
+                          .map((item) => ScheduleItemComponent(item: item))
+                          .toList(),
+                      ),
+                    ),
+                  ),
+                ],
+              ),
+            );
+          }
+        ),
+      ),
+    );
+  }
+}
+
+class _SelectedDateWidget extends StatelessWidget {
+  final DateTime date;
+  final void Function(DateTime)? onSelectDate;
+  final void Function()? onTapPrev;
+  final void Function()? onTapNext;
+  const _SelectedDateWidget({super.key, required this.date, this.onSelectDate, this.onTapPrev, this.onTapNext});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(vertical: 20, horizontal: 10),
+      decoration: BoxDecoration(
+        color: Theme.of(context).colorScheme.primaryContainer,
+        borderRadius: BorderRadius.circular(10),
+      ),
+      alignment: Alignment.center,
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.center,
+        crossAxisAlignment: CrossAxisAlignment.center,
+        children: [
+          GestureDetector(
+            onTap: () { onTapPrev?.call(); },
+            child: const SizedBox(
+              width: 40,
+              child: Center(child: Icon(Icons.arrow_left, size: 40)),
+            ),
+          ),
+          Expanded(
+            child: GestureDetector(
+              onTap: () {_openCalendar(context); },
+              child: Center(
+                child: Text(
+                  formatDate(date),
+                  style: Theme.of(context).textTheme.displaySmall,
+                ),
+              ),
+            ),
+          ),
+          GestureDetector(
+            onTap: () { onTapNext?.call(); },
+            child: const SizedBox(
+              width: 40,
+              child: Center(child: Icon(Icons.arrow_right, size: 40)),
+            ),
+          ),
+        ]
+      ),
+    );
+  }
+
+  String formatDate(DateTime date) {
+    return DateFormat('dd.MM.yyyy').format(date);
+  }
+
+  void _openCalendar(BuildContext context) async {
+    DateTime now = DateTime.now();
+    DateTime? picked = await showDatePicker(
+      context: context,
+      initialDate: now,
+      firstDate: DateTime(2024, 8, 1, 12),
+      lastDate: DateTime(2025, 12, 31, 12),
+      locale: const Locale('ru')
+    );
+
+    if(picked != null) { onSelectDate?.call(picked); }
+  }
+}
+
+

lib/ui/screens/home_screen.dart

@@ -2,6 +2,7 @@ import 'dart:developer';
 
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
+import 'package:reverse_nn/application/controllers/calendar_schedule_controller.dart';
 import 'package:reverse_nn/application/controllers/home_controller.dart';
 import 'package:reverse_nn/application/services/schedule.dart';
 import 'package:reverse_nn/ui/components/current_status_component.dart';
@@ -28,14 +29,9 @@ class HomeScreen extends GetWidget<HomeController> {
                 mainAxisSpacing: 10,
                 crossAxisSpacing: 10,
               ),
-              children: [
-                GridMenuItem(icon: Icons.calendar_month, label: 'Расписание', onTap: () {
-                  // log(DateTime(2024, 8, 1, 0, 0, 0).toIso8601String());
-                  ScheduleService().getCurrentStatus().then((val) {
-                    log(val.toString());
-                  });
-                }),
-                const GridMenuItem(icon: Icons.monetization_on, label: 'Поддержать автора'),
+              children: const [
+                GridMenuItem(icon: Icons.calendar_month, label: 'Расписание', onTap: CalendarScheduleController.openScreen),
+                // const GridMenuItem(icon: Icons.monetization_on, label: 'Поддержать автора'),
                 // GridMenuItem(),
                 // GridMenuItem(),
               ]

lib/widgets/schedule_element_widget.dart

@@ -43,21 +43,6 @@ class CurrentReversWidget extends StatelessWidget {
           )
         ],
       ),
-
-      // child: Column(
-      //   mainAxisAlignment: MainAxisAlignment.start,
-      //   crossAxisAlignment: CrossAxisAlignment.center,
-      //   children: [
-      //     const Text('Текущий статус реверса:', style: TextStyle(
-      //       color: Colors.black87,
-      //       fontSize: 14.0
-      //     )),
-      //     Text(scheduleElement.direction.displayName, style: const TextStyle(
-      //       color: Colors.black,
-      //       fontSize: 32.0
-      //     ),),
-      //   ],
-      // ),
     );
   }
 }

pubspec.lock

@@ -97,6 +97,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.3"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -118,6 +126,11 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.2"
+  flutter_localizations:
+    dependency: "direct main"
+    description: flutter
+    source: sdk
+    version: "0.0.0"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -131,22 +144,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.6.6"
-  http:
-    dependency: transitive
+  get_storage:
+    dependency: "direct main"
     description:
-      name: http
-      sha256: b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010
+      name: get_storage
+      sha256: "39db1fffe779d0c22b3a744376e86febe4ade43bf65e06eab5af707dc84185a2"
       url: "https://pub.dev"
     source: hosted
-    version: "1.2.2"
-  http_parser:
-    dependency: transitive
-    description:
-      name: http_parser
-      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
-      url: "https://pub.dev"
-    source: hosted
-    version: "4.0.2"
+    version: "2.1.1"
   image:
     dependency: transitive
     description:
@@ -159,10 +164,10 @@ packages:
     dependency: "direct main"
     description:
       name: intl
-      sha256: "99f282cb0e02edcbbf8c6b3bbc7c90b65635156c412e58f3975a7e55284ce685"
+      sha256: d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf
       url: "https://pub.dev"
     source: hosted
-    version: "0.20.0"
+    version: "0.19.0"
   json_annotation:
     dependency: transitive
     description:
@@ -235,6 +240,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.9.0"
+  path_provider:
+    dependency: transitive
+    description:
+      name: path_provider
+      sha256: "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.5"
+  path_provider_android:
+    dependency: transitive
+    description:
+      name: path_provider_android
+      sha256: "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.15"
+  path_provider_foundation:
+    dependency: transitive
+    description:
+      name: path_provider_foundation
+      sha256: "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.1"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      sha256: "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.2"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      sha256: bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.0"
   petitparser:
     dependency: transitive
     description:
@@ -243,6 +296,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.0.2"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      sha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.6"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.8"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -328,14 +397,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "14.2.5"
-  web:
+  xdg_directories:
     dependency: transitive
     description:
-      name: web
-      sha256: "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27"
+      name: xdg_directories
+      sha256: "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15"
       url: "https://pub.dev"
     source: hosted
-    version: "0.5.1"
+    version: "1.1.0"
   xml:
     dependency: transitive
     description:
@@ -354,4 +423,4 @@ packages:
     version: "3.1.2"
 sdks:
   dart: ">=3.5.0 <4.0.0"
-  flutter: ">=3.18.0-18.0.pre.54"
+  flutter: ">=3.24.0"

pubspec.yaml

@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # 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+2
+version: 1.1.0+3
 
 environment:
   sdk: '>=3.3.3 <4.0.0'
@@ -30,14 +30,17 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  sprintf: "^7.0.0"
 
+  flutter_localizations:
+    sdk: flutter
 
   # The following adds the Cupertino Icons font to your application.
   # Use with the CupertinoIcons class for iOS style icons.
   cupertino_icons: ^1.0.6
+  intl: ^0.19.0
   get: ^4.6.6
-  intl: ^0.20.0
+  get_storage: ^2.1.1
+  sprintf: "^7.0.0"
 
 dev_dependencies:
   flutter_test:
@@ -54,7 +57,7 @@ dev_dependencies:
 flutter_launcher_icons:
   android: "launcher_icon"
   ios: true
-  image_path: "assets/icon/icon.png"
+  image_path: "assets/icon/logo.png"
   min_sdk_android: 21 # android min sdk min:16, default 21
 
 # For information on the generic Dart part of this file, see the