From 926dba2e67d66ad6c980eba54d077ce30488eaef Mon Sep 17 00:00:00 2001 From: Felix Holz Date: Wed, 21 Feb 2024 22:16:44 +0100 Subject: [PATCH] cleanup achievement screen --- lib/screens/achievement_screen.dart | 11 +++++------ .../achievement_progress_segment.dart | 4 ++-- macos/Flutter/ephemeral/Flutter-Generated.xcconfig | 6 +++--- macos/Flutter/ephemeral/flutter_export_environment.sh | 6 +++--- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/lib/screens/achievement_screen.dart b/lib/screens/achievement_screen.dart index 16237af3..bfdd3ffc 100644 --- a/lib/screens/achievement_screen.dart +++ b/lib/screens/achievement_screen.dart @@ -6,8 +6,6 @@ import 'package:frederic/main.dart'; import 'package:frederic/widgets/achievement_screen/achievement_goal_title_segment.dart'; import 'package:frederic/widgets/achievement_screen/achievement_header.dart'; import 'package:frederic/widgets/achievement_screen/achievement_progress_segment.dart'; -import 'package:frederic/widgets/achievement_screen/achievement_stats_segment.dart'; -import 'package:frederic/widgets/achievement_screen/achievement_timeline_segment.dart'; import 'package:frederic/widgets/standard_elements/frederic_action_dialog.dart'; import 'package:frederic/widgets/standard_elements/frederic_button.dart'; import 'package:frederic/widgets/standard_elements/frederic_heading.dart'; @@ -34,9 +32,10 @@ class AchievementScreen extends StatelessWidget { AchievementGoalTitleSegment(goal), _AchievementTitle('Your Progress'), AchievementProgressSegment(goal), - _AchievementTitle('Stats'), - AchievementStatsSegment(goal), - AchievementTimelineSegment(goal), + //TODO: implement correctly + // _AchievementTitle('Stats'), + // AchievementStatsSegment(goal), + // AchievementTimelineSegment(goal), buildDeleteButton(), ], ), @@ -55,7 +54,7 @@ class AchievementScreen extends StatelessWidget { Widget buildDeleteButton() { return SliverToBoxAdapter( child: Container( - padding: const EdgeInsets.symmetric(vertical: 6, horizontal: 28), + padding: const EdgeInsets.symmetric(vertical: 24, horizontal: 16), child: Row( mainAxisAlignment: MainAxisAlignment.end, children: [ diff --git a/lib/widgets/achievement_screen/achievement_progress_segment.dart b/lib/widgets/achievement_screen/achievement_progress_segment.dart index f3bcd93f..fb922ec2 100644 --- a/lib/widgets/achievement_screen/achievement_progress_segment.dart +++ b/lib/widgets/achievement_screen/achievement_progress_segment.dart @@ -29,7 +29,7 @@ class AchievementProgressSegment extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ AchievementProgressBar(goal, goal.startState.toDouble(), - length: adjustedProgressBarLength), + progressRatio: 0.1, length: adjustedProgressBarLength), ], ), ), @@ -44,7 +44,7 @@ class AchievementProgressSegment extends StatelessWidget { goal, goal.endState.toDouble(), progressRatio: 0.96, - delayInMillisecond: 200, + delayInMillisecond: 0, length: adjustedProgressBarLength, ), ], diff --git a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig index aee0a670..06a13be7 100644 --- a/macos/Flutter/ephemeral/Flutter-Generated.xcconfig +++ b/macos/Flutter/ephemeral/Flutter-Generated.xcconfig @@ -1,10 +1,10 @@ // This is a generated file; do not edit or check into version control. -FLUTTER_ROOT=/Users/felix/Developer/SDKs/flutter -FLUTTER_APPLICATION_PATH=/Users/felix/Developer/Projects/NeverSkip +FLUTTER_ROOT=/home/felix/Dev/SDKs/flutter +FLUTTER_APPLICATION_PATH=/home/felix/Dev/Projects/frederic COCOAPODS_PARALLEL_CODE_SIGN=true FLUTTER_BUILD_DIR=build FLUTTER_BUILD_NAME=1.2.0 -FLUTTER_BUILD_NUMBER=24021701 +FLUTTER_BUILD_NUMBER=24021702 DART_OBFUSCATION=false TRACK_WIDGET_CREATION=true TREE_SHAKE_ICONS=false diff --git a/macos/Flutter/ephemeral/flutter_export_environment.sh b/macos/Flutter/ephemeral/flutter_export_environment.sh index 37b538ed..fd7047a0 100755 --- a/macos/Flutter/ephemeral/flutter_export_environment.sh +++ b/macos/Flutter/ephemeral/flutter_export_environment.sh @@ -1,11 +1,11 @@ #!/bin/sh # This is a generated file; do not edit or check into version control. -export "FLUTTER_ROOT=/Users/felix/Developer/SDKs/flutter" -export "FLUTTER_APPLICATION_PATH=/Users/felix/Developer/Projects/NeverSkip" +export "FLUTTER_ROOT=/home/felix/Dev/SDKs/flutter" +export "FLUTTER_APPLICATION_PATH=/home/felix/Dev/Projects/frederic" export "COCOAPODS_PARALLEL_CODE_SIGN=true" export "FLUTTER_BUILD_DIR=build" export "FLUTTER_BUILD_NAME=1.2.0" -export "FLUTTER_BUILD_NUMBER=24021701" +export "FLUTTER_BUILD_NUMBER=24021702" export "DART_OBFUSCATION=false" export "TRACK_WIDGET_CREATION=true" export "TREE_SHAKE_ICONS=false"