Migration/navigation 3

.github/workflows/ci.yml

@@ -0,0 +1,42 @@
+name: CI
+
+on:
+  pull_request:
+    branches: [ "**" ]
+  push:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up JDK
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: '21'
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+
+      - name: Deep clean (project-local only)
+        run: ./gradlew --no-daemon deepClean
+
+      - name: Build
+        run: ./gradlew --no-daemon build
+
+      - name: Spotless check (soft enforcement for initial adoption)
+        run: ./gradlew --no-daemon spotlessCheckAll
+        continue-on-error: true
+
+      - name: Detekt (soft enforcement for initial adoption)
+        run: ./gradlew --no-daemon detektAll
+        continue-on-error: true
+
+# Notes:
+# - Spotless and Detekt steps are set to soft-fail initially to avoid breaking CI before the first formatting commit.
+#   After running `./gradlew applyCodeCleanup` and committing the formatting changes, set `continue-on-error: false`
+#   (or remove those lines) to enforce style and static analysis strictly on PRs.

README.md

@@ -6,12 +6,12 @@
 
 A modern weather application built with Jetpack Compose that provides current weather conditions, forecasts, and air quality information.
 
-+[![Download APK](https://img.shields.io/badge/download-APK-22272E.svg?style=for-the-badge&logo=android&logoColor=47954A)](https://github.com/bosankus/Compose-Weatherify/releases/latest)
+[![Download APK](https://img.shields.io/badge/download-APK-22272E.svg?style=for-the-badge&logo=android&logoColor=47954A)](https://github.com/bosankus/Compose-Weatherify/releases/latest)
 
 ## 📱 Features
 
 - **Current Weather**: View today's temperature and weather conditions
-- **5-Day Forecast**: See weather predictions for the next 4 days
+- **5-Day Forecast**: See weather predictions for the next 5 days
 - **Air Quality Index**: Monitor air pollution levels
 - **Multiple Cities**: Search and save your favorite locations
 - **Multi-language Support**: Available in English, Hindi, and Hebrew

app/build.gradle.kts

@@ -1,9 +1,9 @@
-import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 plugins {
     id("com.android.application")
     id("kotlin-android")
-    id("kotlin-kapt")
+    id("com.google.devtools.ksp")
     id("com.google.gms.google-services")
     id("dagger.hilt.android.plugin")
     id("kotlin-parcelize")
@@ -23,13 +23,11 @@ android {
         versionName = ConfigData.versionName
         multiDexEnabled = ConfigData.multiDexEnabled
         testInstrumentationRunner = "bose.ankush.weatherify.helper.HiltTestRunner"
-        resourceConfigurations.addAll(listOf("en", "hi", "iw"))
     }
 
-    kapt {
-        arguments {
-            arg("room.schemaLocation", "$projectDir/schemas")
-        }
+    @Suppress("UnstableApiUsage")
+    androidResources {
+        localeFilters.addAll(listOf("en", "hi", "he"))
     }
 
     packaging {
@@ -58,17 +56,6 @@ android {
         sourceCompatibility = JavaVersion.VERSION_17
         targetCompatibility = JavaVersion.VERSION_17
     }
-    kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.toString()
-    }
-
-    kotlin {
-        sourceSets.all {
-            languageSettings {
-                languageVersion = Versions.kotlinCompiler
-            }
-        }
-    }
 
     lint {
         abortOnError = false
@@ -77,14 +64,14 @@ android {
     namespace = "bose.ankush.weatherify"
 }
 
-composeCompiler {
-    featureFlags = setOf(
-        ComposeFeatureFlag.StrongSkipping.disabled()
-    )
+
+ksp {
+    arg("room.schemaLocation", "$projectDir/schemas")
 }
 
 dependencies {
 
+    api(project(":common-ui"))
     api(project(":language"))
     api(project(":storage"))
     api(project(":network"))
@@ -111,6 +98,7 @@ dependencies {
     debugImplementation(Deps.composeUiTooling)
     implementation(Deps.composeUiToolingPreview)
     implementation(Deps.composeMaterial3)
+    implementation(Deps.composeIconsExtended)
 
     // Unit Testing
     testImplementation(Deps.junit)
@@ -128,16 +116,21 @@ dependencies {
     androidTestImplementation(Deps.espressoCore)
     androidTestImplementation(Deps.espressoContrib)
     androidTestImplementation(Deps.hiltTesting)
-    kaptAndroidTest(Deps.hiltDaggerAndroidCompiler)
+    kspAndroidTest(Deps.hiltDaggerAndroidCompiler)
 
     // Networking
     implementation(Deps.gson)
 
+    // Room runtime for providing WeatherDatabase from app DI
+    implementation(Deps.room)
+    implementation(Deps.roomKtx)
+
     // Firebase
     implementation(platform(Deps.firebaseBom))
-    implementation(Deps.firebaseConfig)
-    implementation(Deps.firebaseAnalytics)
+    implementation("com.google.firebase:firebase-config")
+    implementation("com.google.firebase:firebase-analytics")
     implementation(Deps.firebasePerformanceMonitoring)
+    implementation("com.google.firebase:firebase-messaging")
 
     // Coroutines
     implementation(Deps.coroutinesCore)
@@ -146,13 +139,28 @@ dependencies {
     // Dependency Injection
     implementation(Deps.hilt)
     implementation(Deps.hiltNavigationCompose)
-    kapt(Deps.hiltDaggerAndroidCompiler)
+    ksp(Deps.hiltDaggerAndroidCompiler)
+    ksp(Deps.hiltAndroidXCompiler)
 
     // Miscellaneous
     implementation(Deps.timber)
-    implementation(Deps.lottieCompose)
+    // Removed Lottie dependency as per requirements
     implementation(Deps.coilCompose)
 
     // Memory leak
     debugImplementation(Deps.leakCanary)
+
+    // Payment SDK moved to app module
+    implementation(Deps.razorPay)
+}
+
+
+kotlin {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.JVM_17)
+        freeCompilerArgs.addAll(
+            "-Xopt-in=kotlin.RequiresOptIn",
+            "-Xopt-in=androidx.compose.animation.ExperimentalAnimationApi"
+        )
+    }
 }

app/src/main/AndroidManifest.xml

@@ -10,9 +10,13 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
-    <uses-permission android:name="android.permission.CALL_PHONE" />
+    <uses-permission
+        android:name="android.permission.FOREGROUND_SERVICE"
+        tools:ignore="ForegroundServicesPolicy" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_LOCATION" />
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:name=".WeatherifyApplication"
@@ -22,6 +26,7 @@
         android:localeConfig="@xml/locales_config"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:usesCleartextTraffic="false"
         android:theme="@style/Theme.Weatherify.Starting"
         tools:ignore="AllowBackup,UnusedAttribute">
         <activity
@@ -46,6 +51,23 @@
                 android:name="autoStoreLocales"
                 android:value="true" />
         </service>
+
+        <!-- FCM Service -->
+        <service
+            android:name=".base.notification.WeatherifyMessagingService"
+            android:exported="false">
+            <intent-filter>
+                <action android:name="com.google.firebase.MESSAGING_EVENT" />
+            </intent-filter>
+        </service>
+
+        <!-- Firebase Messaging Service -->
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_icon"
+            android:resource="@mipmap/ic_launcher" />
+        <meta-data
+            android:name="com.google.firebase.messaging.default_notification_color"
+            android:resource="@color/wallet_bright_foreground_disabled_holo_light" />
     </application>
 
 </manifest>

storage/src/androidMain/kotlin/bose/ankush/storage/di/StorageModule.kt → app/src/main/java/bose/ankush/storage/di/StorageModule.kt

@@ -2,20 +2,22 @@ package bose.ankush.storage.di
 
 import android.content.Context
 import androidx.room.Room
-import bose.ankush.network.repository.WeatherRepository as NetworkWeatherRepository
+import bose.ankush.network.auth.storage.TokenStorage
 import bose.ankush.storage.api.WeatherStorage
 import bose.ankush.storage.common.WEATHER_DATABASE_NAME
+import bose.ankush.storage.impl.TokenStorageImpl
 import bose.ankush.storage.impl.WeatherStorageImpl
 import bose.ankush.storage.room.JsonParser
-import bose.ankush.storage.room.WeatherDatabase
 import bose.ankush.storage.room.WeatherDataModelConverters
+import bose.ankush.storage.room.WeatherDatabase
 import com.google.gson.Gson
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext
 import dagger.hilt.components.SingletonComponent
 import javax.inject.Singleton
+import bose.ankush.network.repository.WeatherRepository as NetworkWeatherRepository
 
 @Module
 @InstallIn(SingletonComponent::class)
@@ -24,7 +26,6 @@ object StorageModule {
     @Provides
     @Singleton
     fun provideGson(): Gson = Gson()
-
     @Provides
     @Singleton
     fun provideJsonParser(gson: Gson): JsonParser = JsonParser(gson)
@@ -47,7 +48,7 @@ object StorageModule {
             WEATHER_DATABASE_NAME
         )
             .addTypeConverter(converters)
-            .fallbackToDestructiveMigration()
+            .fallbackToDestructiveMigration(false)
             .build()
     }
 
@@ -59,4 +60,12 @@ object StorageModule {
     ): WeatherStorage {
         return WeatherStorageImpl(networkRepository, weatherDatabase)
     }
-}
+
+    @Provides
+    @Singleton
+    fun provideTokenStorage(
+        weatherDatabase: WeatherDatabase
+    ): TokenStorage {
+        return TokenStorageImpl(weatherDatabase)
+    }
+}

app/src/main/java/bose/ankush/weatherify/WeatherifyApplication.kt

@@ -2,10 +2,11 @@ package bose.ankush.weatherify
 
 import android.app.NotificationChannel
 import android.app.NotificationManager
-import android.content.Context
 import bose.ankush.weatherify.base.location.LocationService.Companion.NOTIFICATION_CHANNEL_ID
 import bose.ankush.weatherify.base.location.LocationService.Companion.NOTIFICATION_NAME
 import bose.ankush.weatherify.domain.remote_config.RemoteConfigService
+import com.google.firebase.FirebaseApp
+import com.google.firebase.messaging.FirebaseMessaging
 import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 import javax.inject.Inject
@@ -24,26 +25,58 @@ class WeatherifyApplication : WeatherifyApplicationCore() {
     override fun onCreate() {
         super.onCreate()
         enableTimber()
+        initializeFirebase()
         createNotificationChannel()
         initializeRemoteConfig()
+        subscribeToTopics()
+    }
+
+    private fun initializeFirebase() {
+        FirebaseApp.initializeApp(this)
+    }
+
+    private fun subscribeToTopics() {
+        FirebaseMessaging.getInstance().subscribeToTopic("weather_alerts")
+            .addOnCompleteListener { task ->
+                if (!task.isSuccessful) {
+                    Timber.e(task.exception, "Failed to subscribe to weather_alerts topic")
+                } else {
+                    Timber.d("Successfully subscribed to weather_alerts topic")
+                }
+            }
     }
 
     private fun initializeRemoteConfig() {
         remoteConfigService.initialize()
     }
 
     private fun enableTimber() {
-        Timber.plant(Timber.DebugTree())
+        if (BuildConfig.DEBUG) {
+            Timber.plant(Timber.DebugTree())
+        } else {
+            Timber.plant(object : Timber.Tree() {
+                override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+                    // Only log WARN, ERROR, and WTF in release; avoid verbose/debug/info
+                    if (priority == android.util.Log.VERBOSE || priority == android.util.Log.DEBUG || priority == android.util.Log.INFO) return
+                    android.util.Log.println(priority, tag, message)
+                }
+            })
+        }
     }
 
     private fun createNotificationChannel() {
         val channel = NotificationChannel(
             NOTIFICATION_CHANNEL_ID,
             NOTIFICATION_NAME,
             NotificationManager.IMPORTANCE_HIGH
-        )
+        ).apply {
+            description = "Channel for weather alerts and updates"
+            enableVibration(true)
+        }
+
         val notificationManager =
-            getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
+            getSystemService(NOTIFICATION_SERVICE) as NotificationManager
         notificationManager.createNotificationChannel(channel)
+        Timber.d("Notification channel created: $NOTIFICATION_CHANNEL_ID")
     }
 }

app/src/main/java/bose/ankush/weatherify/base/common/Constants.kt

@@ -6,9 +6,6 @@ import android.annotation.SuppressLint
 Author: Ankush Bose
 Date: 05,May,2021
  **/
-
-/*General constants*/
-const val WEATHER_BASE_URL = "https://data.androidplay.in/"
 const val WEATHER_IMG_URL = "https://openweathermap.org/img/wn/"
 
 const val APP_UPDATE_REQ_CODE = 111
@@ -22,7 +19,6 @@ const val DEFAULT_CITY_NAME = "New Delhi"
 /* Permission constants */
 const val ACCESS_FINE_LOCATION = android.Manifest.permission.ACCESS_FINE_LOCATION
 const val ACCESS_COARSE_LOCATION = android.Manifest.permission.ACCESS_COARSE_LOCATION
-const val ACCESS_PHONE_CALL = android.Manifest.permission.CALL_PHONE
 @SuppressLint("InlinedApi")
 const val ACCESS_NOTIFICATION = android.Manifest.permission.POST_NOTIFICATIONS
 
@@ -31,10 +27,5 @@ val PERMISSIONS_TO_REQUEST = arrayOf(
     ACCESS_COARSE_LOCATION
 )
 
-/*Room central db name*/
-const val WEATHER_DATABASE_NAME = "central_weather_table"
-const val AQ_DATABASE_NAME = "central_aq_table"
-const val PHONE_NUMBER = "tel:+91XXXXXXXXX"
-
 /*Remote keys*/
 const val ENABLE_NOTIFICATION = "enable_notification"