Commit c890dde7 authored by Collin Jackson's avatar Collin Jackson

Split fitness app’s UserData into UserData and UserDataImpl

parent 09216794
...@@ -20,15 +20,20 @@ part 'meal.dart'; ...@@ -20,15 +20,20 @@ part 'meal.dart';
part 'measurement.dart'; part 'measurement.dart';
part 'settings.dart'; part 'settings.dart';
class UserData { abstract class UserData {
UserData(); BackupMode get backupMode;
List<FitnessItem> get items;
}
class UserDataImpl extends UserData {
UserDataImpl();
List<FitnessItem> _items = []; List<FitnessItem> _items = [];
BackupMode _backupSetting; BackupMode _backupMode;
BackupMode get backupSetting => _backupSetting; BackupMode get backupMode => _backupMode;
void setBackupModeAndSave(BackupMode value) { void setBackupModeAndSave(BackupMode value) {
_backupSetting = value; _backupMode = value;
save(); save();
} }
...@@ -56,12 +61,12 @@ class UserData { ...@@ -56,12 +61,12 @@ class UserData {
Future save() => saveFitnessData(this); Future save() => saveFitnessData(this);
UserData.fromJson(Map json) { UserDataImpl.fromJson(Map json) {
json['items'].forEach((item) { json['items'].forEach((item) {
_items.add(new Measurement.fromJson(item)); _items.add(new Measurement.fromJson(item));
}); });
try { try {
_backupSetting = BackupMode.values.firstWhere((BackupMode mode) { _backupMode = BackupMode.values.firstWhere((BackupMode mode) {
return mode.toString() == json['backupMode']; return mode.toString() == json['backupMode'];
}); });
} catch(e) { } catch(e) {
...@@ -72,14 +77,14 @@ class UserData { ...@@ -72,14 +77,14 @@ class UserData {
Map toJson() { Map toJson() {
Map json = new Map(); Map json = new Map();
json['items'] = _items.map((item) => item.toJson()).toList(); json['items'] = _items.map((item) => item.toJson()).toList();
json['backupMode'] = _backupSetting.toString(); json['backupMode'] = _backupMode.toString();
return json; return json;
} }
} }
class FitnessApp extends App { class FitnessApp extends App {
NavigationState _navigationState; NavigationState _navigationState;
UserData _userData = new UserData(); UserDataImpl _userData = new UserDataImpl();
void didMount() { void didMount() {
super.didMount(); super.didMount();
...@@ -88,10 +93,6 @@ class FitnessApp extends App { ...@@ -88,10 +93,6 @@ class FitnessApp extends App {
}).catchError((e) => print("Failed to load data: $e")); }).catchError((e) => print("Failed to load data: $e"));
} }
void save() {
_userData.save().catchError((e) => print("Failed to load data: $e"));
}
void initState() { void initState() {
_navigationState = new NavigationState([ _navigationState = new NavigationState([
new Route( new Route(
...@@ -120,9 +121,9 @@ class FitnessApp extends App { ...@@ -120,9 +121,9 @@ class FitnessApp extends App {
new Route( new Route(
name: '/settings', name: '/settings',
builder: (navigator, route) => new SettingsFragment( builder: (navigator, route) => new SettingsFragment(
navigator, navigator: navigator,
_userData.backupSetting, userData: _userData as UserData,
settingsUpdater updater: settingsUpdater
) )
), ),
]); ]);
......
...@@ -10,10 +10,10 @@ typedef void SettingsUpdater({ ...@@ -10,10 +10,10 @@ typedef void SettingsUpdater({
class SettingsFragment extends Component { class SettingsFragment extends Component {
SettingsFragment(this.navigator, this.backup, this.updater); SettingsFragment({ this.navigator, this.userData, this.updater });
final Navigator navigator; final Navigator navigator;
final BackupMode backup; final UserData userData;
final SettingsUpdater updater; final SettingsUpdater updater;
void _handleBackupChanged(bool value) { void _handleBackupChanged(bool value) {
...@@ -38,10 +38,10 @@ class SettingsFragment extends Component { ...@@ -38,10 +38,10 @@ class SettingsFragment extends Component {
padding: const EdgeDims.symmetric(vertical: 20.0), padding: const EdgeDims.symmetric(vertical: 20.0),
child: new Block([ child: new Block([
new DrawerItem( new DrawerItem(
onPressed: () { _handleBackupChanged(!(backup == BackupMode.enabled)); }, onPressed: () { _handleBackupChanged(!(userData.backupMode == BackupMode.enabled)); },
children: [ children: [
new Flexible(child: new Text('Back up data to the cloud')), new Flexible(child: new Text('Back up data to the cloud')),
new Switch(value: backup == BackupMode.enabled, onChanged: _handleBackupChanged) new Switch(value: userData.backupMode == BackupMode.enabled, onChanged: _handleBackupChanged)
] ]
) )
]) ])
......
...@@ -26,11 +26,11 @@ Future<UserData> loadFitnessData() async { ...@@ -26,11 +26,11 @@ Future<UserData> loadFitnessData() async {
print("Loading from $dataPath"); print("Loading from $dataPath");
JsonDecoder decoder = new JsonDecoder(); JsonDecoder decoder = new JsonDecoder();
Map data = await decoder.convert(await new File(dataPath).readAsString()); Map data = await decoder.convert(await new File(dataPath).readAsString());
return new UserData.fromJson(data); return new UserDataImpl.fromJson(data);
} }
// Intentionally synchronous for execution just before shutdown. // Intentionally synchronous for execution just before shutdown.
Future saveFitnessData(UserData data) async { Future saveFitnessData(UserDataImpl data) async {
String dataPath = await dataFilePath(); String dataPath = await dataFilePath();
print("Saving to $dataPath"); print("Saving to $dataPath");
JsonEncoder encoder = new JsonEncoder(); JsonEncoder encoder = new JsonEncoder();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment