From 8e760cb512cea15578c9ff51760ea5fa630c09e7 Mon Sep 17 00:00:00 2001
From: "priyanshu.creator.dev" <priyanshu.creator.dev@gmail.com>
Date: Sat, 18 May 2024 12:50:14 +0000
Subject: [PATCH] redesign UI and fixes

---
 .github/workflows/main.yml                    |   4 +-
 .idx/dev.nix                                  |  14 ---
 .metadata                                     |  29 ++---
 android/app/build.gradle                      |  74 +++++--------
 android/app/src/debug/AndroidManifest.xml     |   3 +-
 android/app/src/main/AndroidManifest.xml      |   2 +-
 .../kotlin/com/soms/answerit/MainActivity.kt  |   6 -
 .../kotlin/tech/p7u/delta/MainActivity.kt     |   5 +
 android/app/src/profile/AndroidManifest.xml   |   2 +-
 android/build.gradle                          |  18 +--
 android/gradle.properties                     |   2 +-
 .../gradle/wrapper/gradle-wrapper.properties  |   2 +-
 android/settings.gradle                       |  30 +++--
 lib/basics/credits_screen.dart                |   2 +-
 lib/features/Chat/server/services.dart        |  17 +--
 lib/features/Chat/view/chat_screen.dart       |  80 +++++---------
 .../Chat/widgets/loading_skeletion.dart       |  39 +++++--
 .../imageGeneration/screens/Image_screen.dart |  61 ----------
 lib/screens/home_screen.dart                  |  10 +-
 lib/utils/{Failure.dart => failure.dart}      |   0
 lib/utils/type_defs.dart                      |   2 +-
 lib/widgets/textfield_area.dart               | 104 ++++++++----------
 pubspec.lock                                  |  20 +++-
 pubspec.yaml                                  |   2 +
 24 files changed, 210 insertions(+), 318 deletions(-)
 delete mode 100644 android/app/src/main/kotlin/com/soms/answerit/MainActivity.kt
 create mode 100644 android/app/src/main/kotlin/tech/p7u/delta/MainActivity.kt
 delete mode 100644 lib/features/imageGeneration/screens/Image_screen.dart
 rename lib/utils/{Failure.dart => failure.dart} (100%)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index d4142bd..6d700cf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -34,11 +34,11 @@ jobs:
         uses: thedoctor0/zip-release@master
         with:
           type: 'zip'
-          filename: Delta-latest-windows.zip
+          filename: Delta-2.2.${{ github.run_number }}-windows.zip
           directory: build/windows/x64/runner/Release
       - name: Push to Releases
         uses: ncipollo/release-action@v1
         with:
-          artifacts: "build/app/outputs/flutter-apk/*,build/windows/x64/runner/Release/Delta-latest-windows.zip"
+          artifacts: "build/app/outputs/flutter-apk/*,build/windows/x64/runner/Release/Delta-2.2.${{ github.run_number }}-windows.zip"
           tag: v2.2.${{ github.run_number }}
           token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.idx/dev.nix b/.idx/dev.nix
index 7051cf9..f43101f 100644
--- a/.idx/dev.nix
+++ b/.idx/dev.nix
@@ -10,20 +10,6 @@
   ];
   idx.previews = {
     previews = {
-      web = {
-        command = [
-          "flutter"
-          "run"
-          "--machine"
-          "-d"
-          "web-server"
-          "--web-hostname"
-          "0.0.0.0"
-          "--web-port"
-          "$PORT"
-        ];
-        manager = "flutter";
-      };
       android = {
         command = [
           "flutter"
diff --git a/.metadata b/.metadata
index 3fdf532..93668c2 100644
--- a/.metadata
+++ b/.metadata
@@ -1,11 +1,11 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.
 
 version:
-  revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-  channel: stable
+  revision: "87b652410dbf20003c437ab6512118622d95770f"
+  channel: "beta"
 
 project_type: app
 
@@ -13,26 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      create_revision: 87b652410dbf20003c437ab6512118622d95770f
+      base_revision: 87b652410dbf20003c437ab6512118622d95770f
     - platform: android
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: ios
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: linux
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: macos
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: web
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: windows
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      create_revision: 87b652410dbf20003c437ab6512118622d95770f
+      base_revision: 87b652410dbf20003c437ab6512118622d95770f
 
   # User provided section
 
diff --git a/android/app/build.gradle b/android/app/build.gradle
index fef0d10..35c76c9 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -1,78 +1,58 @@
+plugins {
+    id "com.android.application"
+    id "kotlin-android"
+    // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
 def localProperties = new Properties()
-def localPropertiesFile = rootProject.file('local.properties')
+def localPropertiesFile = rootProject.file("local.properties")
 if (localPropertiesFile.exists()) {
-    localPropertiesFile.withReader('UTF-8') { reader ->
+    localPropertiesFile.withReader("UTF-8") { reader ->
         localProperties.load(reader)
     }
 }
 
-def flutterRoot = localProperties.getProperty('flutter.sdk')
-if (flutterRoot == null) {
-    throw new GradleException("Flutter SDK not found. Define location with flutter.sdk in the local.properties file.")
-}
-
-def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+def flutterVersionCode = localProperties.getProperty("flutter.versionCode")
 if (flutterVersionCode == null) {
-    flutterVersionCode = '1'
+    flutterVersionCode = "1"
 }
 
-def flutterVersionName = localProperties.getProperty('flutter.versionName')
+def flutterVersionName = localProperties.getProperty("flutter.versionName")
 if (flutterVersionName == null) {
-    flutterVersionName = '1.0'
+    flutterVersionName = "1.0"
 }
 
-apply plugin: 'com.android.application'
-apply plugin: 'kotlin-android'
-apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
-
-
-
 android {
-    compileSdkVersion 33
-    ndkVersion flutter.ndkVersion
-    buildToolsVersion "23.0.1"
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
+    namespace = "tech.p7u.delta"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = flutter.ndkVersion
 
-    sourceSets {
-        main.java.srcDirs += 'src/main/kotlin'
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
     }
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId "com.pv.delta"
+        applicationId "tech.p7u.delta"
         // You can update the following values to match your application needs.
-        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
-        minSdkVersion 21
-        targetSdkVersion flutter.targetSdkVersion
-        versionCode flutterVersionCode.toInteger()
-        versionName flutterVersionName
-        
+        // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-gradle-build-configuration.
+        minSdk = flutter.minSdkVersion
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutterVersionCode.toInteger()
+        versionName = flutterVersionName
     }
 
-
-
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig = signingConfigs.debug
         }
     }
 }
 
 flutter {
-    source '../..'
-}
-
-dependencies {
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'com.google.android.material:material:1.7.0'
-    
+    source = "../.."
 }
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index ab38c5b..32742a2 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,10 +1,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.pv.delta">
+    package="tech.p7u.delta">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <queries> 
     <intent>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index cd43fdc..366224b 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.pv.delta">
+    package="tech.p7u.delta">
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET"/>
diff --git a/android/app/src/main/kotlin/com/soms/answerit/MainActivity.kt b/android/app/src/main/kotlin/com/soms/answerit/MainActivity.kt
deleted file mode 100644
index 5204eb0..0000000
--- a/android/app/src/main/kotlin/com/soms/answerit/MainActivity.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package com.pv.delta
-
-import io.flutter.embedding.android.FlutterActivity
-
-class MainActivity: FlutterActivity() {
-}
diff --git a/android/app/src/main/kotlin/tech/p7u/delta/MainActivity.kt b/android/app/src/main/kotlin/tech/p7u/delta/MainActivity.kt
new file mode 100644
index 0000000..984c2c9
--- /dev/null
+++ b/android/app/src/main/kotlin/tech/p7u/delta/MainActivity.kt
@@ -0,0 +1,5 @@
+package tech.p7u.delta
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity()
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 338b790..2003eda 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.pv.delta">
+    package="tech.p7u.delta">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/build.gradle b/android/build.gradle
index 4612bc0..d2ffbff 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,17 +1,3 @@
-buildscript {
-    ext.kotlin_version = '1.8.22'
-    
-    repositories {
-        google()
-        mavenCentral()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-    }
-}
-
 allprojects {
     repositories {
         google()
@@ -19,12 +5,12 @@ allprojects {
     }
 }
 
-rootProject.buildDir = '../build'
+rootProject.buildDir = "../build"
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
-    project.evaluationDependsOn(':app')
+    project.evaluationDependsOn(":app")
 }
 
 tasks.register("clean", Delete) {
diff --git a/android/gradle.properties b/android/gradle.properties
index 94adc3a..3b5b324 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,3 +1,3 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx4G -XX:+HeapDumpOnOutOfMemoryError
 android.useAndroidX=true
 android.enableJetifier=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 3c472b9..e1ca574 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
index 44e62bc..536165d 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1,11 +1,25 @@
-include ':app'
+pluginManagement {
+    def flutterSdkPath = {
+        def properties = new Properties()
+        file("local.properties").withInputStream { properties.load(it) }
+        def flutterSdkPath = properties.getProperty("flutter.sdk")
+        assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
+        return flutterSdkPath
+    }()
 
-def localPropertiesFile = new File(rootProject.projectDir, "local.properties")
-def properties = new Properties()
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
 
-assert localPropertiesFile.exists()
-localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) }
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
 
-def flutterSdkPath = properties.getProperty("flutter.sdk")
-assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
-apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle"
+plugins {
+    id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+}
+
+include ":app"
diff --git a/lib/basics/credits_screen.dart b/lib/basics/credits_screen.dart
index 0fe5b63..5c4d39f 100644
--- a/lib/basics/credits_screen.dart
+++ b/lib/basics/credits_screen.dart
@@ -139,7 +139,7 @@ class CreditsScreen extends StatelessWidget {
           OutlinedButton(
             onPressed: () {
               Share.share(
-                'check out all new app solves all questions answer with the help of AI. https://github.com/codebyps/delta/releases',
+                'check out all new app solves all questions answer with the help of AI. https://github.com/priyanshuverma-dev/delta/releases',
                 subject: 'Delta App',
               );
             },
diff --git a/lib/features/Chat/server/services.dart b/lib/features/Chat/server/services.dart
index 0fe13e7..5ec729a 100644
--- a/lib/features/Chat/server/services.dart
+++ b/lib/features/Chat/server/services.dart
@@ -1,6 +1,6 @@
 // ignore_for_file: avoid_print
 
-import 'package:delta/utils/Failure.dart';
+import 'package:delta/utils/failure.dart';
 import 'package:delta/utils/type_defs.dart';
 import 'package:flutter_gemini/flutter_gemini.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -16,21 +16,24 @@ class GPTServices {
   const GPTServices({required Gemini gemini}) : _gemini = gemini;
 
   FutureEither<String?> fetchChatAns({
-    required prompt,
+    required String prompt,
   }) async {
-
     try {
-      final response = await _gemini.text(prompt);
-      return right(response?.output);
+     _gemini
+          .streamGenerateContent(prompt)
+          .listen((value) {})
+          .onError((e) {});
+      // return right(response.first.toString());
+      return right("");
     } on GeminiException catch (err) {
       print('catch error ->${err.message}');
       return left(
         Failure(
           err.message.toString(),
-          err.hashCode,
+          err.statusCode ?? 00,
         ),
       );
-    }  catch (e) {
+    } catch (e) {
       print('catch error ->$e');
       return left(
         Failure(
diff --git a/lib/features/Chat/view/chat_screen.dart b/lib/features/Chat/view/chat_screen.dart
index 402d7ce..738207a 100644
--- a/lib/features/Chat/view/chat_screen.dart
+++ b/lib/features/Chat/view/chat_screen.dart
@@ -5,8 +5,6 @@ import 'package:flutter_markdown/flutter_markdown.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:delta/widgets/textfield_area.dart';
 
-import '../controller/controller.dart';
-import '../widgets/answer_box.dart';
 import '../widgets/loading_skeletion.dart';
 
 class ChatScreen extends ConsumerStatefulWidget {
@@ -21,6 +19,7 @@ class ChatScreen extends ConsumerStatefulWidget {
 }
 
 class _ChatScreenState extends ConsumerState<ChatScreen> {
+  final gemini = Gemini.instance;
   final TextEditingController inputController = TextEditingController();
 
   // user input capture and sent to server...
@@ -31,17 +30,16 @@ class _ChatScreenState extends ConsumerState<ChatScreen> {
       return showSnackBar(context, 'Please fill in the blanks 👀');
     }
 
-    ref
-        .read(gptControllerStateProvider.notifier)
-        .getAns(prompt: input, context: context);
-
+    gemini.streamGenerateContent(input).listen((data) {}, onError: (er) {
+      showSnackBar(context, "Something went wrong! Check your API KEY.");
+      print(er);
+      gemini.typeProvider?.loading = false;
+    }, cancelOnError: true);
     inputController.clear();
   }
 
   @override
   Widget build(BuildContext context) {
-    final isloading = ref.watch(gptControllerStateProvider);
-
     return GestureDetector(
       onTap: hideKeyboard,
       child: SingleChildScrollView(
@@ -49,7 +47,25 @@ class _ChatScreenState extends ConsumerState<ChatScreen> {
         keyboardDismissBehavior: ScrollViewKeyboardDismissBehavior.onDrag,
         child: Column(
           children: [
-            getSearchBarUI(
+            SizedBox(
+              height: MediaQuery.of(context).size.height - 150,
+              child: GeminiResponseTypeView(
+                builder: (context, child, response, loading) {
+                  if (loading && response == null) {
+                    return const LoadingSkeletion();
+                  }
+
+                  if (response == null) {
+                    return const Center(child: Text('Search something!'));
+                  }
+                  return Markdown(
+                    data: response,
+                    selectable: true,
+                  );
+                },
+              ),
+            ),
+            SearchBarUI(
               hintText: 'Ask anything...',
               isloading: false,
               textEditingController: inputController,
@@ -58,52 +74,6 @@ class _ChatScreenState extends ConsumerState<ChatScreen> {
                 clickAsk(inputController.text);
               },
             ),
-            // GeminiResponseTypeView(
-            //   builder: (context, child, response, loading) {
-            //     if (loading) {
-            //       /// show loading animation or use CircularProgressIndicator();
-            //       return const CircularProgressIndicator();
-            //     }
-
-            //     /// The runtimeType of response is String?
-            //     if (response != null) {
-            //       return Markdown(
-            //         data: response,
-            //         selectable: true,
-            //       );
-            //     } else {
-            //       /// idle state
-            //       return const Center(child: Text('Search something!'));
-            //     }
-            //   },
-            // ),
-            Visibility(
-              visible: !isloading,
-              replacement: const LoadingSkeletion(),
-              child: Visibility(
-                replacement:
-                    const Text('Hi, Start asking questions from GPT-4.'),
-                child: AnswerBox(
-                  text: ref
-                      .watch(gptControllerStateProvider.notifier)
-                      .oneWay
-                      .response,
-                  prompt: ref
-                      .watch(gptControllerStateProvider.notifier)
-                      .oneWay
-                      .prompt,
-                ),
-              ),
-            ),
-            // Visibility(
-            //   visible: ref
-            //       .watch(gptControllerStateProvider.notifier)
-            //       .recentres
-            //       .isNotEmpty,
-            //   child: RecentBox(
-            //     text: ref.watch(gptControllerStateProvider.notifier).recentres,
-            //   ),
-            // )
           ],
         ),
       ),
diff --git a/lib/features/Chat/widgets/loading_skeletion.dart b/lib/features/Chat/widgets/loading_skeletion.dart
index 841e34b..89c5515 100644
--- a/lib/features/Chat/widgets/loading_skeletion.dart
+++ b/lib/features/Chat/widgets/loading_skeletion.dart
@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:skeleton_loader/skeleton_loader.dart';
 
-import '../../../utils/colors.dart';
-
 class LoadingSkeletion extends StatelessWidget {
   const LoadingSkeletion({super.key});
 
@@ -13,8 +11,6 @@ class LoadingSkeletion extends StatelessWidget {
     return Padding(
       padding: const EdgeInsets.all(8.0),
       child: SkeletonLoader(
-        baseColor: Colors.grey,
-        highlightColor: Colours.darkScaffoldColor,
         builder: Card(
           color: Colors.transparent,
           child: Container(
@@ -27,43 +23,64 @@ class LoadingSkeletion extends StatelessWidget {
                 Container(
                   width: 70,
                   height: 20,
-                  color: Colors.grey,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                    color: Theme.of(context).highlightColor,
+                  ),
                 ),
                 const SizedBox(height: 10),
                 Container(
                   width: size.width - 20,
                   height: 20,
-                  color: Colors.black,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                    color: Theme.of(context).highlightColor,
+                  ),
                 ),
                 const SizedBox(height: 10),
                 Container(
                   width: size.width - 20,
                   height: 20,
-                  color: Colors.black,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                  color: Theme.of(context).highlightColor,
+                  ),
                 ),
                 const SizedBox(height: 10),
                 Container(
                   width: size.width - 50,
                   height: 20,
-                  color: Colors.black,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                    color: Theme.of(context).highlightColor,
+                  ),
                 ),
                 const SizedBox(height: 10),
                 Container(
                   width: size.width - 100,
                   height: 20,
-                  color: Colors.black,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                   color: Theme.of(context).highlightColor,
+                  ),
                 ),
                 const SizedBox(height: 10),
                 Container(
                   width: 150,
                   height: 20,
-                  color: Colors.black,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                    color: Theme.of(context).highlightColor,
+                  ),
                 ),
                 const SizedBox(height: 10),
                 Container(
                   width: size.width - 20,
                   height: 20,
-                  color: Colors.black,
+                  decoration: BoxDecoration(
+                    borderRadius: BorderRadius.circular(10),
+                    color: Theme.of(context).highlightColor,
+                  ),
                 ),
               ],
             ),
diff --git a/lib/features/imageGeneration/screens/Image_screen.dart b/lib/features/imageGeneration/screens/Image_screen.dart
deleted file mode 100644
index 541e6b4..0000000
--- a/lib/features/imageGeneration/screens/Image_screen.dart
+++ /dev/null
@@ -1,61 +0,0 @@
-import 'package:delta/utils/colors.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-
-class ImageGenScreen extends StatelessWidget {
-  const ImageGenScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colours.darkScaffoldColor,
-      body: AnnotatedRegion<SystemUiOverlayStyle>(
-        value: SystemUiOverlayStyle.light.copyWith(
-          statusBarColor: Theme.of(context).secondaryHeaderColor,
-          systemNavigationBarColor: Colours.textColor,
-        ),
-        child: SafeArea(
-          child: GestureDetector(
-            onTap: () {
-              FocusScope.of(context).unfocus();
-            },
-            child: Container(
-              constraints: const BoxConstraints.expand(),
-              decoration: BoxDecoration(
-                gradient: LinearGradient(
-                  begin: Alignment.bottomCenter,
-                  end: Alignment.topLeft,
-                  colors: [
-                    Colours.secondaryColor.withOpacity(0.5),
-                    const Color.fromRGBO(115, 75, 109, 1),
-                    Colors.white10,
-                    const Color.fromRGBO(66, 39, 90, 1),
-                    Colours.primaryColor.withOpacity(0.5),
-                  ],
-                ),
-              ),
-              child: RefreshIndicator(
-                semanticsLabel: 'Refresh',
-                color: Colours.textColor,
-                strokeWidth: RefreshProgressIndicator.defaultStrokeWidth + 1,
-                triggerMode: RefreshIndicatorTriggerMode.anywhere,
-                backgroundColor: Colours.darkScaffoldColor,
-                onRefresh: () {
-                  return Future.delayed(
-                    const Duration(seconds: 1),
-                    () {},
-                  );
-                },
-                child: const Column(
-                  children: [
-                    SizedBox(height: 25),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        ),
-      ),
-    );
-  }
-}
diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart
index 2a660ba..2c50930 100644
--- a/lib/screens/home_screen.dart
+++ b/lib/screens/home_screen.dart
@@ -3,6 +3,8 @@ import 'package:delta/basics/feedback_screen.dart';
 import 'package:delta/features/Chat/view/chat_screen.dart';
 import 'package:delta/utils/global_vars.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_gemini/flutter_gemini.dart';
+import 'package:restart_app/restart_app.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 import '../utils/utils.dart';
@@ -17,10 +19,9 @@ class HomeScreen extends StatefulWidget {
   State<HomeScreen> createState() => _HomeScreenState();
 }
 
-
-
 class _HomeScreenState extends State<HomeScreen> {
-  final TextEditingController _controller = TextEditingController();
+  final TextEditingController _controller =
+      TextEditingController(text: "AIzaSyDrIXbj860ioWz_F8d5vww2tWJPFdpOjiU");
 
   @override
   Widget build(BuildContext context) {
@@ -63,6 +64,7 @@ class _HomeScreenState extends State<HomeScreen> {
                           TextButton(
                             onPressed: () {
                               Navigator.pop(context);
+                              _controller.clear();
                             },
                             child: const Text('Cancel'),
                           ),
@@ -71,8 +73,10 @@ class _HomeScreenState extends State<HomeScreen> {
                               final prefs =
                                   await SharedPreferences.getInstance();
                               await prefs.setString('API', _controller.text);
+                              Gemini.init(apiKey: prefs.getString('API') ?? "");
                               Future.delayed(const Duration(milliseconds: 1),
                                   () {
+                                Restart.restartApp();
                                 Navigator.pop(context);
                               });
                             },
diff --git a/lib/utils/Failure.dart b/lib/utils/failure.dart
similarity index 100%
rename from lib/utils/Failure.dart
rename to lib/utils/failure.dart
diff --git a/lib/utils/type_defs.dart b/lib/utils/type_defs.dart
index 932ed70..a209465 100644
--- a/lib/utils/type_defs.dart
+++ b/lib/utils/type_defs.dart
@@ -1,4 +1,4 @@
-import 'package:delta/utils/Failure.dart';
+import 'package:delta/utils/failure.dart';
 import 'package:fpdart/fpdart.dart';
 
 typedef FutureEither<T> = Future<Either<Failure, T>>;
diff --git a/lib/widgets/textfield_area.dart b/lib/widgets/textfield_area.dart
index fe8c4be..1c86cd5 100644
--- a/lib/widgets/textfield_area.dart
+++ b/lib/widgets/textfield_area.dart
@@ -1,65 +1,57 @@
-import 'package:delta/utils/colors.dart';
-import 'package:delta/widgets/inputfield.dart';
 import 'package:flutter/material.dart';
 
-Widget getSearchBarUI({
-  required String hintText,
-  required TextEditingController textEditingController,
-  required VoidCallback onPressed,
-  required bool isloading,
-}) {
-  return Padding(
-    padding: const EdgeInsets.all(8.0),
-    child: Container(
-      padding: const EdgeInsets.only(
-        left: 1,
-        // right: 16,
-      ),
-      decoration: BoxDecoration(
-        color: Colours.darkScaffoldColor,
-        boxShadow: const [
-          BoxShadow(
-            color: Color.fromRGBO(0, 0, 0, 0.05),
-            offset: Offset(0, 0),
-            blurRadius: 0,
-            spreadRadius: 1,
-          ),
-          BoxShadow(
-            color: Color.fromRGBO(0, 0, 0, 0.09),
-            offset: Offset(0, 2),
-            blurRadius: 4,
-            spreadRadius: 1,
+class SearchBarUI extends StatelessWidget {
+  final String hintText;
+  final TextEditingController textEditingController;
+  final VoidCallback onPressed;
+  final bool isloading;
+
+  const SearchBarUI({
+    Key? key,
+    required this.hintText,
+    required this.textEditingController,
+    required this.onPressed,
+    required this.isloading,
+  }) : super(key: key);
+
+  @override
+  Widget build(BuildContext context) {
+    return Padding(
+      padding: const EdgeInsets.all(8.0),
+      child: Container(
+        decoration: BoxDecoration(
+          borderRadius: BorderRadius.circular(5.0),
+          border: Border.all(
+            width: 1,
+            color: Theme.of(context).dividerColor,
           ),
-        ],
-      ),
-      child: Row(
-        children: [
-          Expanded(
-            child: Padding(
-              padding: const EdgeInsets.only(
-                right: 10,
-                left: 10,
-                top: 12,
-                bottom: 12,
-              ),
-              child: TextFieldInput(
-                hintText: hintText,
-                textEditingController: textEditingController,
-                textInputType: TextInputType.text,
+        ),
+        child: Row(
+          children: [
+            Expanded(
+              child: Padding(
+                padding: const EdgeInsets.only(left: 8.0),
+                child: TextField(
+                  controller: textEditingController,
+                  decoration: InputDecoration(
+                    hintText: hintText,
+                    border: InputBorder.none,
+                  ),
+                ),
               ),
             ),
-          ),
 
-          // Button
-          IconButton(
-            style: ElevatedButton.styleFrom(
-              elevation: 2,
+            // Button
+            IconButton(
+              style: ElevatedButton.styleFrom(
+                elevation: 2,
+              ),
+              icon: const Icon(Icons.send),
+              onPressed: isloading ? null : onPressed,
             ),
-            icon: const Icon(Icons.send),
-            onPressed: isloading ? null : onPressed,
-          ),
-        ],
+          ],
+        ),
       ),
-    ),
-  );
+    );
+  }
 }
diff --git a/pubspec.lock b/pubspec.lock
index 8dc0d58..b69fd06 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -113,6 +113,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "8.4.3"
+  change_app_package_name:
+    dependency: "direct dev"
+    description:
+      name: change_app_package_name
+      sha256: f9ebaf68a4b5a68c581492579bb68273c523ef325fbf9ce2f1b57fb136ad023b
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.1.0"
   characters:
     dependency: transitive
     description:
@@ -647,10 +655,10 @@ packages:
     dependency: transitive
     description:
       name: plugin_platform_interface
-      sha256: dbf0f707c78beedc9200146ad3cb0ab4d5da13c246336987be6940f026500d3a
+      sha256: "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02"
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.3"
+    version: "2.1.8"
   pointycastle:
     dependency: transitive
     description:
@@ -699,6 +707,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.1.1"
+  restart_app:
+    dependency: "direct main"
+    description:
+      name: restart_app
+      sha256: b37daeb1c02fcab30e19d9e30b6fdd215bd53577efd927042eb77cf6f09daadb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.2.1"
   riverpod:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 60a06b8..9949e5a 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -57,9 +57,11 @@ dependencies:
   flutter_dotenv: ^5.1.0
   flutter_gemini: ^2.0.3
   flutter_markdown: ^0.7.1
+  restart_app: ^1.2.1
 
 dev_dependencies:
   build_runner: ^2.3.3
+  change_app_package_name: ^1.1.0
   flutter_app_name: ^0.1.0
   flutter_launcher_icons: ^0.11.0
   flutter_lints: ^2.0.1