diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index eaf1789..ed0357e 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -14,29 +14,26 @@ android {
ndkVersion = flutter.ndkVersion
compileOptions {
- sourceCompatibility = JavaVersion.VERSION_11
- targetCompatibility = JavaVersion.VERSION_11
+ isCoreLibraryDesugaringEnabled = true
+ sourceCompatibility = JavaVersion.VERSION_1_8
+ targetCompatibility = JavaVersion.VERSION_1_8
}
kotlinOptions {
- jvmTarget = JavaVersion.VERSION_11.toString()
+ jvmTarget = "1.8"
}
defaultConfig {
- // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "com.example.proxibuy"
- // You can update the following values to match your application needs.
- // For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = 23
targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode
versionName = flutter.versionName
+ multiDexEnabled = true
}
buildTypes {
release {
- // TODO: Add your own signing config for the release build.
- // Signing with the debug keys for now, so `flutter run --release` works.
signingConfig = signingConfigs.getByName("debug")
}
}
@@ -45,3 +42,8 @@ android {
flutter {
source = "../.."
}
+
+dependencies {
+ // این نسخه به آخرین نسخه مورد نیاز آپدیت شد
+ coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
+}
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index df814f7..7b2fd80 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,18 +1,19 @@
+
+
-
-
+
+
-
-
+
-
+
+
+
-
+
-
+
\ No newline at end of file
diff --git a/lib/core/config/api_config.dart b/lib/core/config/api_config.dart
index 8a56d7d..4f08183 100644
--- a/lib/core/config/api_config.dart
+++ b/lib/core/config/api_config.dart
@@ -5,6 +5,7 @@ class ApiConfig {
static const String updateUser = "/user/updateName";
static const String updateCategories = "/user/favoriteCategory";
static const String getFavoriteCategories = "/user/getfavoriteCategory";
- static const String addReservation = "/reservation/add";
- static const String getReservations = "/reservation/get";
-}
\ No newline at end of file
+ static const String addReservation = "/reservation/add";
+ static const String getReservations = "/reservation/get";
+ static const String updateFcmToken = "/user/firebaseUpdate";
+}
diff --git a/lib/data/models/offer_model.dart b/lib/data/models/offer_model.dart
index 68db1ac..59ff293 100644
--- a/lib/data/models/offer_model.dart
+++ b/lib/data/models/offer_model.dart
@@ -149,7 +149,7 @@ class OfferModel extends Equatable {
rating: 0.0,
ratingCount: 0,
comments: [],
- discountInfo: json['Description'],
+ discountInfo: json['Description'] ?? 'توضیحات موجود نیست',
);
}
@@ -157,7 +157,29 @@ class OfferModel extends Equatable {
imageUrls.isNotEmpty ? imageUrls.first : 'https://via.placeholder.com/400x200.png?text=No+Image';
@override
- List