Added date select on search

CoolONEOfficial · May 6, 2019 · 79d96c8 · 79d96c8
1 parent 0665996
commit 79d96c8
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 34 deletions.
diff --git a/lib/prefs.dart b/lib/prefs.dart
@@ -50,10 +50,19 @@ Future<SearchItem> showSearchItemSelect(
       (searchItem) async {
         if (searchItem != null) {
           if (primary) {
+            Timetable.fromDay = Timetable.todayMidnight;
             searchItem.toPrefs(PrefsIds.SEARCH_ITEM_PREFIX);
             await PlatformChannels.deleteDb();
-          } else
+          } else {
+            Timetable.fromDay = await showDatePicker(
+                  context: ctx,
+                  initialDate: Timetable.fromDay ?? Timetable.todayMidnight,
+                  firstDate: Timetable.todayMidnight,
+                  lastDate: Timetable.todayMidnight.add(Duration(days: 365)),
+                ) ??
+                Timetable.todayMidnight;
             Timetable.selected = searchItem;
+          }
           timetableIdBloc.add(Tuple2<bool, SearchItem>(primary, searchItem));
         }
         return searchItem;

diff --git a/lib/timetable.dart b/lib/timetable.dart
@@ -78,6 +78,8 @@ class Timetable extends StatelessWidget {
 
   static const dayCount = 6;
 
+  static DateTime fromDay = todayMidnight;
+
   static DateTime get endCacheMidnight {
     var mDate = todayMidnight.add(Duration(days: dayCount - 1));
 
@@ -93,8 +95,8 @@ class Timetable extends StatelessWidget {
     timetable.clear();
     return loadTimetable(
       ctx,
-      Timetable.todayMidnight,
-      Timetable.todayMidnight.add(Duration(days: dayCount - 1)),
+      fromDay,
+      fromDay.add(Duration(days: dayCount - 1)),
       searchItem,
       updateDb,
     );
@@ -470,7 +472,7 @@ class Timetable extends StatelessWidget {
               (ctx, ssDayStyle) {
                 // Create tabs
                 final tabs = List<Tab>();
-                var mDay = todayMidnight.subtract(Duration(days: 1));
+                var mDay = fromDay.subtract(Duration(days: 1));
                 for (int mTabId = 0; mTabId < dayCount; mTabId++) {
                   debugPrint("mTabId: " + mTabId.toString());
                   mDay = mDay.add(Duration(days: 1));
@@ -529,7 +531,7 @@ class Timetable extends StatelessWidget {
                                     dayCount,
                                     (dayIndex) =>
                                         MapEntry<DateTime, List<TimelineModel>>(
-                                          todayMidnight.add(
+                                          fromDay.add(
                                             Duration(days: dayIndex),
                                           ),
                                           List<TimelineModel>(),

diff --git a/lib/widget_templates.dart b/lib/widget_templates.dart
@@ -168,35 +168,9 @@ class WidgetTemplates {
         },
       );
 
-//  static Widget buildFutureBuilder<T>(
-//    BuildContext ctx, {
-//    @required Future future,
-//    @required AsyncWidgetBuilder<T> builder,
-//    Widget loading,
-//    Widget error,
-//  }) {
-//    var result, error;
-//
-//    future.then((res) {
-//      result = res;
-//    }).catchError((e) {
-//      error = e;
-//    });
-//
-//    return AnimatedCrossFade(
-//      firstChild: loading ?? WidgetTemplates.buildLoadingNotification(ctx),
-//      secondChild: error != null
-//          ? WidgetTemplates.buildErrorNotification(ctx, "$error" ?? "Unknown")
-//          : builder(ctx, result),
-//      crossFadeState: result == null && error == null
-//          ? CrossFadeState.showFirst
-//          : CrossFadeState.showSecond,
-//      duration: Duration(seconds: 1),
-//    );
-//  }
-
-  static Future<bool> checkInternetConnection(
-      [String host = 'google.com']) async {
+  static Future<bool> checkInternetConnection([
+    String host = 'google.com',
+  ]) async {
     try {
       final result = await InternetAddress.lookup(host);
       return result.isNotEmpty && result[0].rawAddress.isNotEmpty;