Skip to content
Snippets Groups Projects
Commit 22c59613 authored by poka's avatar poka
Browse files

fix: double delimters in activity view

parent 60427463
No related branches found
No related tags found
1 merge request!56Fix/build ios
......@@ -253,7 +253,7 @@ Future<QueryResult> _execQuery(
return await client.query(options);
}
Map computeHistoryView(repository, lastDateDelimiter, isDouble) {
Map computeHistoryView(repository) {
bool isTody = false;
bool isYesterday = false;
bool isThisWeek = false;
......@@ -281,27 +281,26 @@ Map computeHistoryView(repository, lastDateDelimiter, isDouble) {
final yesterdayDate = DateTime(now.year, now.month, now.day - 1);
if (transactionDate == todayDate && !isTody) {
dateDelimiter = lastDateDelimiter = "today".tr();
dateDelimiter = "today".tr();
isTody = true;
} else if (transactionDate == yesterdayDate && !isYesterday) {
dateDelimiter = lastDateDelimiter = "yesterday".tr();
dateDelimiter = "yesterday".tr();
isYesterday = true;
} else if (weekNumber(date) == weekNumber(now) &&
date.year == now.year &&
transactionDate != yesterdayDate &&
transactionDate != todayDate &&
!isThisWeek) {
dateDelimiter = lastDateDelimiter = "thisWeek".tr();
dateDelimiter = "thisWeek".tr();
isThisWeek = true;
} else if (lastDateDelimiter != "${monthsInYear[date.month]} ${date.year}" &&
} else if (dateDelimiter != "${monthsInYear[date.month]} ${date.year}" &&
transactionDate != todayDate &&
transactionDate != yesterdayDate &&
!(weekNumber(date) == weekNumber(now) && date.year == now.year)) {
if (date.year == now.year) {
dateDelimiter = lastDateDelimiter = monthsInYear[date.month];
dateDelimiter = monthsInYear[date.month];
} else {
dateDelimiter =
lastDateDelimiter = "${monthsInYear[date.month]} ${date.year}";
dateDelimiter = "${monthsInYear[date.month]} ${date.year}";
}
} else {
isDelimiter = false;
......
......@@ -141,9 +141,8 @@ class HistoryQuery extends StatelessWidget {
final duniterIndexer = Provider.of<DuniterIndexer>(context, listen: false);
int keyID = 0;
const double avatarSize = 200;
String? lastDateDelimiter;
bool? isDouble;
bool isMigrationPassed = false;
List<String> pastDelimiters = [];
return duniterIndexer.transBC == null
? Column(children: <Widget>[
......@@ -156,11 +155,9 @@ class HistoryQuery extends StatelessWidget {
: Column(children: <Widget>[
Column(
children: duniterIndexer.transBC!.map((repository) {
final answer =
computeHistoryView(repository, lastDateDelimiter, isDouble);
isDouble = lastDateDelimiter == answer['dateDelimiter'] ||
answer['dateDelimiter'] == '';
lastDateDelimiter = answer['dateDelimiter'];
final answer = computeHistoryView(repository);
pastDelimiters.add(answer['dateDelimiter']);
bool isMigrationTime = false;
if (answer['isMigrationTime'] && !isMigrationPassed) {
isMigrationPassed = true;
......@@ -190,7 +187,12 @@ class HistoryQuery extends StatelessWidget {
],
),
),
if (!isDouble!)
// if ((countsDelimiter[answer['dateDelimiter']] ?? 0) >= 1)
if (pastDelimiters.length == 1 ||
pastDelimiters.length >= 2 &&
!(pastDelimiters[pastDelimiters.length - 2] ==
answer['dateDelimiter']))
Padding(
padding: const EdgeInsets.symmetric(vertical: 30),
child: Text(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment