time-progress-tracker/time_progress_tracker
2
0
Fork 0
Code Issues Pull Requests Packages Activity

Updated Flutter SDK for Null-Safety

Browse Source 
Ported Progress Detail Screen to PlatformScaffold

Signed-off-by: Andreas Fahrecker <AndreasFahrecker@gmail.com>
This commit is contained in:
Andreas Fahrecker
2021-03-18 18:34:29 +01:00
parent b1a90b1e05
commit 08db53db20
34 changed files with 245 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/persistence/app_settings.dart
View File

@ -1,6 +1,7 @@
import 'package:shared_preferences/shared_preferences.dart';
import 'package:time_progress_tracker/models/app_settings.dart';
import 'package:time_progress_tracker/persistence/repository.dart';
import 'package:time_progress_tracker/utils/constants.dart';
class AppSettingsRepository extends Repository<AppSettingsEntity> {
static const String _key = "app_settings";
@ -9,7 +10,7 @@ class AppSettingsRepository extends Repository<AppSettingsEntity> {
@override
Future<AppSettingsEntity> load() {
final String jsonString = this.prefs.getString(_key);
final String? jsonString = this.prefs.getString(_key);
if (jsonString == null)
return Future<AppSettingsEntity>.value(AppSettingsEntity.defaults());
return Future<AppSettingsEntity>.value(
@ -30,7 +31,7 @@ class AppSettingsEntity {
AppSettingsEntity(
this.doneColorValue, this.leftColorValue, this.durationDays);
factory AppSettingsEntity.defaults() => AppSettings.defaults().toEntity();
factory AppSettingsEntity.defaults() => defaultAppSettings.toEntity();
@override
int get hashCode => doneColorValue.hashCode ^ leftColorValue.hashCode;
@ -51,8 +52,8 @@ class AppSettingsEntity {
static AppSettingsEntity fromJson(Map<String, Object> json) =>
AppSettingsEntity(
json[_doneKey],
json[_leftKey],
json[_durationDaysKey],
json[_doneKey] as int,
json[_leftKey] as int,
json[_durationDaysKey] as int,
);
}

2
lib/persistence/time_progress.dart
View File

@ -8,7 +8,7 @@ class TimeProgressRepository extends Repository<List<TimeProgressEntity>> {
@override
Future<List<TimeProgressEntity>> load() {
final String jsonString = this.prefs.getString(_key);
final String? jsonString = this.prefs.getString(_key);
if (jsonString == null) {
return Future<List<TimeProgressEntity>>.value([]);
}