Compare commits
5 Commits
8c19c32c76
...
3.3.0+144
| Author | SHA1 | Date | |
|---|---|---|---|
|
ac4fa5eb85
|
|||
|
8857718709
|
|||
|
dd17b2b9c1
|
|||
|
848439f664
|
|||
|
f83117424d
|
@@ -1,4 +1,5 @@
|
|||||||
import "dart:async";
|
import "dart:async";
|
||||||
|
import "dart:math" as math;
|
||||||
import "package:easy_localization/easy_localization.dart";
|
import "package:easy_localization/easy_localization.dart";
|
||||||
import "package:file_picker/file_picker.dart";
|
import "package:file_picker/file_picker.dart";
|
||||||
import "package:flutter/material.dart";
|
import "package:flutter/material.dart";
|
||||||
@@ -140,6 +141,9 @@ class ChatRoomScreen extends HookConsumerWidget {
|
|||||||
final messageController = useTextEditingController();
|
final messageController = useTextEditingController();
|
||||||
final scrollController = useScrollController();
|
final scrollController = useScrollController();
|
||||||
|
|
||||||
|
// Scroll animation notifiers
|
||||||
|
final bottomGradientNotifier = useState(ValueNotifier<double>(0.0));
|
||||||
|
|
||||||
final messageReplyingTo = useState<SnChatMessage?>(null);
|
final messageReplyingTo = useState<SnChatMessage?>(null);
|
||||||
final messageForwardingTo = useState<SnChatMessage?>(null);
|
final messageForwardingTo = useState<SnChatMessage?>(null);
|
||||||
final messageEditingTo = useState<SnChatMessage?>(null);
|
final messageEditingTo = useState<SnChatMessage?>(null);
|
||||||
@@ -164,6 +168,12 @@ class ChatRoomScreen extends HookConsumerWidget {
|
|||||||
isLoading = true;
|
isLoading = true;
|
||||||
messagesNotifier.loadMore().then((_) => isLoading = false);
|
messagesNotifier.loadMore().then((_) => isLoading = false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update gradient animations
|
||||||
|
final pixels = scrollController.position.pixels;
|
||||||
|
|
||||||
|
// Bottom gradient: appears when not at bottom (pixels > 0)
|
||||||
|
bottomGradientNotifier.value.value = (pixels / 500.0).clamp(0.0, 1.0);
|
||||||
}
|
}
|
||||||
|
|
||||||
scrollController.addListener(onScroll);
|
scrollController.addListener(onScroll);
|
||||||
@@ -589,7 +599,9 @@ class ChatRoomScreen extends HookConsumerWidget {
|
|||||||
listController: listController,
|
listController: listController,
|
||||||
padding: EdgeInsets.only(
|
padding: EdgeInsets.only(
|
||||||
top: 16,
|
top: 16,
|
||||||
bottom: MediaQuery.of(context).padding.bottom + 16,
|
bottom:
|
||||||
|
MediaQuery.of(context).padding.bottom +
|
||||||
|
80, // Leave space for chat input
|
||||||
),
|
),
|
||||||
controller: scrollController,
|
controller: scrollController,
|
||||||
reverse: true, // Show newest messages at the bottom
|
reverse: true, // Show newest messages at the bottom
|
||||||
@@ -828,7 +840,7 @@ class ChatRoomScreen extends HookConsumerWidget {
|
|||||||
),
|
),
|
||||||
body: Stack(
|
body: Stack(
|
||||||
children: [
|
children: [
|
||||||
// Messages and Input in Column
|
// Messages only in Column
|
||||||
Positioned.fill(
|
Positioned.fill(
|
||||||
child: Column(
|
child: Column(
|
||||||
children: [
|
children: [
|
||||||
@@ -872,73 +884,6 @@ class ChatRoomScreen extends HookConsumerWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
if (!isSelectionMode.value)
|
|
||||||
chatRoom.when(
|
|
||||||
data:
|
|
||||||
(room) => Column(
|
|
||||||
mainAxisSize: MainAxisSize.min,
|
|
||||||
children: [
|
|
||||||
ChatInput(
|
|
||||||
messageController: messageController,
|
|
||||||
chatRoom: room!,
|
|
||||||
onSend: sendMessage,
|
|
||||||
onClear: () {
|
|
||||||
if (messageEditingTo.value != null) {
|
|
||||||
attachments.value.clear();
|
|
||||||
messageController.clear();
|
|
||||||
}
|
|
||||||
messageEditingTo.value = null;
|
|
||||||
messageReplyingTo.value = null;
|
|
||||||
messageForwardingTo.value = null;
|
|
||||||
},
|
|
||||||
messageEditingTo: messageEditingTo.value,
|
|
||||||
messageReplyingTo: messageReplyingTo.value,
|
|
||||||
messageForwardingTo: messageForwardingTo.value,
|
|
||||||
onPickFile: (bool isPhoto) {
|
|
||||||
if (isPhoto) {
|
|
||||||
pickPhotoMedia();
|
|
||||||
} else {
|
|
||||||
pickVideoMedia();
|
|
||||||
}
|
|
||||||
},
|
|
||||||
onPickAudio: pickAudioMedia,
|
|
||||||
onPickGeneralFile: pickGeneralFile,
|
|
||||||
onLinkAttachment: linkAttachment,
|
|
||||||
attachments: attachments.value,
|
|
||||||
onUploadAttachment: uploadAttachment,
|
|
||||||
onDeleteAttachment: (index) async {
|
|
||||||
final attachment = attachments.value[index];
|
|
||||||
if (attachment.isOnCloud &&
|
|
||||||
!attachment.isLink) {
|
|
||||||
final client = ref.watch(apiClientProvider);
|
|
||||||
await client.delete(
|
|
||||||
'/drive/files/${attachment.data.id}',
|
|
||||||
);
|
|
||||||
}
|
|
||||||
final clone = List.of(attachments.value);
|
|
||||||
clone.removeAt(index);
|
|
||||||
attachments.value = clone;
|
|
||||||
},
|
|
||||||
onMoveAttachment: (idx, delta) {
|
|
||||||
if (idx + delta < 0 ||
|
|
||||||
idx + delta >= attachments.value.length) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
final clone = List.of(attachments.value);
|
|
||||||
clone.insert(idx + delta, clone.removeAt(idx));
|
|
||||||
attachments.value = clone;
|
|
||||||
},
|
|
||||||
onAttachmentsChanged: (newAttachments) {
|
|
||||||
attachments.value = newAttachments;
|
|
||||||
},
|
|
||||||
attachmentProgress: attachmentProgress.value,
|
|
||||||
),
|
|
||||||
Gap(MediaQuery.of(context).padding.bottom),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
error: (_, _) => const SizedBox.shrink(),
|
|
||||||
loading: () => const SizedBox.shrink(),
|
|
||||||
),
|
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
@@ -977,6 +922,112 @@ class ChatRoomScreen extends HookConsumerWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
// Bottom gradient - appears when scrolling towards newer messages (behind chat input)
|
||||||
|
if (!isSelectionMode.value)
|
||||||
|
AnimatedBuilder(
|
||||||
|
animation: bottomGradientNotifier.value,
|
||||||
|
builder:
|
||||||
|
(context, child) => Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0,
|
||||||
|
child: Opacity(
|
||||||
|
opacity: bottomGradientNotifier.value.value,
|
||||||
|
child: Container(
|
||||||
|
height: math.min(
|
||||||
|
MediaQuery.of(context).size.height * 0.1,
|
||||||
|
128,
|
||||||
|
),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
gradient: LinearGradient(
|
||||||
|
begin: Alignment.bottomCenter,
|
||||||
|
end: Alignment.topCenter,
|
||||||
|
colors: [
|
||||||
|
Theme.of(
|
||||||
|
context,
|
||||||
|
).colorScheme.surfaceContainer.withOpacity(0.8),
|
||||||
|
Theme.of(
|
||||||
|
context,
|
||||||
|
).colorScheme.surfaceContainer.withOpacity(0.0),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// Chat Input positioned above gradient (higher z-index)
|
||||||
|
if (!isSelectionMode.value)
|
||||||
|
Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0, // At the very bottom, above gradient
|
||||||
|
child: chatRoom.when(
|
||||||
|
data:
|
||||||
|
(room) => Column(
|
||||||
|
mainAxisSize: MainAxisSize.min,
|
||||||
|
children: [
|
||||||
|
ChatInput(
|
||||||
|
messageController: messageController,
|
||||||
|
chatRoom: room!,
|
||||||
|
onSend: sendMessage,
|
||||||
|
onClear: () {
|
||||||
|
if (messageEditingTo.value != null) {
|
||||||
|
attachments.value.clear();
|
||||||
|
messageController.clear();
|
||||||
|
}
|
||||||
|
messageEditingTo.value = null;
|
||||||
|
messageReplyingTo.value = null;
|
||||||
|
messageForwardingTo.value = null;
|
||||||
|
},
|
||||||
|
messageEditingTo: messageEditingTo.value,
|
||||||
|
messageReplyingTo: messageReplyingTo.value,
|
||||||
|
messageForwardingTo: messageForwardingTo.value,
|
||||||
|
onPickFile: (bool isPhoto) {
|
||||||
|
if (isPhoto) {
|
||||||
|
pickPhotoMedia();
|
||||||
|
} else {
|
||||||
|
pickVideoMedia();
|
||||||
|
}
|
||||||
|
},
|
||||||
|
onPickAudio: pickAudioMedia,
|
||||||
|
onPickGeneralFile: pickGeneralFile,
|
||||||
|
onLinkAttachment: linkAttachment,
|
||||||
|
attachments: attachments.value,
|
||||||
|
onUploadAttachment: uploadAttachment,
|
||||||
|
onDeleteAttachment: (index) async {
|
||||||
|
final attachment = attachments.value[index];
|
||||||
|
if (attachment.isOnCloud && !attachment.isLink) {
|
||||||
|
final client = ref.watch(apiClientProvider);
|
||||||
|
await client.delete(
|
||||||
|
'/drive/files/${attachment.data.id}',
|
||||||
|
);
|
||||||
|
}
|
||||||
|
final clone = List.of(attachments.value);
|
||||||
|
clone.removeAt(index);
|
||||||
|
attachments.value = clone;
|
||||||
|
},
|
||||||
|
onMoveAttachment: (idx, delta) {
|
||||||
|
if (idx + delta < 0 ||
|
||||||
|
idx + delta >= attachments.value.length) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
final clone = List.of(attachments.value);
|
||||||
|
clone.insert(idx + delta, clone.removeAt(idx));
|
||||||
|
attachments.value = clone;
|
||||||
|
},
|
||||||
|
onAttachmentsChanged: (newAttachments) {
|
||||||
|
attachments.value = newAttachments;
|
||||||
|
},
|
||||||
|
attachmentProgress: attachmentProgress.value,
|
||||||
|
),
|
||||||
|
Gap(MediaQuery.of(context).padding.bottom),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
error: (_, _) => const SizedBox.shrink(),
|
||||||
|
loading: () => const SizedBox.shrink(),
|
||||||
|
),
|
||||||
|
),
|
||||||
// Selection mode toolbar
|
// Selection mode toolbar
|
||||||
if (isSelectionMode.value)
|
if (isSelectionMode.value)
|
||||||
Positioned(
|
Positioned(
|
||||||
|
|||||||
@@ -201,7 +201,7 @@ class PostCategoryDetailScreen extends HookConsumerWidget {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
icon: const Icon(
|
icon: const Icon(
|
||||||
Symbols.add_circle,
|
Symbols.remove_circle,
|
||||||
),
|
),
|
||||||
label: Text('unsubscribe'.tr()),
|
label: Text('unsubscribe'.tr()),
|
||||||
)
|
)
|
||||||
@@ -214,7 +214,7 @@ class PostCategoryDetailScreen extends HookConsumerWidget {
|
|||||||
);
|
);
|
||||||
},
|
},
|
||||||
icon: const Icon(
|
icon: const Icon(
|
||||||
Symbols.remove_circle,
|
Symbols.add_circle,
|
||||||
),
|
),
|
||||||
label: Text('subscribe'.tr()),
|
label: Text('subscribe'.tr()),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import "dart:convert";
|
import "dart:convert";
|
||||||
|
import "dart:math" as math;
|
||||||
import "package:dio/dio.dart";
|
import "package:dio/dio.dart";
|
||||||
import "package:easy_localization/easy_localization.dart";
|
import "package:easy_localization/easy_localization.dart";
|
||||||
import "package:flutter/material.dart";
|
import "package:flutter/material.dart";
|
||||||
@@ -57,6 +58,9 @@ class ThoughtScreen extends HookConsumerWidget {
|
|||||||
|
|
||||||
final listController = useMemoized(() => ListController(), []);
|
final listController = useMemoized(() => ListController(), []);
|
||||||
|
|
||||||
|
// Scroll animation notifiers
|
||||||
|
final bottomGradientNotifier = useState(ValueNotifier<double>(0.0));
|
||||||
|
|
||||||
// Update local thoughts when provider data changes
|
// Update local thoughts when provider data changes
|
||||||
useEffect(() {
|
useEffect(() {
|
||||||
thoughts.whenData((data) {
|
thoughts.whenData((data) {
|
||||||
@@ -86,6 +90,20 @@ class ThoughtScreen extends HookConsumerWidget {
|
|||||||
return null;
|
return null;
|
||||||
}, [localThoughts.value.length, isStreaming.value]);
|
}, [localThoughts.value.length, isStreaming.value]);
|
||||||
|
|
||||||
|
// Add scroll listener for gradient animations
|
||||||
|
useEffect(() {
|
||||||
|
void onScroll() {
|
||||||
|
// Update gradient animations
|
||||||
|
final pixels = scrollController.position.pixels;
|
||||||
|
|
||||||
|
// Bottom gradient: appears when not at bottom (pixels > 0)
|
||||||
|
bottomGradientNotifier.value.value = (pixels / 500.0).clamp(0.0, 1.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
scrollController.addListener(onScroll);
|
||||||
|
return () => scrollController.removeListener(onScroll);
|
||||||
|
}, [scrollController]);
|
||||||
|
|
||||||
void sendMessage() async {
|
void sendMessage() async {
|
||||||
if (messageController.text.trim().isEmpty) return;
|
if (messageController.text.trim().isEmpty) return;
|
||||||
|
|
||||||
@@ -258,65 +276,120 @@ class ThoughtScreen extends HookConsumerWidget {
|
|||||||
const Gap(8),
|
const Gap(8),
|
||||||
],
|
],
|
||||||
),
|
),
|
||||||
body: Center(
|
body: Stack(
|
||||||
child: Container(
|
children: [
|
||||||
constraints: BoxConstraints(maxWidth: 640),
|
// Thoughts list
|
||||||
child: Column(
|
Center(
|
||||||
children: [
|
child: Container(
|
||||||
Expanded(
|
constraints: BoxConstraints(maxWidth: 640),
|
||||||
child: thoughts.when(
|
child: Column(
|
||||||
data:
|
children: [
|
||||||
(thoughtList) => SuperListView.builder(
|
Expanded(
|
||||||
listController: listController,
|
child: thoughts.when(
|
||||||
controller: scrollController,
|
data:
|
||||||
padding: const EdgeInsets.only(top: 16, bottom: 16),
|
(thoughtList) => SuperListView.builder(
|
||||||
reverse: true,
|
listController: listController,
|
||||||
itemCount:
|
controller: scrollController,
|
||||||
localThoughts.value.length +
|
padding: EdgeInsets.only(
|
||||||
(isStreaming.value ? 1 : 0),
|
top: 16,
|
||||||
itemBuilder: (context, index) {
|
bottom:
|
||||||
if (isStreaming.value && index == 0) {
|
MediaQuery.of(context).padding.bottom +
|
||||||
return ThoughtItem(
|
80, // Leave space for thought input
|
||||||
isStreaming: true,
|
),
|
||||||
streamingText: streamingText.value,
|
reverse: true,
|
||||||
reasoningChunks: reasoningChunks.value,
|
itemCount:
|
||||||
streamingFunctionCalls: functionCalls.value,
|
localThoughts.value.length +
|
||||||
);
|
(isStreaming.value ? 1 : 0),
|
||||||
}
|
itemBuilder: (context, index) {
|
||||||
final thoughtIndex =
|
if (isStreaming.value && index == 0) {
|
||||||
isStreaming.value ? index - 1 : index;
|
return ThoughtItem(
|
||||||
final thought = localThoughts.value[thoughtIndex];
|
isStreaming: true,
|
||||||
return ThoughtItem(
|
streamingText: streamingText.value,
|
||||||
thought: thought,
|
reasoningChunks: reasoningChunks.value,
|
||||||
thoughtIndex: thoughtIndex,
|
streamingFunctionCalls: functionCalls.value,
|
||||||
);
|
);
|
||||||
},
|
}
|
||||||
|
final thoughtIndex =
|
||||||
|
isStreaming.value ? index - 1 : index;
|
||||||
|
final thought = localThoughts.value[thoughtIndex];
|
||||||
|
return ThoughtItem(
|
||||||
|
thought: thought,
|
||||||
|
thoughtIndex: thoughtIndex,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
loading:
|
||||||
|
() =>
|
||||||
|
const Center(child: CircularProgressIndicator()),
|
||||||
|
error:
|
||||||
|
(error, _) => ResponseErrorWidget(
|
||||||
|
error: error,
|
||||||
|
onRetry:
|
||||||
|
() =>
|
||||||
|
selectedSequenceId.value != null
|
||||||
|
? ref.invalidate(
|
||||||
|
thoughtSequenceProvider(
|
||||||
|
selectedSequenceId.value!,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
: null,
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// Bottom gradient - appears when scrolling towards newer thoughts (behind thought input)
|
||||||
|
AnimatedBuilder(
|
||||||
|
animation: bottomGradientNotifier.value,
|
||||||
|
builder:
|
||||||
|
(context, child) => Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0,
|
||||||
|
child: Opacity(
|
||||||
|
opacity: bottomGradientNotifier.value.value,
|
||||||
|
child: Container(
|
||||||
|
height: math.min(
|
||||||
|
MediaQuery.of(context).size.height * 0.1,
|
||||||
|
128,
|
||||||
),
|
),
|
||||||
loading:
|
decoration: BoxDecoration(
|
||||||
() => const Center(child: CircularProgressIndicator()),
|
gradient: LinearGradient(
|
||||||
error:
|
begin: Alignment.bottomCenter,
|
||||||
(error, _) => ResponseErrorWidget(
|
end: Alignment.topCenter,
|
||||||
error: error,
|
colors: [
|
||||||
onRetry:
|
Theme.of(
|
||||||
() =>
|
context,
|
||||||
selectedSequenceId.value != null
|
).colorScheme.surfaceContainer.withOpacity(0.8),
|
||||||
? ref.invalidate(
|
Theme.of(
|
||||||
thoughtSequenceProvider(
|
context,
|
||||||
selectedSequenceId.value!,
|
).colorScheme.surfaceContainer.withOpacity(0.0),
|
||||||
),
|
],
|
||||||
)
|
),
|
||||||
: null,
|
|
||||||
),
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// Thought Input positioned above gradient (higher z-index)
|
||||||
|
Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0, // At the very bottom, above gradient
|
||||||
|
child: Center(
|
||||||
|
child: Container(
|
||||||
|
constraints: BoxConstraints(maxWidth: 640),
|
||||||
|
child: ThoughtInput(
|
||||||
|
messageController: messageController,
|
||||||
|
isStreaming: isStreaming.value,
|
||||||
|
onSend: sendMessage,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
ThoughtInput(
|
),
|
||||||
messageController: messageController,
|
|
||||||
isStreaming: isStreaming.value,
|
|
||||||
onSend: sendMessage,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import "dart:convert";
|
import "dart:convert";
|
||||||
|
import "dart:math" as math;
|
||||||
import "package:dio/dio.dart";
|
import "package:dio/dio.dart";
|
||||||
import "package:easy_localization/easy_localization.dart";
|
import "package:easy_localization/easy_localization.dart";
|
||||||
import "package:flutter/material.dart";
|
import "package:flutter/material.dart";
|
||||||
@@ -54,6 +55,9 @@ class ThoughtSheet extends HookConsumerWidget {
|
|||||||
|
|
||||||
final listController = useMemoized(() => ListController(), []);
|
final listController = useMemoized(() => ListController(), []);
|
||||||
|
|
||||||
|
// Scroll animation notifiers
|
||||||
|
final bottomGradientNotifier = useState(ValueNotifier<double>(0.0));
|
||||||
|
|
||||||
// Scroll to bottom when thoughts change or streaming state changes
|
// Scroll to bottom when thoughts change or streaming state changes
|
||||||
useEffect(() {
|
useEffect(() {
|
||||||
if (localThoughts.value.isNotEmpty || isStreaming.value) {
|
if (localThoughts.value.isNotEmpty || isStreaming.value) {
|
||||||
@@ -68,6 +72,20 @@ class ThoughtSheet extends HookConsumerWidget {
|
|||||||
return null;
|
return null;
|
||||||
}, [localThoughts.value.length, isStreaming.value]);
|
}, [localThoughts.value.length, isStreaming.value]);
|
||||||
|
|
||||||
|
// Add scroll listener for gradient animations
|
||||||
|
useEffect(() {
|
||||||
|
void onScroll() {
|
||||||
|
// Update gradient animations
|
||||||
|
final pixels = scrollController.position.pixels;
|
||||||
|
|
||||||
|
// Bottom gradient: appears when not at bottom (pixels > 0)
|
||||||
|
bottomGradientNotifier.value.value = (pixels / 500.0).clamp(0.0, 1.0);
|
||||||
|
}
|
||||||
|
|
||||||
|
scrollController.addListener(onScroll);
|
||||||
|
return () => scrollController.removeListener(onScroll);
|
||||||
|
}, [scrollController]);
|
||||||
|
|
||||||
void sendMessage() async {
|
void sendMessage() async {
|
||||||
if (messageController.text.trim().isEmpty) return;
|
if (messageController.text.trim().isEmpty) return;
|
||||||
|
|
||||||
@@ -196,47 +214,103 @@ class ThoughtSheet extends HookConsumerWidget {
|
|||||||
|
|
||||||
return SheetScaffold(
|
return SheetScaffold(
|
||||||
titleText: currentTopic.value ?? 'aiThought'.tr(),
|
titleText: currentTopic.value ?? 'aiThought'.tr(),
|
||||||
child: Center(
|
child: Stack(
|
||||||
child: Container(
|
children: [
|
||||||
constraints: BoxConstraints(maxWidth: 640),
|
// Thoughts list
|
||||||
child: Column(
|
Center(
|
||||||
children: [
|
child: Container(
|
||||||
Expanded(
|
constraints: BoxConstraints(maxWidth: 640),
|
||||||
child: SuperListView.builder(
|
child: Column(
|
||||||
listController: listController,
|
children: [
|
||||||
controller: scrollController,
|
Expanded(
|
||||||
padding: const EdgeInsets.only(top: 16, bottom: 16),
|
child: SuperListView.builder(
|
||||||
reverse: true,
|
listController: listController,
|
||||||
itemCount:
|
controller: scrollController,
|
||||||
localThoughts.value.length + (isStreaming.value ? 1 : 0),
|
padding: EdgeInsets.only(
|
||||||
itemBuilder: (context, index) {
|
top: 16,
|
||||||
if (isStreaming.value && index == 0) {
|
bottom:
|
||||||
return ThoughtItem(
|
MediaQuery.of(context).padding.bottom +
|
||||||
isStreaming: true,
|
80, // Leave space for thought input
|
||||||
streamingText: streamingText.value,
|
),
|
||||||
reasoningChunks: reasoningChunks.value,
|
reverse: true,
|
||||||
streamingFunctionCalls: functionCalls.value,
|
itemCount:
|
||||||
);
|
localThoughts.value.length +
|
||||||
}
|
(isStreaming.value ? 1 : 0),
|
||||||
final thoughtIndex = isStreaming.value ? index - 1 : index;
|
itemBuilder: (context, index) {
|
||||||
final thought = localThoughts.value[thoughtIndex];
|
if (isStreaming.value && index == 0) {
|
||||||
return ThoughtItem(
|
return ThoughtItem(
|
||||||
thought: thought,
|
isStreaming: true,
|
||||||
thoughtIndex: thoughtIndex,
|
streamingText: streamingText.value,
|
||||||
);
|
reasoningChunks: reasoningChunks.value,
|
||||||
},
|
streamingFunctionCalls: functionCalls.value,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
final thoughtIndex =
|
||||||
|
isStreaming.value ? index - 1 : index;
|
||||||
|
final thought = localThoughts.value[thoughtIndex];
|
||||||
|
return ThoughtItem(
|
||||||
|
thought: thought,
|
||||||
|
thoughtIndex: thoughtIndex,
|
||||||
|
);
|
||||||
|
},
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// Bottom gradient - appears when scrolling towards newer thoughts (behind thought input)
|
||||||
|
AnimatedBuilder(
|
||||||
|
animation: bottomGradientNotifier.value,
|
||||||
|
builder:
|
||||||
|
(context, child) => Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0,
|
||||||
|
child: Opacity(
|
||||||
|
opacity: bottomGradientNotifier.value.value,
|
||||||
|
child: Container(
|
||||||
|
height: math.min(
|
||||||
|
MediaQuery.of(context).size.height * 0.1,
|
||||||
|
128,
|
||||||
|
),
|
||||||
|
decoration: BoxDecoration(
|
||||||
|
gradient: LinearGradient(
|
||||||
|
begin: Alignment.bottomCenter,
|
||||||
|
end: Alignment.topCenter,
|
||||||
|
colors: [
|
||||||
|
Theme.of(
|
||||||
|
context,
|
||||||
|
).colorScheme.surfaceContainer.withOpacity(0.8),
|
||||||
|
Theme.of(
|
||||||
|
context,
|
||||||
|
).colorScheme.surfaceContainer.withOpacity(0.0),
|
||||||
|
],
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
// Thought Input positioned above gradient (higher z-index)
|
||||||
|
Positioned(
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0, // At the very bottom, above gradient
|
||||||
|
child: Center(
|
||||||
|
child: Container(
|
||||||
|
constraints: BoxConstraints(maxWidth: 640),
|
||||||
|
child: ThoughtInput(
|
||||||
|
messageController: messageController,
|
||||||
|
isStreaming: isStreaming.value,
|
||||||
|
onSend: sendMessage,
|
||||||
|
attachedMessages: attachedMessages,
|
||||||
|
attachedPosts: attachedPosts,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
ThoughtInput(
|
),
|
||||||
messageController: messageController,
|
|
||||||
isStreaming: isStreaming.value,
|
|
||||||
onSend: sendMessage,
|
|
||||||
attachedMessages: attachedMessages,
|
|
||||||
attachedPosts: attachedPosts,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
),
|
||||||
),
|
],
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -423,6 +423,7 @@ class PostComposeCard extends HookConsumerWidget {
|
|||||||
state: composeState,
|
state: composeState,
|
||||||
originalPost: originalPost,
|
originalPost: originalPost,
|
||||||
isCompact: true,
|
isCompact: true,
|
||||||
|
useSafeArea: isContained,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
|||||||
@@ -14,12 +14,14 @@ class ComposeToolbar extends HookConsumerWidget {
|
|||||||
final ComposeState state;
|
final ComposeState state;
|
||||||
final SnPost? originalPost;
|
final SnPost? originalPost;
|
||||||
final bool isCompact;
|
final bool isCompact;
|
||||||
|
final bool useSafeArea;
|
||||||
|
|
||||||
const ComposeToolbar({
|
const ComposeToolbar({
|
||||||
super.key,
|
super.key,
|
||||||
required this.state,
|
required this.state,
|
||||||
this.originalPost,
|
this.originalPost,
|
||||||
this.isCompact = false,
|
this.isCompact = false,
|
||||||
|
this.useSafeArea = false,
|
||||||
});
|
});
|
||||||
|
|
||||||
@override
|
@override
|
||||||
@@ -200,7 +202,12 @@ class ComposeToolbar extends HookConsumerWidget {
|
|||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
).padding(horizontal: 8, vertical: 4),
|
).padding(
|
||||||
|
horizontal: 8,
|
||||||
|
top: 4,
|
||||||
|
bottom:
|
||||||
|
useSafeArea ? MediaQuery.of(context).padding.bottom + 4 : 4,
|
||||||
|
),
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -16,7 +16,7 @@ publish_to: "none" # Remove this line if you wish to publish to pub.dev
|
|||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
# In Windows, build-name is used as the major, minor, and patch parts
|
# In Windows, build-name is used as the major, minor, and patch parts
|
||||||
# of the product and file versions while build-number is used as the build suffix.
|
# of the product and file versions while build-number is used as the build suffix.
|
||||||
version: 3.3.0+143
|
version: 3.3.0+144
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ^3.7.2
|
sdk: ^3.7.2
|
||||||
|
|||||||
Reference in New Issue
Block a user