*Project Upgrades.

Author: HarshAndroid

Diff for: .metadata

@@ -4,7 +4,11 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
+<<<<<<< HEAD
   revision: "dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668"
+=======
+  revision: "68bfaea224880b488c617afe30ab12091ea8fa4e"
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
   channel: "stable"
 
 project_type: app
@@ -13,6 +17,7 @@ project_type: app
 migration:
   platforms:
     - platform: root
+<<<<<<< HEAD
       create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
       base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
     - platform: android
@@ -27,6 +32,19 @@ migration:
     - platform: web
       create_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
       base_revision: dec2ee5c1f98f8e84a7d5380c05eb8a3d0a81668
+=======
+      create_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
+      base_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
+    - platform: android
+      create_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
+      base_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
+    - platform: ios
+      create_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
+      base_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
+    - platform: web
+      create_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
+      base_revision: 68bfaea224880b488c617afe30ab12091ea8fa4e
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
 
   # User provided section
 

Diff for: README.md

@@ -1,3 +1,98 @@
+<<<<<<< HEAD
 # we_chat
 
 A new Flutter project.
+=======
+# Apna Chat (We Chat)
+
+![Status](https://img.shields.io/badge/Status-Active-brightgreen)
+![Dart](https://img.shields.io/badge/dart-100%25-brightgreen)
+![Flutter](https://img.shields.io/badge/Flutter-Cross%20Platform-blue)
+
+**Simple, Decent & Feature-Rich Chatting Application.**
+
+---
+
+## 📦 APKs:
+
+- **Arm APK:**  
+  [Download Arm APK](https://drive.google.com/file/d/1knjEKijU0mtc7bfM68DDmYeSYE7CEoE9/view) (~20 MB)  
+  *(Supports ARM v7 and v8 devices)*
+
+- **Global APK:**  
+  [Download Global APK](https://drive.google.com/file/d/1knjEKijU0mtc7bfM68DDmYeSYE7CEoE9/view) (~50 MB)  
+  *(Supports all devices)*
+
+---
+
+## 📸 Screenshots:
+
+**Actual app looks even better! 😃**
+
+<kbd>
+  <img src="https://github.com/HarshAndroid/we_chat/blob/master/screenshots/1.png" width=30% height=30%/>
+  <img src="https://github.com/HarshAndroid/we_chat/blob/master/screenshots/2.png" width=30% height=30%/>
+  <img src="https://github.com/HarshAndroid/we_chat/blob/master/screenshots/3.png" width=30% height=30%/>
+  <img src="https://github.com/HarshAndroid/we_chat/blob/master/screenshots/4.png" width=30% height=30%/>
+  <img src="https://github.com/HarshAndroid/we_chat/blob/master/screenshots/5.png" width=30% height=30%/>
+  <img src="https://github.com/HarshAndroid/we_chat/blob/master/screenshots/6.png" width=30% height=30%/>
+  <img src="https://github.com/HarshAndroid/we_chat/blob/master/screenshots/7.png" width=30% height=30%/>
+  <img src="https://github.com/HarshAndroid/we_chat/blob/master/screenshots/8.png" width=30% height=30%/>
+</kbd>
+
+---
+
+## ✨ Features:
+
+- Display only known users or contacts.
+- Real-time messaging (with Firebase).
+- Google Sign-In (no account or mobile number needed).
+- Add users by email ID.
+- Simple user profiles (with photo, about, last-seen, created-at).
+- Message read status.
+- Message delete & edit features.
+- Message notifications (push notifications).
+- AI Chat Bot integration (**Google Gemini**).
+- Sleek UI with new Material Widgets.
+- **And much more...**
+
+---
+
+## 🧠 AI Chatbot (Google Gemini) Setup:
+
+To use the **Gemini AI Chatbot** feature, you need to provide your own API key.  
+Create an API key by visiting [Google AI Studio](https://aistudio.google.com/app/apikey).
+
+---
+
+## 🎥 YouTube Course:
+
+Check out the **YouTube Course** here:  
+[Watch the YouTube Playlist](https://youtube.com/playlist?list=PL8kbUJtS6hyal7Uw7wTeYmv7yiNPH5kOq)
+
+**Note:** This project contains more features and optimizations than the one demonstrated in the YouTube course.
+
+---
+
+## 💬 Feedback and Suggestions:
+
+I’d love to hear your feedback or suggestions! Feel free to reach out via email:  
+📧 [[email protected]](mailto:[email protected])
+
+---
+
+## 🏷️ Keywords
+
+- **Flutter Chat App**
+- **Dart Chat Application**
+- **Firebase Real-Time Messaging**
+- **Google Sign-In Chat App**
+- **AI Chatbot in Flutter**
+- **Cross-Platform Chat App**
+- **Flutter Firebase Integration**
+- **Flutter Messaging App**
+- **Material Design in Flutter**
+- **Google Gemini AI Chat**
+
+---
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee

Diff for: android/.gitignore

@@ -7,7 +7,11 @@ gradle-wrapper.jar
 GeneratedPluginRegistrant.java
 
 # Remember to never publicly share your keystore.
+<<<<<<< HEAD
 # See https://flutter.dev/to/reference-keystore
+=======
+# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
 key.properties
 **/*.keystore
 **/*.jks

Diff for: android/app/build.gradle

@@ -4,6 +4,7 @@ plugins {
     id 'com.google.gms.google-services'
     // END: FlutterFire Configuration
     id "kotlin-android"
+<<<<<<< HEAD
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id "dev.flutter.flutter-gradle-plugin"
 }
@@ -28,15 +29,73 @@ android {
         targetSdk = flutter.targetSdkVersion
         versionCode = flutter.versionCode
         versionName = flutter.versionName
+=======
+    id "dev.flutter.flutter-gradle-plugin"
+}
+
+def localProperties = new Properties()
+def localPropertiesFile = rootProject.file('local.properties')
+if (localPropertiesFile.exists()) {
+    localPropertiesFile.withReader('UTF-8') { reader ->
+        localProperties.load(reader)
+    }
+}
+
+def flutterVersionCode = localProperties.getProperty('flutter.versionCode')
+if (flutterVersionCode == null) {
+    flutterVersionCode = '1'
+}
+
+def flutterVersionName = localProperties.getProperty('flutter.versionName')
+if (flutterVersionName == null) {
+    flutterVersionName = '1.0'
+}
+
+android {
+    namespace "com.harshRajpurohit.we_chat"
+    compileSdk 34
+    ndkVersion flutter.ndkVersion
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
+
+    sourceSets {
+        main.java.srcDirs += 'src/main/kotlin'
+    }
+
+    defaultConfig {
+        applicationId "com.harshRajpurohit.we_chat"
+        minSdkVersion 23
+        targetSdkVersion flutter.targetSdkVersion
+        versionCode flutterVersionCode.toInteger()
+        versionName flutterVersionName
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
     }
 
     buildTypes {
         release {
+<<<<<<< HEAD
             signingConfig = signingConfigs.debug
+=======
+            signingConfig signingConfigs.debug
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
         }
     }
 }
 
 flutter {
+<<<<<<< HEAD
     source = "../.."
 }
+=======
+    source '../..'
+}
+
+dependencies {}
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee

Diff for: android/app/google-services.json

@@ -14,6 +14,7 @@
       },
       "oauth_client": [
         {
+<<<<<<< HEAD
           "client_id": "288842837392-gse3j6u9fferoav9leh2ik3468asfeup.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
@@ -22,6 +23,8 @@
           }
         },
         {
+=======
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
           "client_id": "288842837392-gvt1l790g0t1fmnurc5pmko3oss8b1tq.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {

Diff for: android/app/src/main/AndroidManifest.xml

@@ -1,8 +1,16 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<<<<<<< HEAD
 
     <!-- internet permission -->
     <uses-permission android:name="android.permission.INTERNET" />
 
+=======
+
+     <!-- internet permission -->
+    <uses-permission android:name="android.permission.INTERNET" />
+
+
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
     <application
         android:label="Apna Chat"
         android:name="${applicationName}"
@@ -11,27 +19,46 @@
             android:name=".MainActivity"
             android:exported="true"
             android:launchMode="singleTop"
+<<<<<<< HEAD
             android:taskAffinity=""
+=======
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
             android:theme="@style/LaunchTheme"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:hardwareAccelerated="true"
             android:windowSoftInputMode="adjustResize">
 
+<<<<<<< HEAD
+=======
+            
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
             <meta-data
               android:name="io.flutter.embedding.android.NormalTheme"
               android:resource="@style/NormalTheme"
               />
+<<<<<<< HEAD
+=======
+            
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+<<<<<<< HEAD
 
+=======
+       
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
         <meta-data
             android:name="flutterEmbedding"
             android:value="2" />
     </application>
+<<<<<<< HEAD
 
+=======
+  
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
     <queries>
         <intent>
             <action android:name="android.intent.action.PROCESS_TEXT"/>

Diff for: android/build.gradle

@@ -5,12 +5,20 @@ allprojects {
     }
 }
 
+<<<<<<< HEAD
 rootProject.buildDir = "../build"
+=======
+rootProject.buildDir = '../build'
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
 }
 subprojects {
+<<<<<<< HEAD
     project.evaluationDependsOn(":app")
+=======
+    project.evaluationDependsOn(':app')
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
 }
 
 tasks.register("clean", Delete) {

Diff for: android/gradle.properties

@@ -1,3 +1,7 @@
+<<<<<<< HEAD
 org.gradle.jvmargs=-Xmx4G -XX:MaxMetaspaceSize=2G -XX:+HeapDumpOnOutOfMemoryError
+=======
+org.gradle.jvmargs=-Xmx4G
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
 android.useAndroidX=true
 android.enableJetifier=true

Diff for: android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,8 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+<<<<<<< HEAD
 distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+=======
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee

Diff for: android/settings.gradle

@@ -5,9 +5,16 @@ pluginManagement {
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
         return flutterSdkPath
+<<<<<<< HEAD
     }()
 
     includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+=======
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
+
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
 
     repositories {
         google()
@@ -18,11 +25,19 @@ pluginManagement {
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
+<<<<<<< HEAD
     id "com.android.application" version "8.1.0" apply false
     // START: FlutterFire Configuration
     id "com.google.gms.google-services" version "4.3.15" apply false
     // END: FlutterFire Configuration
     id "org.jetbrains.kotlin.android" version "1.8.22" apply false
+=======
+    id "com.android.application" version "7.3.0" apply false
+    // START: FlutterFire Configuration
+    id "com.google.gms.google-services" version "4.3.15" apply false
+    // END: FlutterFire Configuration
+    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
+>>>>>>> 806dca544752c5c978f39977aeb4005785d5f0ee
 }
 
 include ":app"