ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: increase hitbox size of mini analytics navigation buttons

Browse source
This commit is contained in:
ggurdin 2026-01-22 16:29:27 -05:00
parent 220a21b887
commit 2639747889
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
3 changed files with 133 additions and 136 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

222
lib/pangea/analytics_summary/learning_progress_indicators.dart
View file

@ -58,51 +58,49 @@ class LearningProgressIndicators extends StatelessWidget {
Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Padding(
padding: const EdgeInsets.only(left: 8.0),
child: Row(
spacing: isColumnMode ? 16.0 : 4.0,
children: [
...ConstructTypeEnum.values.map(
(c) => HoverButton(
selected: selected == c.indicator,
Row(
spacing: isColumnMode ? 16.0 : 0.0,
children: [
...ConstructTypeEnum.values.map(
(c) => HoverButton(
selected: selected == c.indicator,
onPressed: () {
AnalyticsNavigationUtil.navigateToAnalytics(
context: context,
view: c.indicator,
);
},
child: ProgressIndicatorBadge(
indicator: c.indicator,
loading: analyticsService.isInitializing,
points: analyticsService.numConstructs(c),
),
),
),
StreamBuilder(
stream: updater.activityAnalyticsStream.stream,
builder: (context, _) {
final archivedActivitiesCount =
analyticsRoom?.archivedActivitiesCount ??
0;
return HoverButton(
selected: selected ==
ProgressIndicatorEnum.activities,
onPressed: () {
AnalyticsNavigationUtil
.navigateToAnalytics(
context: context,
view: c.indicator,
view: ProgressIndicatorEnum.activities,
);
},
child: ProgressIndicatorBadge(
indicator: c.indicator,
loading: analyticsService.isInitializing,
points: analyticsService.numConstructs(c),
),
),
),
StreamBuilder(
stream:
updater.activityAnalyticsStream.stream,
builder: (context, _) {
final archivedActivitiesCount =
analyticsRoom
?.archivedActivitiesCount ??
0;
return HoverButton(
selected: selected ==
ProgressIndicatorEnum.activities,
onPressed: () {
AnalyticsNavigationUtil
.navigateToAnalytics(
context: context,
view:
ProgressIndicatorEnum.activities,
);
},
child: Tooltip(
message: ProgressIndicatorEnum
.activities
.tooltip(context),
child: Tooltip(
message: ProgressIndicatorEnum.activities
.tooltip(context),
child: Padding(
padding: const EdgeInsets.symmetric(
horizontal: 4.0,
vertical: 2.0,
),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
@ -121,11 +119,11 @@ class LearningProgressIndicators extends StatelessWidget {
],
),
),
);
},
),
],
),
),
);
},
),
],
),
HoverButton(
onPressed: () => showDialog(
@ -171,79 +169,75 @@ class LearningProgressIndicators extends StatelessWidget {
],
),
const SizedBox(height: 6),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 4.0),
child: HoverBuilder(
builder: (context, hovered) {
return Container(
decoration: BoxDecoration(
color: (hovered && canSelect) ||
(selected ==
ProgressIndicatorEnum.level)
? Theme.of(context)
.colorScheme
.primary
.withAlpha((0.2 * 255).round())
: Colors.transparent,
borderRadius: BorderRadius.circular(36.0),
),
padding: const EdgeInsets.symmetric(
vertical: 2.0,
horizontal: 4.0,
),
child: MouseRegion(
cursor: canSelect
? SystemMouseCursors.click
: MouseCursor.defer,
child: GestureDetector(
onTap: canSelect
? () {
AnalyticsNavigationUtil
.navigateToAnalytics(
context: context,
view: ProgressIndicatorEnum.level,
);
}
: null,
child: FutureBuilder(
future: analyticsService.derivedData,
builder: (context, snapshot) {
final cached =
analyticsService.cachedDerivedData;
final data = snapshot.data ?? cached;
return Row(
spacing: 8.0,
children: [
Expanded(
child: LearningProgressBar(
height: 24.0,
loading: data == null,
progress:
data?.levelProgress ?? 0.0,
),
HoverBuilder(
builder: (context, hovered) {
return Container(
decoration: BoxDecoration(
color: (hovered && canSelect) ||
(selected == ProgressIndicatorEnum.level)
? Theme.of(context)
.colorScheme
.primary
.withAlpha((0.2 * 255).round())
: Colors.transparent,
borderRadius: BorderRadius.circular(36.0),
),
padding: const EdgeInsets.symmetric(
vertical: 2.0,
horizontal: 4.0,
),
child: MouseRegion(
cursor: canSelect
? SystemMouseCursors.click
: MouseCursor.defer,
child: GestureDetector(
onTap: canSelect
? () {
AnalyticsNavigationUtil
.navigateToAnalytics(
context: context,
view: ProgressIndicatorEnum.level,
);
}
: null,
child: FutureBuilder(
future: analyticsService.derivedData,
builder: (context, snapshot) {
final cached =
analyticsService.cachedDerivedData;
final data = snapshot.data ?? cached;
return Row(
spacing: 8.0,
children: [
Expanded(
child: LearningProgressBar(
height: 24.0,
loading: data == null,
progress:
data?.levelProgress ?? 0.0,
),
if (data != null)
Text(
"⭐ ${data.level}",
style: Theme.of(context)
.textTheme
.titleLarge
?.copyWith(
fontWeight: FontWeight.bold,
color: Theme.of(context)
.colorScheme
.primary,
),
),
],
);
},
),
),
if (data != null)
Text(
"⭐ ${data.level}",
style: Theme.of(context)
.textTheme
.titleLarge
?.copyWith(
fontWeight: FontWeight.bold,
color: Theme.of(context)
.colorScheme
.primary,
),
),
],
);
},
),
),
);
},
),
),
);
},
),
const SizedBox(height: 16.0),
],

45
lib/pangea/analytics_summary/progress_indicator.dart
View file

@ -19,28 +19,31 @@ class ProgressIndicatorBadge extends StatelessWidget {
Widget build(BuildContext context) {
return Tooltip(
message: indicator.tooltip(context),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
size: 18,
indicator.icon,
color: indicator.color(context),
weight: 1000,
),
const SizedBox(width: 6.0),
!loading
? AnimatedFloatingNumber(
number: points,
)
: const SizedBox(
height: 8,
width: 8,
child: CircularProgressIndicator.adaptive(
strokeWidth: 2,
child: Padding(
padding: const EdgeInsets.symmetric(horizontal: 4.0, vertical: 2.0),
child: Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
size: 18,
indicator.icon,
color: indicator.color(context),
weight: 1000,
),
const SizedBox(width: 6.0),
!loading
? AnimatedFloatingNumber(
number: points,
)
: const SizedBox(
height: 8,
width: 8,
child: CircularProgressIndicator.adaptive(
strokeWidth: 2,
),
),
),
],
],
),
),
);
}

2
lib/pangea/login/pages/find_course_page.dart
View file

@ -424,7 +424,7 @@ class _PublicCourseTile extends StatelessWidget {
spacing: 8.0,
children: [
ImageByUrl(
imageUrl: space.avatarUrl?.toString(),
imageUrl: space.avatarUrl,
width: 58.0,
borderRadius: BorderRadius.circular(10.0),
replacement: Avatar(