Merge pull request #12 from thekaailashsharma/dev

Release v1.0.0

.github/workflows/android.yml

@@ -23,12 +23,14 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Create local.properties
-      run: touch local.properties
-    - name: Set API Keys
       run: |
-        echo "API_KEY=${{ secrets.API_KEY }}" >> local.properties
-        echo "Here_API_KEY=${{ secrets.HERE_API_KEY }}" >> local.properties
-        echo "Places_API_KEY=${{ secrets.PLACES_API_KEY }}" >> local.properties
+        echo "API_KEY=\"ABCDEF\" " > local.properties
+        echo "Here_API_KEY=\"ABCDEF\" " >> local.properties
+        echo "Places_API_KEY=\"ABCDEF\" " >> local.properties
+
+      # Optionally, you might want to display the content of local.properties for debugging
+    - name: Display local.properties
+      run: cat local.properties
 
     - name: Build with Gradle
       run: ./gradlew build

.gitignore

@@ -13,3 +13,4 @@
 .externalNativeBuild
 .cxx
 local.properties
+/app/release

README.md

@@ -0,0 +1,3 @@
+# AI-Travel-Manager
+
+## Developement Branch

app/build.gradle.kts

@@ -1,6 +1,13 @@
+import java.io.FileInputStream
+import java.util.Properties
+
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
+    id("dagger.hilt.android.plugin")
+    kotlin("kapt")
+    id("kotlinx-serialization")
+    id("com.google.gms.google-services")
 }
 
 android {
@@ -21,7 +28,19 @@ android {
     }
 
     buildTypes {
+        debug {
+            val localProperties = Properties()
+            localProperties.load(FileInputStream(rootProject.file("local.properties")))
+            buildConfigField("String", "API_KEY", "${localProperties["API_KEY"]}")
+            buildConfigField("String", "Here_API_KEY", "${localProperties["Here_API_KEY"]}")
+            buildConfigField("String", "Places_API_KEY", "${localProperties["Places_API_KEY"]}")
+        }
         release {
+            val localProperties = Properties()
+            localProperties.load(FileInputStream(rootProject.file("local.properties")))
+            buildConfigField("String", "API_KEY", "${localProperties["API_KEY"]}")
+            buildConfigField("String", "Here_API_KEY", "${localProperties["Here_API_KEY"]}")
+            buildConfigField("String", "Places_API_KEY", "${localProperties["Places_API_KEY"]}")
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
@@ -30,14 +49,15 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
     kotlinOptions {
-        jvmTarget = "1.8"
+        jvmTarget = "17"
     }
     buildFeatures {
         compose = true
+        buildConfig = true
     }
     composeOptions {
         kotlinCompilerExtensionVersion = "1.4.3"
@@ -51,26 +71,91 @@ android {
 
 dependencies {
 
-    implementation("androidx.core:core-ktx:1.9.0")
+    implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
     implementation("androidx.activity:activity-compose:1.8.1")
     implementation(platform("androidx.compose:compose-bom:2023.03.00"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
     implementation("androidx.compose.ui:ui-tooling-preview")
-    implementation("androidx.compose.material3:material3")
+    implementation("androidx.compose.material3:material3:1.1.1")
+    implementation("androidx.compose.ui:ui-util")
 
     // Material Design Icons
     implementation("androidx.compose.material:material-icons-extended:1.5.4")
 
     // Navigation
     implementation("androidx.navigation:navigation-compose:2.7.5")
 
+    //Lottie-compose
+    implementation("com.airbnb.android:lottie-compose:5.2.0")
+
+    //Ktor-Client
+    implementation("io.ktor:ktor-client-core:2.3.5")
+    implementation("io.ktor:ktor-client-cio:2.3.2")
+    implementation("io.ktor:ktor-client-serialization:2.3.2")
+    implementation("io.ktor:ktor-client-cio-jvm:2.3.2")
+    implementation("io.ktor:ktor-client-content-negotiation:2.3.2")
+    implementation("io.ktor:ktor-serialization-gson:2.3.2")
+    implementation("io.ktor:ktor-serialization-kotlinx-json:2.3.2")
+    implementation("com.google.code.gson:gson:2.8.9")
+    implementation("io.ktor:ktor-client-logging:2.3.2")
+    implementation("ch.qos.logback:logback-classic:1.2.11")
+    implementation("io.ktor:ktor-client-android:1.6.4")
+    implementation("io.ktor:ktor-client-serialization:2.3.2")
+    implementation("io.ktor:ktor-client-logging-jvm:2.3.2")
+    implementation("androidx.datastore:datastore-preferences:1.0.0")
+//    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1")
+    implementation("io.ktor:ktor-client-gson:2.3.2")
+
+    //Dagger Hilt
+    implementation("com.google.dagger:hilt-android:2.48")
+    implementation(platform("androidx.compose:compose-bom:2023.03.00"))
+    androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
+    kapt("com.google.dagger:hilt-compiler:2.48")
+    implementation("androidx.hilt:hilt-navigation-compose:1.1.0")
+
+    // Room
+    implementation("androidx.room:room-runtime:2.6.1")
+    kapt("androidx.room:room-compiler:2.6.1")
+    implementation("androidx.room:room-ktx:2.6.1")
+
+    // Coil
+    implementation("io.coil-kt:coil-compose:2.2.2")
+
+
+
     testImplementation("junit:junit:4.13.2")
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
     androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00"))
     androidTestImplementation("androidx.compose.ui:ui-test-junit4")
     debugImplementation("androidx.compose.ui:ui-tooling")
     debugImplementation("androidx.compose.ui:ui-test-manifest")
+
+
+    // Rive
+    implementation("app.rive:rive-android:5.0.1")
+    implementation("androidx.startup:startup-runtime:1.1.1")
+
+    // Material Icons Extended
+    implementation("androidx.compose.material:material-icons-extended:1.5.0")
+
+    // Firebase
+    implementation(platform("com.google.firebase:firebase-bom:32.6.0"))
+    implementation("com.google.firebase:firebase-storage:20.3.0")
+    implementation("com.google.firebase:firebase-auth-ktx:22.3.0")
+    implementation("com.google.firebase:firebase-firestore-ktx:24.9.1")
+    implementation("com.github.raipankaj:JetFirestore:1.0.2")
+
+    // DataStore
+    implementation("androidx.datastore:datastore-core:1.0.0")
+
+    // Maps
+    implementation(project(":maps"))
+
+
+    // SystemUIController
+    val accompanistVersion = "0.30.1"
+    implementation("com.google.accompanist:accompanist-systemuicontroller:$accompanistVersion")
 }

app/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "330384035731",
+    "project_id": "ai-travel-manager",
+    "storage_bucket": "ai-travel-manager.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:330384035731:android:04df0ef705393d79cca266",
+        "android_client_info": {
+          "package_name": "ai.travel.app"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyC373PaKAT77X1pIbNSRBaMEVDD5BX5OQo"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

app/src/main/AndroidManifest.xml

@@ -2,27 +2,46 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="com.google.android.gms.auth.api.phone.permission.READ_SMS" />
+
     <application
+        android:name=".MyApp"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@drawable/app_icon"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@drawable/app_icon"
         android:supportsRtl="true"
         android:theme="@style/Theme.AITravelManager"
+        android:windowSoftInputMode="adjustResize"
         tools:targetApi="31">
         <activity
-            android:name=".MainActivity"
+            android:name=".BaseActivity"
             android:exported="true"
-            android:label="@string/app_name"
             android:theme="@style/Theme.AITravelManager">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
+            android:theme="@style/Theme.AITravelManager">
+        </activity>
+
+        <provider
+            android:name="androidx.startup.InitializationProvider"
+            android:authorities="${applicationId}.androidx-startup"
+            android:exported="false"
+            tools:node="merge">
+            <meta-data
+                android:name="app.rive.runtime.kotlin.RiveInitializer"
+                android:value="androidx.startup" />
+        </provider>
     </application>
 
 </manifest>