simplified news provider

2023-08-26 19:12:03 +02:00
parent 6d4939d88a
commit bc1ec45855
6 changed files with 111 additions and 52 deletions
--- a/filcnaplo/lib/api/providers/news_provider.dart
+++ b/filcnaplo/lib/api/providers/news_provider.dart
@@ -1,7 +1,4 @@
 // ignore_for_file: use_build_context_synchronously
-
-import 'dart:math';
-
 import 'package:filcnaplo/api/client.dart';
 import 'package:filcnaplo/models/news.dart';
 import 'package:filcnaplo/models/settings.dart';
@@ -11,7 +8,7 @@ import 'package:provider/provider.dart';
 class NewsProvider extends ChangeNotifier {
  // Private
  late List<News> _news;
-  late int _state;
+  //late int _state;
  late int _fresh;
  bool show = false;
  late BuildContext _context;
@@ -30,56 +27,83 @@ class NewsProvider extends ChangeNotifier {

  Future<void> restore() async {
    // Load news state from the database
-    var state_ = Provider.of<SettingsProvider>(_context, listen: false).newsState;
+    var seen_ = Provider.of<SettingsProvider>(_context, listen: false).seenNews;

-    if (state_ == -1) {
+    if (seen_.isEmpty) {
      var news_ = await FilcAPI.getNews();
      if (news_ != null) {
-        state_ = news_.length;
        _news = news_;
+        show = true;
      }
    }

-    _state = state_;
-    Provider.of<SettingsProvider>(_context, listen: false).update(newsState: _state);
+    //_state = seen_;
+    // Provider.of<SettingsProvider>(_context, listen: false)
+    //     .update(seenNewsId: news_.id);
  }

  Future<void> fetch() async {
    var news_ = await FilcAPI.getNews();
    if (news_ == null) return;

+    show = false;
+
    _news = news_;
-    _fresh = news_.length - _state;

-    if (_fresh < 0) {
-      _state = news_.length;
-      Provider.of<SettingsProvider>(_context, listen: false).update(newsState: _state);
+    for (var news in news_) {
+      if (news.expireDate.isAfter(DateTime.now()) &&
+          Provider.of<SettingsProvider>(_context, listen: false)
+                  .seenNews
+                  .contains(news.id) ==
+              false) {
+        show = true;
+        Provider.of<SettingsProvider>(_context, listen: false)
+            .update(seenNewsId: news.id);
+
+        notifyListeners();
+      }
    }
+    // print(news_.length);
+    // print(_state);

-    _fresh = max(_fresh, 0);
+    // _news = news_;
+    // _fresh = news_.length - _state;

-    if (_fresh > 0) {
-      show = true;
-      notifyListeners();
-    }
+    // if (_fresh < 0) {
+    //   _state = news_.length;
+    //   Provider.of<SettingsProvider>(_context, listen: false)
+    //       .update(newsState: _state);
+    // }
+
+    // _fresh = max(_fresh, 0);
+
+    // if (_fresh > 0) {
+    //   show = true;
+    //   notifyListeners();
+    // }
+
+    // print(_fresh);
+    // print(_state);
+    // print(show);
  }

  void lock() => show = false;

  void release() {
-    if (_fresh == 0) return;
+    // if (_fresh == 0) return;

-    _fresh--;
-    _state++;
+    // _fresh--;
+    // //_state++;

-    Provider.of<SettingsProvider>(_context, listen: false).update(newsState: _state);
+    // // Provider.of<SettingsProvider>(_context, listen: false)
+    // //     .update(seenNewsId: _state);

-    if (_fresh > 0) {
-      show = true;
-    } else {
-      show = false;
-    }
+    // if (_fresh > 0) {
+    //   show = true;
+    // } else {
+    //   show = false;
+    // }

-    notifyListeners();
+    // notifyListeners();
  }
 }
--- a/filcnaplo/lib/database/init.dart
+++ b/filcnaplo/lib/database/init.dart
@@ -12,7 +12,8 @@ import 'package:sqflite_common_ffi_web/sqflite_ffi_web.dart';

 const settingsDB = DatabaseStruct("settings", {
  "language": String, "start_page": int, "rounding": int, "theme": int,
-  "accent_color": int, "news": int, "news_state": int, "developer_mode": int,
+  "accent_color": int, "news": int, "seen_news": String,
+  "developer_mode": int,
  "update_channel": int, "config": String, "custom_accent_color": int,
  "custom_background_color": int, "custom_highlight_color": int, // general
  "grade_color1": int, "grade_color2": int, "grade_color3": int,
@@ -92,6 +93,8 @@ Future<Database> initDB(DatabaseProvider database) async {
      "group_averages": "[]",
      // renamed subjects // non kreta data
      "renamed_subjects": "{}",
+      // renamed teachers // non kreta data
+      "renamed_teachers": "{}",
      // "subject_lesson_count": "{}", // non kreta data
      "last_seen_grade": 0,
    });
--- a/filcnaplo/lib/models/news.dart
+++ b/filcnaplo/lib/models/news.dart
@@ -1,30 +1,36 @@
 class News {
+  String id;
  String title;
  String content;
  String link;
  String openLabel;
  String platform;
  bool emergency;
+  DateTime expireDate;
  Map? json;

  News({
+    required this.id,
    required this.title,
    required this.content,
    required this.link,
    required this.openLabel,
    required this.platform,
    required this.emergency,
+    required this.expireDate,
    this.json,
  });

  factory News.fromJson(Map json) {
    return News(
+      id: json["id"] ?? "",
      title: json["title"] ?? "",
      content: json["content"] ?? "",
      link: json["link"] ?? "",
      openLabel: json["open_label"] ?? "",
      platform: json["platform"] ?? "",
      emergency: json["emergency"] ?? false,
+      expireDate: DateTime.parse(json["expire_date"] ?? ''),
      json: json,
    );
  }
--- a/filcnaplo/lib/models/settings.dart
+++ b/filcnaplo/lib/models/settings.dart
@@ -29,7 +29,7 @@ class SettingsProvider extends ChangeNotifier {
  // zero is one, ...
  List<Color> _gradeColors;
  bool _newsEnabled;
-  int _newsState;
+  String _seenNews;
  bool _notificationsEnabled;
  /*
  notificationsBitfield values:
@@ -81,7 +81,7 @@ class SettingsProvider extends ChangeNotifier {
    required AccentColor accentColor,
    required List<Color> gradeColors,
    required bool newsEnabled,
-    required int newsState,
+    required String seenNews,
    required bool notificationsEnabled,
    required int notificationsBitfield,
    required bool developerMode,
@@ -118,7 +118,7 @@ class SettingsProvider extends ChangeNotifier {
        _accentColor = accentColor,
        _gradeColors = gradeColors,
        _newsEnabled = newsEnabled,
-        _newsState = newsState,
+        _seenNews = seenNews,
        _notificationsEnabled = notificationsEnabled,
        _notificationsBitfield = notificationsBitfield,
        _developerMode = developerMode,
@@ -158,6 +158,8 @@ class SettingsProvider extends ChangeNotifier {
      log("[ERROR] SettingsProvider.fromMap: $e");
    }

+    print(map['seen_news']);
+
    return SettingsProvider(
      database: database,
      language: map["language"],
@@ -173,7 +175,7 @@ class SettingsProvider extends ChangeNotifier {
        Color(map["grade_color5"]),
      ],
      newsEnabled: map["news"] == 1,
-      newsState: map["news_state"],
+      seenNews: map["seen_news"],
      notificationsEnabled: map["notifications"] == 1,
      notificationsBitfield: map["notifications_bitfield"],
      notificationPollInterval: map["notification_poll_interval"],
@@ -214,7 +216,7 @@ class SettingsProvider extends ChangeNotifier {
      "theme": _theme.index,
      "accent_color": _accentColor.index,
      "news": _newsEnabled ? 1 : 0,
-      "news_state": _newsState,
+      "seen_news": _seenNews,
      "notifications": _notificationsEnabled ? 1 : 0,
      "notifications_bitfield": _notificationsBitfield,
      "developer_mode": _developerMode ? 1 : 0,
@@ -266,7 +268,7 @@ class SettingsProvider extends ChangeNotifier {
        DarkMobileAppColors().gradeFive,
      ],
      newsEnabled: true,
-      newsState: -1,
+      seenNews: '',
      notificationsEnabled: true,
      notificationsBitfield: 255,
      developerMode: false,
@@ -306,7 +308,7 @@ class SettingsProvider extends ChangeNotifier {
  AccentColor get accentColor => _accentColor;
  List<Color> get gradeColors => _gradeColors;
  bool get newsEnabled => _newsEnabled;
-  int get newsState => _newsState;
+  List<String> get seenNews => _seenNews.split(',');
  bool get notificationsEnabled => _notificationsEnabled;
  int get notificationsBitfield => _notificationsBitfield;
  bool get developerMode => _developerMode;
@@ -348,7 +350,7 @@ class SettingsProvider extends ChangeNotifier {
    AccentColor? accentColor,
    List<Color>? gradeColors,
    bool? newsEnabled,
-    int? newsState,
+    String? seenNewsId,
    bool? notificationsEnabled,
    int? notificationsBitfield,
    bool? developerMode,
@@ -391,7 +393,11 @@ class SettingsProvider extends ChangeNotifier {
    if (newsEnabled != null && newsEnabled != _newsEnabled) {
      _newsEnabled = newsEnabled;
    }
-    if (newsState != null && newsState != _newsState) _newsState = newsState;
+    if (seenNewsId != null && !_seenNews.split(',').contains(seenNewsId)) {
+      var tempList = _seenNews.split(',');
+      tempList.add(seenNewsId);
+      _seenNews = tempList.join(',');
+    }
    if (notificationsEnabled != null &&
        notificationsEnabled != _notificationsEnabled) {
      _notificationsEnabled = notificationsEnabled;