Skip to content

Commit

Permalink
the renderbox overflows on some phones soo i decided to wrap the colu…
Browse files Browse the repository at this point in the history
…mns in the listview and also replace some columns with the listview. The error text is not show in a red background soo i changed the color of the error text to black. Added a clear chat icon on the appbar to reset the chat messages. Thanks
  • Loading branch information
aivan2798 committed Oct 16, 2023
1 parent c222edd commit 69bb442
Show file tree
Hide file tree
Showing 8 changed files with 77 additions and 27 deletions.
25 changes: 25 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Mindful-AI-App",
"request": "launch",
"type": "dart"
},
{
"name": "Mindful-AI-App (profile mode)",
"request": "launch",
"type": "dart",
"flutterMode": "profile"
},
{
"name": "Mindful-AI-App (release mode)",
"request": "launch",
"type": "dart",
"flutterMode": "release"
}
]
}
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
3 changes: 2 additions & 1 deletion lib/constants/api_consts.dart
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
String BASE_URL = "https://api.openai.com/v1";
String API_KEY = "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";
String API_KEY = "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";
//"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";
5 changes: 5 additions & 0 deletions lib/providers/chats_provider.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@ class ChatProvider with ChangeNotifier {
notifyListeners();
}

void clearMessages() {
chatList.clear();
notifyListeners();
}

Future<void> sendMessageAndGetAnswers(
{required String msg, required String chosenModelId}) async {
chatList.addAll(await ApiService.sendMessage(
Expand Down
10 changes: 9 additions & 1 deletion lib/screens/chat_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -78,13 +78,20 @@ class _ChatScreenState extends State<ChatScreen> {
),),
]),
actions: [
IconButton(onPressed: ()
{
chatProvider.clearMessages();
print("all cleared");
},
icon: Icon(Icons.clear_all_rounded)),
IconButton(
onPressed: () async {
await Services.showModalSheet(context: context);
},
icon: const Icon(Icons.more_vert_rounded, color: Colors.white),
),


],
backgroundColor: Colors.orange[200],
shape: const RoundedRectangleBorder(
Expand Down Expand Up @@ -233,7 +240,8 @@ class _ChatScreenState extends State<ChatScreen> {
log("error $error");
ScaffoldMessenger.of(context).showSnackBar(SnackBar(
content: TextWidget(
label: error.toString(),
color: Colors.black,
label: "\tERROR:\n"+error.toString(),
),
backgroundColor: Colors.red,
));
Expand Down
6 changes: 3 additions & 3 deletions lib/screens/home_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ class HomeScreen extends StatelessWidget {
),
),
),
Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
ListView(
/*mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,*/
children: [
const SizedBox(
height: 100,
Expand Down
7 changes: 5 additions & 2 deletions lib/widgets/splash_screen.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,8 @@ class _SplashScreenState extends State<SplashScreen> {
),
),
),
Column(
ListView(
children: [Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
Expand Down Expand Up @@ -109,7 +110,9 @@ class _SplashScreenState extends State<SplashScreen> {
),
),
],
),

)]
),
],
),
);
Expand Down
46 changes: 27 additions & 19 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ packages:
dependency: transitive
description:
name: async
sha256: bfe67ef28df125b7dddcea62755991f807aa39a2492a23e1550161692950bbe0
sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c"
url: "https://pub.dev"
source: hosted
version: "2.10.0"
version: "2.11.0"
avatar_glow:
dependency: "direct main"
description:
Expand All @@ -37,10 +37,10 @@ packages:
dependency: transitive
description:
name: characters
sha256: e6a326c8af69605aec75ed6c187d06b349707a27fbff8222ca9cc2cff167975c
sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605"
url: "https://pub.dev"
source: hosted
version: "1.2.1"
version: "1.3.0"
clock:
dependency: transitive
description:
Expand All @@ -53,10 +53,10 @@ packages:
dependency: transitive
description:
name: collection
sha256: cfc915e6923fe5ce6e153b0723c753045de46de1b4d63771530504004a45fae0
sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
url: "https://pub.dev"
source: hosted
version: "1.17.0"
version: "1.17.2"
cupertino_icons:
dependency: "direct main"
description:
Expand Down Expand Up @@ -148,26 +148,26 @@ packages:
dependency: transitive
description:
name: matcher
sha256: "16db949ceee371e9b99d22f88fa3a73c4e59fd0afed0bd25fc336eb76c198b72"
sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e"
url: "https://pub.dev"
source: hosted
version: "0.12.13"
version: "0.12.16"
material_color_utilities:
dependency: transitive
description:
name: material_color_utilities
sha256: d92141dc6fe1dad30722f9aa826c7fbc896d021d792f80678280601aff8cf724
sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
version: "0.5.0"
meta:
dependency: transitive
description:
name: meta
sha256: "6c268b42ed578a53088d834796959e4a1814b5e9e164f147f580a386e5decf42"
sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
url: "https://pub.dev"
source: hosted
version: "1.8.0"
version: "1.9.1"
nested:
dependency: transitive
description:
Expand All @@ -180,10 +180,10 @@ packages:
dependency: transitive
description:
name: path
sha256: db9d4f58c908a4ba5953fcee2ae317c94889433e5024c27ce74a37f94267945b
sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917"
url: "https://pub.dev"
source: hosted
version: "1.8.2"
version: "1.8.3"
pedantic:
dependency: transitive
description:
Expand Down Expand Up @@ -217,10 +217,10 @@ packages:
dependency: transitive
description:
name: source_span
sha256: dd904f795d4b4f3b870833847c461801f6750a9fa8e61ea5ac53f9422b31f250
sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c"
url: "https://pub.dev"
source: hosted
version: "1.9.1"
version: "1.10.0"
speech_to_text:
dependency: "direct main"
description:
Expand Down Expand Up @@ -281,10 +281,10 @@ packages:
dependency: transitive
description:
name: test_api
sha256: ad540f65f92caa91bf21dfc8ffb8c589d6e4dc0c2267818b4cc2792857706206
sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
url: "https://pub.dev"
source: hosted
version: "0.4.16"
version: "0.6.0"
typed_data:
dependency: transitive
description:
Expand All @@ -301,6 +301,14 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.1.4"
web:
dependency: transitive
description:
name: web
sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
url: "https://pub.dev"
source: hosted
version: "0.1.4-beta"
sdks:
dart: ">=2.18.6 <3.0.0"
dart: ">=3.1.0-185.0.dev <4.0.0"
flutter: ">=2.5.0"

0 comments on commit 69bb442

Please sign in to comment.