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

Feature/change progress colors (#6)

Browse Source 
* Added Settings Actions
* Created App Settings and Repo + Entity
* Code cleanup Time Progress
* Created App Settings Middleware
* Has Progresses ad has Settings loaded
* Created Load and Update Settings reducers
* Added Settings store middleware to renamed store middleware
* Load Default Settings if not Saved. Use Redux AppState to showprogress colors.
Colors are not yet changeable.
* Added ColorPicker for Done and Left Color
Fixed Loading App Settings Bug
* Fixed Version Number
* Fixed Android App Logo
* Extracted Color Settings into Widget
* Fixed Home Settings Tab Layout and Color Settings Button now show Text in complementary color
This commit is contained in:
Andreas Fahrecker
2021-03-03 16:35:08 +01:00
committed by GitHub
parent c580e45361
commit b520d56d1a
23 changed files with 545 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
lib/models/time_progress.dart
View File

@ -20,26 +20,19 @@ class TimeProgress {
}
TimeProgress copyWith(
{String id, String name, DateTime startTime, DateTime endTime}) {
return TimeProgress(
name ?? this.name,
startTime ?? this.startTime,
endTime ?? this.endTime,
id: id ?? this.id,
);
}
{String id, String name, DateTime startTime, DateTime endTime}) =>
TimeProgress(
name ?? this.name,
startTime ?? this.startTime,
endTime ?? this.endTime,
id: id ?? this.id,
);
int daysBehind() {
return DateTime.now().difference(startTime).inDays;
}
int daysBehind() => DateTime.now().difference(startTime).inDays;
int daysLeft() {
return endTime.difference(DateTime.now()).inDays;
}
int daysLeft() => endTime.difference(DateTime.now()).inDays;
int allDays() {
return endTime.difference(startTime).inDays;
}
int allDays() => endTime.difference(startTime).inDays;
double percentDone() {
double percent = this.daysBehind() / (this.allDays() / 100) / 100;
@ -48,15 +41,11 @@ class TimeProgress {
return percent;
}
bool hasStarted() {
return DateTime.now().millisecondsSinceEpoch >
startTime.millisecondsSinceEpoch;
}
bool hasStarted() =>
DateTime.now().millisecondsSinceEpoch > startTime.millisecondsSinceEpoch;
bool hasEnded() {
return DateTime.now().millisecondsSinceEpoch >
endTime.millisecondsSinceEpoch;
}
bool hasEnded() =>
DateTime.now().millisecondsSinceEpoch > endTime.millisecondsSinceEpoch;
@override
int get hashCode =>
@ -73,9 +62,8 @@ class TimeProgress {
endTime == other.endTime;
@override
String toString() {
return "TimeProgress{id: $id, name: $name, startTime: $startTime, endTime: $endTime}";
}
String toString() =>
"TimeProgress{id: $id, name: $name, startTime: $startTime, endTime: $endTime}";
TimeProgressEntity toEntity() {
if (!TimeProgress.isNameValid(name))
@ -86,25 +74,17 @@ class TimeProgress {
return TimeProgressEntity(id, name, startTime, endTime);
}
static TimeProgress fromEntity(TimeProgressEntity entity) {
return TimeProgress(
entity.name,
entity.startTime,
entity.endTime,
id: entity.id ?? Uuid().generateV4(),
);
}
static TimeProgress fromEntity(TimeProgressEntity entity) =>
TimeProgress(entity.name, entity.startTime, entity.endTime,
id: entity.id ?? Uuid().generateV4());
static bool isValid(TimeProgress tp) {
return TimeProgress.isNameValid(tp.name) &&
TimeProgress.areTimesValid(tp.startTime, tp.endTime);
}
static bool isValid(TimeProgress tp) =>
TimeProgress.isNameValid(tp.name) &&
TimeProgress.areTimesValid(tp.startTime, tp.endTime);
static bool isNameValid(String name) {
return name != null && name != "" && name.length > 2 && name.length < 21;
}
static bool isNameValid(String name) =>
name != null && name != "" && name.length > 2 && name.length < 21;
static bool areTimesValid(DateTime startTime, DateTime endTime) {
return startTime.isBefore(endTime);
}
static bool areTimesValid(DateTime startTime, DateTime endTime) =>
startTime.isBefore(endTime);
}