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

chore: make IGC button more prominent and added tooltip, set auto-IGC false by default (#3461)

Browse source
This commit is contained in:
ggurdin 2025-07-15 10:43:25 -04:00 • committed by GitHub
parent 77e8eae2ed
commit 8493e28d96
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 85 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/l10n/intl_en.arb
View file

@ -5091,5 +5091,6 @@
"pleaseReload": "Please reload and try again.",
"translationError": "Translation error",
"errorFetchingTranslation": "Failed to fetch translation",
"errorFetchingActivity": "Failed to fetch activity"
"errorFetchingActivity": "Failed to fetch activity",
"check": "Check"
}

1
lib/pangea/choreographer/enums/assistance_state_enum.dart
View file

@ -20,6 +20,7 @@ extension AssistanceStateExtension on AssistanceState {
switch (this) {
case AssistanceState.noSub:
case AssistanceState.noMessage:
return Theme.of(context).disabledColor;
case AssistanceState.notFetched:
case AssistanceState.fetching:
return Theme.of(context).colorScheme.primary;

121
lib/pangea/choreographer/widgets/start_igc_button.dart
View file

@ -3,6 +3,8 @@ import 'dart:math' as math;
import 'package:flutter/material.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pangea/choreographer/enums/assistance_state_enum.dart';
import 'package:fluffychat/pangea/choreographer/widgets/igc/paywall_card.dart';
import 'package:fluffychat/pangea/common/utils/overlay.dart';
@ -68,8 +70,12 @@ class StartIGCButtonState extends State<StartIGCButton>
}
bool get _enableFeedback {
return assistanceState != AssistanceState.fetching &&
assistanceState != AssistanceState.complete;
return ![
AssistanceState.fetching,
AssistanceState.fetched,
AssistanceState.complete,
AssistanceState.noMessage,
].contains(assistanceState);
}
Future<void> _onTap() async {
@ -106,52 +112,79 @@ class StartIGCButtonState extends State<StartIGCButton>
}
}
Color get _backgroundColor {
switch (assistanceState) {
case AssistanceState.noSub:
case AssistanceState.noMessage:
case AssistanceState.fetched:
case AssistanceState.complete:
return Theme.of(context).colorScheme.surfaceContainerHighest;
case AssistanceState.notFetched:
case AssistanceState.fetching:
return Theme.of(context).colorScheme.primaryContainer;
}
}
@override
Widget build(BuildContext context) {
return SizedBox(
child: InkWell(
enableFeedback: _enableFeedback,
onTap: _enableFeedback ? _onTap : null,
customBorder: const CircleBorder(),
onLongPress: _enableFeedback
? () => showDialog(
context: context,
builder: (c) => const SettingsLearning(),
barrierDismissible: false,
)
: null,
child: Stack(
alignment: Alignment.center,
children: [
_controller != null
? RotationTransition(
turns: Tween(begin: 0.0, end: math.pi * 2)
.animate(_controller!),
child: Icon(
size: 36,
Icons.autorenew_rounded,
color: assistanceState.stateColor(context),
),
final icon = Icon(
size: 36,
Icons.autorenew_rounded,
color: assistanceState.stateColor(context),
);
return Tooltip(
message: _enableFeedback ? L10n.of(context).check : "",
child: Material(
elevation: _enableFeedback ? 4.0 : 0.0,
borderRadius: BorderRadius.circular(99.0),
shadowColor: Theme.of(context).colorScheme.surface.withAlpha(128),
child: InkWell(
enableFeedback: _enableFeedback,
onTap: _enableFeedback ? _onTap : null,
customBorder: const CircleBorder(),
onLongPress: _enableFeedback
? () => showDialog(
context: context,
builder: (c) => const SettingsLearning(),
barrierDismissible: false,
)
: Icon(
size: 36,
Icons.autorenew_rounded,
color: assistanceState.stateColor(context),
),
Container(
width: 20,
height: 20,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: Theme.of(context).colorScheme.surfaceContainerHighest,
: null,
child: Stack(
alignment: Alignment.center,
children: [
AnimatedContainer(
height: 40.0,
width: 40.0,
duration: FluffyThemes.animationDuration,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: _backgroundColor,
),
),
),
Icon(
size: 16,
Icons.check,
color: assistanceState.stateColor(context),
),
],
_controller != null
? RotationTransition(
turns: Tween(begin: 0.0, end: math.pi * 2)
.animate(_controller!),
child: icon,
)
: icon,
AnimatedContainer(
width: 20,
height: 20,
duration: FluffyThemes.animationDuration,
decoration: BoxDecoration(
shape: BoxShape.circle,
color: _backgroundColor,
),
),
Icon(
size: 16,
Icons.check,
color: assistanceState.stateColor(context),
),
],
),
),
),
);

2
lib/pangea/common/constants/model_keys.dart
View file

@ -177,4 +177,6 @@ class ModelKey {
static const String activityRequestCount = "count";
static const String activityRequestNumberOfParticipants =
"number_of_participants";
static const String autoIGC = "auto_igc";
}

6
lib/pangea/user/models/user_model.dart
View file

@ -174,7 +174,7 @@ class UserToolSettings {
this.interactiveGrammar = true,
this.immersionMode = false,
this.definitions = true,
this.autoIGC = true,
this.autoIGC = false,
this.enableTTS = true,
this.enableAutocorrect = false,
});
@ -187,7 +187,7 @@ class UserToolSettings {
json[ToolSetting.interactiveGrammar.toString()] ?? true,
immersionMode: false,
definitions: json[ToolSetting.definitions.toString()] ?? true,
autoIGC: json[ToolSetting.autoIGC.toString()] ?? true,
autoIGC: json[ModelKey.autoIGC] ?? false,
enableTTS: json[ToolSetting.enableTTS.toString()] ?? true,
enableAutocorrect: json["enableAutocorrect"] ?? false,
);
@ -198,7 +198,7 @@ class UserToolSettings {
data[ToolSetting.interactiveGrammar.toString()] = interactiveGrammar;
data[ToolSetting.immersionMode.toString()] = immersionMode;
data[ToolSetting.definitions.toString()] = definitions;
data[ToolSetting.autoIGC.toString()] = autoIGC;
data[ModelKey.autoIGC] = autoIGC;
data[ToolSetting.enableTTS.toString()] = enableTTS;
data["enableAutocorrect"] = enableAutocorrect;
return data;