refactor: naming conventions updated

Author: f-arslan

.github/workflows/build.yml

@@ -23,6 +23,9 @@ jobs:
       - name: Decode google-services.json
         run: echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 -d > ./app/google-services.json
 
+      - name: Decode Keystore
+        run: echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > keystore.properties
+
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

.github/workflows/detekt_lint.yml

@@ -1,8 +1,6 @@
 on:
   pull_request:
-    branches:
-      - main
-  workflow_dispatch:
+    branches: [main]
 
 jobs:
   dekekt:
@@ -21,6 +19,17 @@ jobs:
       - name: Decode google-services.json
         run: echo "${{ secrets.GOOGLE_SERVICES_JSON }}" | base64 -d > ./app/google-services.json
 
+      - name: Decode Keystore
+        run: echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > keystore.properties
+
+      - name: Create local.properties and add API Keys
+        run: |
+          echo "MAPS_API_KEY=${{ secrets.MAPS_API_KEY }}" >> local.properties
+          echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> local.properties
+          echo "PALM_API_KEY=${{ secrets.PALM_API_KEY }}" >> local.properties
+          echo "WEB_CLIENT_ID=${{ secrets.WEB_CLIENT_ID }}" >> local.properties
+          echo "UNSPLASH_BASE_URL=${{ secrets.UNSPLASH_BASE_URL }}" >> local.properties
+
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
@@ -36,13 +45,5 @@ jobs:
       - name: Set gradlew executable
         run: chmod +x ./gradlew
 
-      - name: Create local.properties and add API Keys
-        run: |
-          echo "MAPS_API_KEY=${{ secrets.MAPS_API_KEY }}" >> local.properties
-          echo "OPENAI_API_KEY=${{ secrets.OPENAI_API_KEY }}" >> local.properties
-          echo "PALM_API_KEY=${{ secrets.PALM_API_KEY }}" >> local.properties
-          echo "WEB_CLIENT_ID=${{ secrets.WEB_CLIENT_ID }}" >> local.properties
-          echo "UNSPLASH_BASE_URL=${{ secrets.UNSPLASH_BASE_URL }}" >> local.properties
-
       - name: Build and run detekt
         run: ./gradlew detekt

.github/workflows/release_with_apk.yml

@@ -35,6 +35,9 @@ jobs:
           echo "WEB_CLIENT_ID=${{ secrets.WEB_CLIENT_ID }}" >> local.properties
           echo "UNSPLASH_BASE_URL=${{ secrets.UNSPLASH_BASE_URL }}" >> local.properties
 
+      - name: Decode Keystore
+        run: echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > keystore.properties
+
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:

README.md

@@ -1,13 +1,21 @@
+---
+runme:
+  id: 01HQGK9942PRCD1VKM5D2W2VJP
+  version: v3
+---
+
 <h1 align="center">Gptmap🗺️🤖</h1>
 <p align="center">Welcome to Gptmap, a startup project crafted using Kotlin and Jetpack Compose.</p>
  <p align="center" text-align="center">This project will guide you through creating a comprehensive Android application using a modern toolkit, highlighting the integration of AI technologies and illustrating the real-world applications of these advanced technologies, providing valuable insights and best practices.</p>
 
 ![Feature](public/images/feature.png)
 
 ## Download
+
 Go to the [Releases](https://github.com/f-arslan/GptMap/releases) to download the latest APK.
 
 ## Table of Contents
+
 - [Tech Stack & Open-source Libraries](#tech-stack--open-source-libraries)
 - [Architecture Overview](#architecture-overview)
 - [App Demos](#app-demos)
@@ -18,53 +26,69 @@ Go to the [Releases](https://github.com/f-arslan/GptMap/releases) to download th
 - **[Kotlin](https://kotlinlang.org/)**: The primary language for application development, emphasizing safety, simplicity, and interoperability.
 - **[Jetpack Compose](https://developer.android.com/jetpack/compose)**: Used for modern UI development, leveraging custom composables and animations for a dynamic and responsive design.
 - **Jetpack Libraries**:
-    - **ViewModel**: Centralizes UI-related data management, making it resilient to configuration changes.
-    - **Lifecycle**: Observes component lifecycles to ensure appropriate UI actions are taken at each stage.
-    - **SavedStateHandle**: Enhances state management by preserving UI data across system-initiated process terminations.
-    - **DataStore**: A modern data storage solution that utilizes Kotlin coroutines and Flow to store data asynchronously, securely, and consistently, serving as a replacement for SharedPreferences.
+   - **ViewModel**: Centralizes UI-related data management, making it resilient to configuration changes.
+   - **Lifecycle**: Observes component lifecycles to ensure appropriate UI actions are taken at each stage.
+   - **SavedStateHandle**: Enhances state management by preserving UI data across system-initiated process terminations.
+   - **DataStore**: A modern data storage solution that utilizes Kotlin coroutines and Flow to store data asynchronously, securely, and consistently, serving as a replacement for SharedPreferences.
+
 - **[Ktor](https://ktor.io/)**: Enables server and client-side HTTP communications, seamlessly integrating with various third-party APIs for extended functionality.
 - **Database and Storage Solutions**:
-    - **MongoDB Realm**: Provides a robust local database and synchronization solutions, enabling efficient offline data access and seamless cloud integration. It also implements **JWT Authentication** for secure user authentication and data access.
-    - **Firebase Firestore and Storage**: Facilitates real-time data synchronization and scalable cloud storage, ensuring smooth data operations and media management.
+   - **MongoDB Realm**: Provides a robust local database and synchronization solutions, enabling efficient offline data access and seamless cloud integration. It also implements **JWT Authentication** for secure user authentication and data access.
+   - **Firebase Firestore and Storage**: Facilitates real-time data synchronization and scalable cloud storage, ensuring smooth data operations and media management.
+
 - **Asynchronous Programming**:
-    - **[Coroutines](https://github.com/Kotlin/kotlinx.coroutines)** and **[Flow](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.flow/)**: Manage asynchronous tasks and streamline data stream processing, guaranteeing a smooth user experience.
+   - **[Coroutines](https://github.com/Kotlin/kotlinx.coroutines)** and **[Flow](https://kotlin.github.io/kotlinx.coroutines/kotlinx-coroutines-core/kotlinx.coroutines.flow/)**: Manage asynchronous tasks and streamline data stream processing, guaranteeing a smooth user experience.
+
 - **Authentication Systems**:
-    - **Firebase Auth**: Offers support for diverse authentication mechanisms, including email & password and Gmail, ensuring secure user access and streamlined account management.
-    - **[MongoDB Realm JWT Auth](https://www.mongodb.com/docs/atlas/app-services/authentication/custom-jwt/)**: Implements JSON Web Token (JWT) authentication to ensure secure and scalable user authentication within the MongoDB Realm ecosystem.
+   - **Firebase Auth**: Offers support for diverse authentication mechanisms, including email & password and Gmail, ensuring secure user access and streamlined account management.
+   - **[MongoDB Realm JWT Auth](https://www.mongodb.com/docs/atlas/app-services/authentication/custom-jwt/)**: Implements JSON Web Token (JWT) authentication to ensure secure and scalable user authentication within the MongoDB Realm ecosystem.
+
 - **Dependency Injection Frameworks**:
-    - **[Dagger2](https://dagger.dev/)**, **[Hilt](https://dagger.dev/hilt/)**, and **[Koin](https://insert-koin.io/)**: Provide scalable and maintainable object creation and management, optimizing app architecture and development workflow.
+   - **[Dagger2](https://dagger.dev/)**, **[Hilt](https://dagger.dev/hilt/)**, and **[Koin](https://insert-koin.io/)**: Provide scalable and maintainable object creation and management, optimizing app architecture and development workflow.
+
 - **APIs & Services Integration**:
-    - **Google Maps API**: Enhances app functionality with comprehensive mapping and location services.
-    - **Third-party APIs (Gemini, Palm, ChatGPT, Unsplash)**: Enrich the application with a diverse range of services, including cryptocurrency data, AI-generated content, and high-quality images.
+   - **Google Maps API**: Enhances app functionality with comprehensive mapping and location services.
+   - **Third-party APIs (Gemini, Unsplash)**: Enrich the application with a diverse range of services, including cryptocurrency data, AI-generated content, and high-quality images.
+
 - **Image Loading and Animation Libraries**:
-    - **Coil**: Efficiently loads and displays images, optimizing memory and network usage.
-    - **Lottie**: Implements complex animations sourced from JSON files, enriching the UI with engaging visuals.
+   - **Coil**: Efficiently loads and displays images, optimizing memory and network usage.
+   - **Lottie**: Implements complex animations sourced from JSON files, enriching the UI with engaging visuals.
+
 - **Material Design 3**: Adopts the latest Material Design guidelines for a cohesive, dynamic user interface and enhanced user experience, leveraging the newest components, theming, and layout principles.
 - **[Kotlin Symbol Processing (KSP)](https://github.com/google/ksp)**: Streamlines code generation and processing, enhancing development efficiency.
 - **WorkManager**: Manages background tasks and asynchronous operations, ensuring reliable execution under various system conditions.
 - **Architectural Patterns**:
-    - **MVVM and MVI**: Adopt modern architectural patterns for a clean separation of concerns, facilitating the development of testable and maintainable code.
+   - **MVVM and MVI**: Adopt modern architectural patterns for a clean separation of concerns, facilitating the development of testable and maintainable code.
+
 - **Core Android Features**:
-    - Utilizes Services, Broadcast Receivers, and Intents for robust background processing and inter-component communication.
+   - Utilizes Services, Broadcast Receivers, and Intents for robust background processing and inter-component communication.
+
 - **Project Organization**:
-    - Implements a multi-module structure with a version catalogue, promoting modular development and easier dependency management.
+   - Implements a multi-module structure with a version catalogue, promoting modular development and easier dependency management.
+
 - **Networking**:
-    - **[Retrofit](https://github.com/square/retrofit)**: Simplifies REST API communication, enhancing data exchange and integration.
+   - **[Retrofit](https://github.com/square/retrofit)**: Simplifies REST API communication, enhancing data exchange and integration.
+
 - **[Docker](https://www.docker.com/)**: Utilizes container technology for consistent development, testing, and deployment environments.
 - **Secure Management**:
-    - **GCP Secret Manager**: Safeguards sensitive information, ensuring secure access and storage of secrets.
+   - **GCP Secret Manager**: Safeguards sensitive information, ensuring secure access and storage of secrets.
+
 - **Testing Suite**:
-    - Employs **JUnit 4 & 5**, **[Mockk](https://mockk.io/)**, and **[turbine](https://github.com/cashapp/turbine)** for comprehensive testing across units and integration points.
+   - Employs **JUnit 4 & 5**, **[Mockk](https://mockk.io/)**, and **[turbine](https://github.com/cashapp/turbine)** for comprehensive testing across units and integration points.
+
 - **Code Quality Tools**:
-    - **Detekt**: Monitors code quality and maintainability, enforcing best practices and coding standards.
+   - **Detekt**: Monitors code quality and maintainability, enforcing best practices and coding standards.
 
 ### Architecture Overview
-![GptmapArchıtecture](public/images/gptmapArc.jpg)
+
+![GptmapArchıtecture](public/images/gptmapArc.png)
 
 <p>This project is designed following the principles of Clean Architecture, utilizing a multi-modular approach. It includes several layers, including the UI Layer, Domain Layer, Data Layer, and the backend, to ensure a solid separation of concerns and enhance maintainability.
 
-For the backend, Ktor for server-side logic, MongoDB for database management (Realm Sync and Auth for synchronization and authentication), Firebase for authentication, storage, and real-time database capabilities (Auth, Storage, Firestore), and GCP's Secret Manager for secure management of secrets and API keys.</p>
+For the backend, Ktor for server-side logic, MongoDB for database management (Realm Sync and Auth for synchronization and authentication), Firebase for authentication, storage, and real-time database capabilities (Auth, Storage, Firestore), and GCP's Secret Manager for secure management of secrets and API keys.
+
 ## App Demos
+
 Check out the [resources](public/) for the full list.
 
 https://github.com/f-arslan/GptMap/assets/66749900/68769bcf-8dcc-4e9d-8bec-6d6f393dc7b6
@@ -73,32 +97,28 @@ https://github.com/f-arslan/GptMap/assets/66749900/37f69fa5-bd37-41da-8688-15c74
 
 https://github.com/f-arslan/GptMap/assets/66749900/889fdcf8-8989-4d2d-8752-88cdbe6747cb
 
-
 ### Setup and Configuration Guide
 
 Getting started with this project involves several key steps to ensure everything is set up correctly. Follow this guide to configure your development environment and integrate all necessary services:
+
 1. **Android Studio Iguana**: This project is optimized for Android Studio Iguana. While it might work on lower versions, Gradle plugin 8.2.2 is required for the best experience. If you're using an older version, consider updating to avoid compatibility issues.
-    
-2. **Setting up `local.properties`**: This file contains essential environment variables. You won't need an OpenAI key as it will be deprecated. Fill in the necessary API keys and URLs except for the OpenAI key:  
+2. **Setting up `local.properties`**: This file contains essential environment variables. You won't need an OpenAI key as it will be deprecated. Fill in the necessary API keys and URLs except for the OpenAI key:
 
-```properties
+```properties {"id":"01HQGK9942PRCD1VKM59AC6BYM"}
 sdk.dir=<path_to_your_android_sdk>
 MAPS_API_KEY=<your_google_maps_api_key>
 OPENAI_API_KEY= (will be deprecated, no need to fill this)
 PALM_API_KEY=<your_gemini_api_key>
 UNSPLASH_BASE_URL=<unsplash_api_base_url>
+
 ```
 
-  Ensure you replace placeholder text with actual values relevant to your development environment.
-    
+Ensure you replace placeholder text with actual values relevant to your development environment.
+
 3. **Remove Keystore Related Configurations**: For development purposes, remove or comment out any keystore configurations in your Gradle build files. This simplifies the build process for initial setup and testing.
-    
 4. **Setup Docker and GCP Secret Manager**: Docker is used for containerization, ensuring a consistent environment for development and deployment. GCP Secret Manager stores and manages access to your application's secrets. Skipping this step means you won't be able to use AI features on images, though you can still proceed with other functionalities. For Docker, install Docker and follow the setup instructions for your OS. For GCP Secret Manager, set up a GCP account, create a new project, and follow the instructions to store your secrets.
-    
 5. **Firebase Setup**: To integrate Firebase, create a new project in the Firebase console, register your app, and download the `google-services.json` file. Place this file in your app's `app` directory. This step is crucial for utilizing Firebase Auth, Firestore, and Storage.
-    
 6. **MongoDB Atlas Setup**: Sign up or log in to MongoDB Atlas, create a new cluster, and connect your application using the provided connection string. Ensure you've configured the network access and database user for your cluster.
-    
 7. **GCP Account Requirement**: A Google Cloud Platform (GCP) account is necessary for utilizing Google Maps API and GCP Secret Manager. If you don't already have an account, sign up at [GCP's website](https://cloud.google.com/) and set up billing to access these services.
 
 

app/build.gradle.kts

@@ -52,12 +52,18 @@ android {
                 "proguard-rules.pro"
             )
             signingConfig = signingConfigs.getByName("config")
+            // baselineProfile.automaticGenerationDuringBuild = true
         }
     }
 
     namespace = "com.espressodev.gptmap"
 }
 
+baselineProfile {
+    dexLayoutOptimization = true
+    baselineProfileRulesRewrite = true
+}
+
 dependencies {
     implementation(projects.feature.map)
     implementation(projects.feature.login)

app/release/output-metadata.json

@@ -16,5 +16,6 @@
       "outputFile": "app-release.apk"
     }
   ],
-  "elementType": "File"
+  "elementType": "File",
+  "minSdkVersionForDexing": 26
 }

config/detekt/detekt.yml

@@ -106,7 +106,7 @@ complexity:
     ignoreOverloaded: false
   CyclomaticComplexMethod:
     active: true
-    threshold: 15
+    threshold: 20
     ignoreSingleWhenExpression: false
     ignoreSimpleWhenEntries: false
     ignoreNestingFunctions: false
@@ -132,7 +132,7 @@ complexity:
   LongParameterList:
     active: true
     functionThreshold: 60
-    constructorThreshold: 8
+    constructorThreshold: 10
     ignoreDefaultParameters: true
     ignoreDataClasses: true
     ignoreAnnotatedParameter: ['Composable', 'Preview']
@@ -167,8 +167,8 @@ complexity:
   TooManyFunctions:
     active: true
     excludes: ['**/test/**', '**/androidTest/**', '**/commonTest/**', '**/jvmTest/**', '**/androidUnitTest/**', '**/androidInstrumentedTest/**', '**/jsTest/**', '**/iosTest/**']
-    thresholdInFiles: 16
-    thresholdInClasses: 16
+    thresholdInFiles: 20
+    thresholdInClasses: 20
     thresholdInInterfaces: 11
     thresholdInObjects: 11
     thresholdInEnums: 11

core/common/src/main/kotlin/com/espressodev/gptmap/core/common/di/CommonModule.kt

@@ -1,4 +1,4 @@
-package com.espressodev.gptmap.core.common.module
+package com.espressodev.gptmap.core.common.di
 
 import com.espressodev.gptmap.core.common.LogService
 import com.espressodev.gptmap.core.common.NetworkMonitor

core/data/src/main/kotlin/com/espressodev/gptmap/core/data/di/DataModule.kt

@@ -17,7 +17,6 @@ import dagger.Module
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
 
-
 @Module
 @InstallIn(SingletonComponent::class)
 interface DataModule {

core/data/src/main/kotlin/com/espressodev/gptmap/core/data/repository/FavouriteRepository.kt

@@ -4,4 +4,4 @@ import com.espressodev.gptmap.core.model.Location
 
 interface FavouriteRepository {
     suspend fun saveImageForLocation(location: Location): Result<Unit>
-}
+}

core/data/src/main/kotlin/com/espressodev/gptmap/core/data/repository/FileRepository.kt

@@ -3,4 +3,4 @@ package com.espressodev.gptmap.core.data.repository
 interface FileRepository {
     suspend fun deleteFilesFromInternal(filenames: List<String>, dir: String): Result<Unit>
     suspend fun saveImageToInternal(imageUrl: String, fileId: String, size: Int): Result<Unit>
-}
+}

core/data/src/main/kotlin/com/espressodev/gptmap/core/data/repository/impl/AuthenticationRepositoryImpl.kt

@@ -1,7 +1,5 @@
 package com.espressodev.gptmap.core.data.repository.impl
 
-import com.espressodev.gptmap.core.model.di.Dispatcher
-import com.espressodev.gptmap.core.model.di.GmDispatchers.IO
 import com.espressodev.gptmap.core.data.repository.AuthenticationRepository
 import com.espressodev.gptmap.core.data.util.runCatchingWithContext
 import com.espressodev.gptmap.core.firebase.AccountService
@@ -10,6 +8,8 @@ import com.espressodev.gptmap.core.google.GoogleAuthService
 import com.espressodev.gptmap.core.google.OneTapSignInUpResponse
 import com.espressodev.gptmap.core.google.SignInUpWithGoogleResponse
 import com.espressodev.gptmap.core.model.Exceptions
+import com.espressodev.gptmap.core.model.di.Dispatcher
+import com.espressodev.gptmap.core.model.di.GmDispatchers.IO
 import com.espressodev.gptmap.core.model.firebase.Provider
 import com.espressodev.gptmap.core.model.firebase.User
 import com.espressodev.gptmap.core.model.google.GoogleResponse