Explore page update

.github/workflows/build.yml

@@ -189,6 +189,7 @@ jobs:
     - name: Comment on PR with build status
       if: github.event_name == 'pull_request'
       uses: actions/github-script@v7
+      continue-on-error: true
       with:
         script: |
           const artifactName = '${{ steps.artifact-name.outputs.name }}';

android/app/build.gradle.kts

@@ -1,17 +1,17 @@
+import java.io.FileInputStream
+import java.util.Properties
+
 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")
-    // Apply Google Services plugin here (only once, not at bottom)
+    // Google Services plugin
     id("com.google.gms.google-services")
     // Firebase Crashlytics
     id("com.google.firebase.crashlytics")
 }
 
-import java.util.Properties
-import java.io.FileInputStream
-
 // Load key.properties for release signing
 val keystorePropertiesFile = rootProject.file("key.properties")
 val keystoreProperties = Properties()
@@ -22,11 +22,12 @@ if (keystorePropertiesFile.exists()) {
 android {
     namespace = "com.a360ghar.stays"
     compileSdk = flutter.compileSdkVersion
-    ndkVersion = flutter.ndkVersion
+    ndkVersion = "28.2.13676358"
 
     compileOptions {
         sourceCompatibility = JavaVersion.VERSION_11
         targetCompatibility = JavaVersion.VERSION_11
+        isCoreLibraryDesugaringEnabled = true
     }
 
     kotlinOptions {
@@ -52,13 +53,13 @@ android {
         versionName = flutter.versionName
     }
 
-    // 🔹 Flavor setup
+    // Flavor setup
     flavorDimensions += listOf("env")
 
     productFlavors {
         create("dev") {
             dimension = "env"
-            applicationIdSuffix = ".dev"
+            applicationId = "com.example.stays_app.dev"
             resValue("string", "app_name", "360ghar stays (Dev)")
         }
         create("staging") {
@@ -93,7 +94,7 @@ android {
         }
     }
 
-    // 🔹 Automatically pick correct google-services.json based on flavor
+    // Automatically pick correct google-services.json based on flavor
     sourceSets {
         getByName("dev") {
             res.srcDirs("src/dev/res")
@@ -113,6 +114,11 @@ android {
     }
 }
 
+dependencies {
+    coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.5")
+    implementation("com.google.android.play:core:1.10.3")
+}
+
 flutter {
     source = "../.."
 }

android/app/google-services.json

@@ -5,6 +5,25 @@
     "storage_bucket": "stays-app-52ca6.firebasestorage.app"
   },
   "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:866676409773:android:e7434edd703cfea8e14d24",
+        "android_client_info": {
+          "package_name": "com.a360ghar.stays"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBcOC2oanpFWvLmIqlsKxNm81LSnyKieeQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
     {
       "client_info": {
         "mobilesdk_app_id": "1:866676409773:android:e7434edd703cfea8e14d24",
@@ -23,6 +42,44 @@
           "other_platform_oauth_client": []
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:866676409773:android:e7434edd703cfea8e14d24",
+        "android_client_info": {
+          "package_name": "com.example.stays_app.dev"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBcOC2oanpFWvLmIqlsKxNm81LSnyKieeQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:866676409773:android:e7434edd703cfea8e14d24",
+        "android_client_info": {
+          "package_name": "com.a360ghar.stays.staging"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBcOC2oanpFWvLmIqlsKxNm81LSnyKieeQ"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
     }
   ],
   "configuration_version": "1"

android/app/proguard-rules.pro

@@ -58,3 +58,9 @@
 
 # Keep secure storage
 -keep class com.it_nomads.fluttersecurestorage.** { *; }
+
+# Play Core / SplitCompat (not always included but referenced by Flutter embedding)
+-dontwarn com.google.android.play.core.splitcompat.SplitCompatApplication
+-dontwarn com.google.android.play.core.tasks.OnFailureListener
+-dontwarn com.google.android.play.core.splitinstall.SplitInstallStateUpdatedListener
+-dontwarn com.google.android.play.core.listener.StateUpdatedListener

android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,7 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
     <application
         android:label="360 Stays"

android/app/src/main/kotlin/com/example/stays_app/MainActivity.kt → android/app/src/main/kotlin/com/a360ghar/stays/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.example.stays_app
+package com.a360ghar.stays
 
 import io.flutter.embedding.android.FlutterActivity
 

lib/app/bindings/initial_binding.dart

@@ -72,6 +72,7 @@ class InitialBinding extends Bindings {
     Get.put<PlacesService>(PlacesService());
     Get.put<AnalyticsService>(
       AnalyticsService(enabled: AppConfig.I.enableAnalytics),
+      permanent: true,
     );
 
     // Property cache service for offline support

lib/app/controllers/favorites_controller.dart

@@ -1,8 +1,6 @@
 import 'package:get/get.dart';
 
-import 'package:stays_app/app/controllers/base/base_controller.dart';
-
-class FavoritesController extends BaseController {
+class FavoritesController extends GetxController {
   FavoritesController();
 
   final RxSet<int> favoriteIds = <int>{}.obs;

lib/app/controllers/filter_controller.dart

@@ -1,13 +1,12 @@
 import 'package:flutter/material.dart';
 import 'package:get/get.dart';
 
-import 'package:stays_app/app/controllers/base/base_controller.dart';
 import '../data/models/unified_filter_model.dart';
 import '../ui/widgets/filters/property_filter_sheet.dart';
 
 enum FilterScope { explore, wishlist, booking, locate }
 
-class FilterController extends BaseController {
+class FilterController extends GetxController {
   FilterController();
 
   final Map<FilterScope, Rx<UnifiedFilterModel>> _filters = {

lib/app/data/models/api_response_models.dart

@@ -1,25 +1,13 @@
-import 'package:json_annotation/json_annotation.dart';
-
-part 'api_response_models.g.dart';
-
-@JsonSerializable()
 class NotificationSettings {
-  @JsonKey(defaultValue: true)
   final bool pushEnabled;
-  @JsonKey(defaultValue: true)
   final bool emailEnabled;
-  @JsonKey(defaultValue: false)
   final bool smsEnabled;
-  @JsonKey(defaultValue: true)
   final bool bookingUpdates;
-  @JsonKey(defaultValue: false)
   final bool promotions;
-  @JsonKey(defaultValue: true)
   final bool messages;
-  @JsonKey(defaultValue: true)
   final bool reminders;
 
-  const NotificationSettings({
+  NotificationSettings({
     this.pushEnabled = true,
     this.emailEnabled = true,
     this.smsEnabled = false,
@@ -29,28 +17,38 @@ class NotificationSettings {
     this.reminders = true,
   });
 
-  factory NotificationSettings.fromJson(Map<String, dynamic> json) =>
-      _$NotificationSettingsFromJson(json);
+  factory NotificationSettings.fromJson(Map<String, dynamic> json) {
+    return NotificationSettings(
+      pushEnabled: json['pushEnabled'] ?? true,
+      emailEnabled: json['emailEnabled'] ?? true,
+      smsEnabled: json['smsEnabled'] ?? false,
+      bookingUpdates: json['bookingUpdates'] ?? true,
+      promotions: json['promotions'] ?? false,
+      messages: json['messages'] ?? true,
+      reminders: json['reminders'] ?? true,
+    );
+  }
 
-  Map<String, dynamic> toJson() => _$NotificationSettingsToJson(this);
+  Map<String, dynamic> toJson() => {
+    'pushEnabled': pushEnabled,
+    'emailEnabled': emailEnabled,
+    'smsEnabled': smsEnabled,
+    'bookingUpdates': bookingUpdates,
+    'promotions': promotions,
+    'messages': messages,
+    'reminders': reminders,
+  };
 }
 
-@JsonSerializable()
 class PrivacySettings {
-  @JsonKey(defaultValue: true)
   final bool profilePublic;
-  @JsonKey(defaultValue: false)
   final bool showEmail;
-  @JsonKey(defaultValue: false)
   final bool showPhone;
-  @JsonKey(defaultValue: true)
   final bool showListings;
-  @JsonKey(defaultValue: true)
   final bool showReviews;
-  @JsonKey(defaultValue: true)
   final bool allowMessages;
 
-  const PrivacySettings({
+  PrivacySettings({
     this.profilePublic = true,
     this.showEmail = false,
     this.showPhone = false,
@@ -59,8 +57,23 @@ class PrivacySettings {
     this.allowMessages = true,
   });
 
-  factory PrivacySettings.fromJson(Map<String, dynamic> json) =>
-      _$PrivacySettingsFromJson(json);
+  factory PrivacySettings.fromJson(Map<String, dynamic> json) {
+    return PrivacySettings(
+      profilePublic: json['profilePublic'] ?? true,
+      showEmail: json['showEmail'] ?? false,
+      showPhone: json['showPhone'] ?? false,
+      showListings: json['showListings'] ?? true,
+      showReviews: json['showReviews'] ?? true,
+      allowMessages: json['allowMessages'] ?? true,
+    );
+  }
 
-  Map<String, dynamic> toJson() => _$PrivacySettingsToJson(this);
+  Map<String, dynamic> toJson() => {
+    'profilePublic': profilePublic,
+    'showEmail': showEmail,
+    'showPhone': showPhone,
+    'showListings': showListings,
+    'showReviews': showReviews,
+    'allowMessages': allowMessages,
+  };
 }