Merge pull request 'abdusalom0516/base/home-screen' (#1) from abdusalom0516/base/home-screen into master

Reviewed-on: #1

android/app/build.gradle.kts

@@ -1,3 +1,6 @@
+import java.util.Properties
+import java.io.FileInputStream
+
 plugins {
     id("com.android.application")
     // START: FlutterFire Configuration
@@ -8,8 +11,14 @@ plugins {
     id("dev.flutter.flutter-gradle-plugin")
 }
 
+val keystoreProperties = Properties()
+val keystorePropertiesFile = rootProject.file("key.properties")
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(FileInputStream(keystorePropertiesFile))
+}
+
 android {
-    namespace = "com.emart.customer"
+    namespace = "felix.fondex.uz"
     compileSdk = 36
     ndkVersion = flutter.ndkVersion
 
@@ -25,7 +34,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.emart.customer"
+        applicationId = "felix.fondex.uz"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = 26
@@ -34,11 +43,20 @@ android {
         versionName = flutter.versionName
     }
 
+    signingConfigs {
+        create("release") {
+            keyAlias = keystoreProperties["keyAlias"] as String
+            keyPassword = keystoreProperties["keyPassword"] as String
+            storeFile = keystoreProperties["storeFile"]?.let { file(it) }
+            storePassword = keystoreProperties["storePassword"] as String
+        }
+    }
+
     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")
+            signingConfig = signingConfigs.getByName("release")
             isMinifyEnabled = false
             isShrinkResources = false
         }

android/app/google-services.json

@@ -8,9 +8,9 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:893074789710:android:05002c15a64cf1e0c4ba1f",
+        "mobilesdk_app_id": "1:893074789710:android:70c2e98114a8ef1ac4ba1f",
         "android_client_info": {
-          "package_name": "com.emart.customer"
+          "package_name": "felix.fondex.driver"
         }
       },
       "oauth_client": [
@@ -32,10 +32,46 @@
               "client_type": 3
             },
             {
-              "client_id": "893074789710-pv12m4nhe82a4ueg9sb2pgt42r0e5da3.apps.googleusercontent.com",
+              "client_id": "893074789710-7am77oq925d324gvpga8g6r6ggul4v9i.apps.googleusercontent.com",
               "client_type": 2,
               "ios_info": {
-                "bundle_id": "com.emart.customer"
+                "bundle_id": "com.emart.driver"
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:893074789710:android:e932bc88da6665b3c4ba1f",
+        "android_client_info": {
+          "package_name": "felix.fondex.uz"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "893074789710-nqkeis20f6b64luas7g44c836fvi0qms.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyALZhdy7Rw3jffipxsDvvz7_C_b4teVg1k"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "893074789710-nqkeis20f6b64luas7g44c836fvi0qms.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "893074789710-7am77oq925d324gvpga8g6r6ggul4v9i.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "com.emart.driver"
               }
             }
           ]

android/app/src/main/AndroidManifest.xml

@@ -10,7 +10,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" /> -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
@@ -46,14 +46,14 @@
     <application
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher"
-        android:label="customer"
+        android:label="Fondex"
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/ic_launcher"
         android:usesCleartextTraffic="true">
 
         <!-- Main Activity (Kotlin-based) -->
         <activity
-            android:name="com.emart.customer.MainActivity"
+            android:name="felix.fondex.uz.MainActivity"
             android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode"
             android:enableOnBackInvokedCallback="true"
             android:exported="true"
@@ -90,7 +90,7 @@
 
                 <data
                     android:host="paypalpay"
-                    android:scheme="com.emart.customer" />
+                    android:scheme="felix.fondex.uz" />
             </intent-filter>
 
             <!-- PayPal cancel redirect -->
@@ -102,7 +102,7 @@
 
                 <data
                     android:host="paypalcancel"
-                    android:scheme="com.emart.customer" />
+                    android:scheme="felix.fondex.uz" />
 
             </intent-filter>
 

android/app/src/main/kotlin/com/emart/customer/MainActivity.kt

@@ -1,4 +1,4 @@
-package com.emart.customer
+package felix.fondex.uz
 
 import io.flutter.embedding.android.FlutterFragmentActivity
 

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-  <background android:drawable="@mipmap/ic_launcher_background"/>
+  <background android:drawable="@color/ic_launcher_background"/>
   <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-  <monochrome android:drawable="@mipmap/ic_launcher_monochrome"/>
 </adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -0,0 +1,4 @@
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <background android:drawable="@color/ic_launcher_background"/>
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+</adaptive-icon>

android/app/src/main/res/values/ic_launcher_background.xml

@@ -0,0 +1,3 @@
+<resources>
+  <color name="ic_launcher_background">#ff643c</color>
+</resources>

android/app/src/main/res/values/styles.xml

@@ -1,11 +0,0 @@
-<resources>
-    <!-- Theme for launch/splash screen -->
-    <style name="LaunchTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="android:windowBackground">@drawable/launch_background</item>
-    </style>
-
-    <!-- Normal app theme -->
-    <style name="NormalTheme" parent="Theme.MaterialComponents.Light.NoActionBar">
-        <item name="android:windowBackground">?android:colorBackground</item>
-    </style>
-</resources>

android/gradle/wrapper/gradle-wrapper.properties

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip

android/settings.gradle.kts

@@ -18,7 +18,7 @@ pluginManagement {
 
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
-    id("com.android.application") version "8.7.0" apply false
+    id("com.android.application") version "8.9.1" apply false
     // START: FlutterFire Configuration
     id("com.google.gms.google-services") version("4.3.15") apply false
     // END: FlutterFire Configuration

assets/translations/en.json

@@ -0,0 +1,157 @@
+{
+    "loginToExplore" :  "Log in to explore your all in one vendor app favourites and shop effortlessly.",
+    "emailAddress": "Email Address*",
+    "password": "Password*",
+    "enterPassword": "Enter password",
+    "forgotPassword": "Forgot Password",
+    "login": "Log in",
+    "orContinueWith": "or continue with",
+    "withGoogle": "with Google",
+    "withApple": "with Apple",
+    "dontHaveAccount": "Didn't have an account?",
+    "signUp": "Sign up",
+    "skip": "Skip",
+    "signUpToExplore": "Sign up to explore all our services and start shopping, riding, and more.",
+    "firstName": "First Name*",
+    "lastName": "Last Name*",
+    "enterMobileNumber": "Enter Mobile number",
+    "confirmPassword": "Confirm Password*",
+    "enterConfirmPassword": "Enter confirm password",
+    "referralCode": "Referral Code",
+    "enterReferralCode": "Enter referral code",
+    "alreadyHaveAccount":"Already have an account?",
+    "enterYourregisteredEmail":  "Enter your registered email to receive a reset link.",
+    "sendLink": "Send Link",
+    "rememberPassword": "Remember Password?",
+    "enterOtpSent": "Enter the OTP sent to your mobile",
+    "resendOTP": "Resend OTP",
+    "verify": "Verify",
+    "useYourMobileNumber": "Use your mobile number to Log in easily and securely.",
+    "sendCode":"Send Code",
+    "serviceIsUnavailable":  "Service is unavailable at the selected address.",
+    "pickUpLocation": "Pickup Location",
+    "destinationLocation": "Destination Location",
+    "continueT":"Continue",
+    "plsSelectSourceLocation": "Please select source location",
+    "plsSelectDestinationLocations": "Please select destination location",
+    "selectVehicleType": "Select Your Vehicle Type",
+    "plsSelectVehicleTypeFirst": "Please select a vehicle type first.",
+    "plsSelectPaymentMethod":  "Please select a payment method",
+    "insufficientWallet": "Insufficient wallet balance. Please select another payment method.",
+    "promoCode":  "Promo code",
+    "thisOfferNotEligible": "This offer not eligible for this booking",
+    "viewAll": "View All",
+    "writeCoupon": "Write coupon Code",
+    "redeemNow": "Redeem now",
+    "plsEnterCouponCode":"Please enter a coupon code",
+    "couponApplied": "Coupon applied successfully",
+    "couponExpired": "This coupon code has been expired",
+    "invalidCouponCode": "Invalid coupon code",
+    "orderSummary": "Order Summary",
+    "subtotal": "Subtotal",
+    "discount": "Discount",
+    "orderTotal": "Order Total",
+    "confirmBooking": "Confirm Booking",
+    "waitingForDriver": "Waiting for driver....",
+    "cancelRide": "Cancel Ride",
+    "riderCancelledSucces": "Ride cancelled successfully",
+    "failedToCancel": "Failed to cancel ride",
+    "pleaseWait":  "Please wait...",
+    "change": "Change",
+    "yourSosRequest": "Your SOS request has been submitted to admin",
+    "yourSosrequestAlreadySubmitted": "Your SOS request is already submitted",
+    "payNow": "Pay Now",
+    "youDoNothaveSufficientwalletBalance": "You do not have sufficient wallet balance",
+    "somethingWentWrong":  "Something went wrong, please contact admin.",
+    "cash": "Cash",
+    "coupon": "Coupon",
+    "couponNotFound": "Coupon not found.",
+    "tapToApply": "Tap To Apply",
+    "home": "Home",
+    "myBookings": "My Bookings",
+    "profile": "profile",
+    "wallet": "Wallet",
+    "cabServiceType": "Cab Service Type",
+    "everyRideVerified": "Every Ride. Every Driver. Verified.",
+    "allDriversIDCheck": "All drivers go through ID checks and background verification for your safety.",
+    "intercity": "Intercity",
+    "aroundTheCity": "Around the city",
+    "rideDetails": "Ride Details",
+    "orderId": "Order Id:",
+    "bookingData": "Booking Date:",
+    "rideAndFareSummary": "Ride & Fare Summary",
+    "updateReview": "Update Review",
+    "addReview": "Add Review",
+    "complain": "Complain",
+    "distance": "Distance",
+    "km": "KM",
+    "duration": "Duration",
+    "howWasTrip": "How was your trip?",
+    "yourFeedbackWillHelp": "Your feedback will help us improve \n driving experience better",
+    "rateFor": "Rate for",
+    "typeComment": "Type comment....",
+    "title": "Title",
+    "typeDescription": "Type Description...",
+    "save": "Save",
+    "popularDestinations": "Popular Destinations",
+    "selectPaymentMethod": "Select Payment Method",
+    "prefferedPayment": "Preferred Payment",
+    "otherPaymentOptions": "Other Payment Options",
+    "rideHistory": "Ride History",
+    "plsLoginToAcc": "Please Log In to Continue",
+    "youAreNotLoggedIn": "You’re not logged in. Please sign in to access your account and explore all features.",
+    "noOrderfound": "No order found",
+    "reset_password_link_sent": "A reset link has been sent to {email}",
+    "pay_amount": "Pay Amount: {amount}",
+    "otherServices": "Other Services",
+    "foodDelivery": "Food Delivery",
+    "delivery": "Delivery",
+    "bookingTaxi": "Booking \nTaxi",
+    "updateYourWardrobe": "Update your wardrobe",
+    "weDeliverSafely": "We deliver safely",
+    "rent": "Rent",
+    "hugeSelectionOfAds": "Huge selection of ads!",
+    "cosmetics": "Cosmetics",
+    "moreThan1000Products": "More than 1000 products",
+    "foodProducts": "Food products",
+    "enableLocation": "Enable Location for a Personalized Experience",
+    "allowLocation": "Allow location access to discover beauty stores and services near you.",
+    "useCurrentLocation": "Use current location",
+    "setFromMap": "Set from map",
+    "enterManuallyLocation": "Enter Manually location",
+
+
+    "changeLanguage": "Change Language",
+    "selectPrefferedLanguage": "Select your preferred language for a personalized app experience.",
+    "searchStoreItem": "Search the store, item and more...",
+    "category":  "Category",
+    "highlightsForU": "Highlights for you",
+    "newArrival":  "New Arrivals",
+    "topBrands": "Top Brands",
+    "styleUp":  "Style up with the latest fits, now at unbeatable prices.",
+    "additionlOffers": "Additional Offers",
+    "largestDiscounts":  "Largest Discounts",
+    "newArrivals":  "New Arrivals",
+    "popularStores": "Popular Stores",
+    "allStores":  "All Stores",
+    "alert": "Alert",
+    "cancel": "Cancel",
+    "ok": "Ok",
+    "doYouWantChangeTheDeliverOption": "Do you really want to change the delivery option? Your cart will be empty.",
+    "freeDelivery": "Free Delivery",
+    "upto": "Upto",
+    "viewCart": "View Cart",
+    "viewTimings":  "View Timings",
+    "timingIsNotAdded": "Timing is not added by store",
+    "alsoApplicableOnTable": "Also applicable on table booking",
+    "tableBooking": "Table Booking",
+    "quickConformations": "Quick Conformations",
+    "menu": "Menu",
+    "searchAndMore": "Search the item and more...",
+    "veg": "Veg",
+    "nonVeg": "Non Veg",
+    "favourites": "Favourites",
+    "orders": "Orders",
+    "takeAway": "TakeAway"
+
+}

assets/translations/ru.json

@@ -0,0 +1,124 @@
+{
+    "loginToExplore" : "Войдите, чтобы исследовать наш универсальный сервис и делать покупки с удобством.",
+    "emailAddress": "Адрес электронной почты*",
+    "password": "Пароль*",
+    "enterPassword": "Введите пароль",
+    "forgotPassword": "Забыли пароль",
+    "login": "Войти",
+    "orContinueWith": "или продолжить с",
+    "withGoogle": "с Google",
+    "withApple": "с Apple",
+    "dontHaveAccount": "Нет аккаунта?",
+    "signUp": "Зарегистрироваться",
+    "skip": "Пропустить",
+    "signUpToExplore": "Зарегистрируйтесь, чтобы получить доступ ко всем нашим услугам и начать делать покупки, поездки и многое другое.",
+    "firstName": "Имя*",
+    "lastName": "Фамилия*",
+    "enterMobileNumber": "Введите номер телефона",
+    "confirmPassword": "Подтвердите пароль*",
+    "enterConfirmPassword": "Введите подтверждение пароля",
+    "referralCode": "Реферальный код",
+    "enterReferralCode": "Введите реферальный код",
+    "alreadyHaveAccount": "Уже есть аккаунт?",
+    "enterYourregisteredEmail": "Введите свою зарегистрированную почту, чтобы получить ссылку для сброса.",
+    "sendLink": "Отправить ссылку",
+    "rememberPassword": "Вспомнили пароль?",
+    "enterOtpSent": "Введите код, отправленный на ваш телефон",
+    "resendOTP": "Отправить код повторно",
+    "verify": "Подтвердить",
+    "useYourMobileNumber": "Используйте номер телефона для быстрого и безопасного входа.",
+    "sendCode": "Отправить код",
+    "serviceIsUnavailable": "Услуга недоступна по выбранному адресу.",
+    "pickUpLocation": "Место отправления",
+    "destinationLocation": "Место назначения",
+    "continueT": "Продолжить",
+    "plsSelectSourceLocation": "Пожалуйста, выберите место отправления",
+    "plsSelectDestinationLocations": "Пожалуйста, выберите место назначения",
+    "selectVehicleType": "Выберите тип транспорта",
+    "plsSelectVehicleTypeFirst": "Сначала выберите тип транспорта.",
+    "plsSelectPaymentMethod": "Пожалуйста, выберите способ оплаты",
+    "insufficientWallet": "Недостаточно средств в кошельке. Пожалуйста, выберите другой способ оплаты.",
+    "promoCode": "Промокод",
+    "thisOfferNotEligible": "Это предложение недоступно для данного заказа",
+    "viewAll": "Показать все",
+    "writeCoupon": "Введите промокод",
+    "redeemNow": "Применить",
+    "plsEnterCouponCode": "Пожалуйста, введите промокод",
+    "couponApplied": "Промокод успешно применён",
+    "couponExpired": "Срок действия этого промокода истёк",
+    "invalidCouponCode": "Неверный промокод",
+    "orderSummary": "Сводка заказа",
+    "subtotal": "Промежуточный итог",
+    "discount": "Скидка",
+    "orderTotal": "Итого",
+    "confirmBooking": "Подтвердить заказ",
+    "waitingForDriver": "Ожидание водителя....",
+    "cancelRide": "Отменить поездку",
+    "riderCancelledSucces": "Поездка успешно отменена",
+    "failedToCancel": "Не удалось отменить поездку",
+    "pleaseWait": "Пожалуйста, подождите...",
+    "change": "Изменить",
+    "yourSosRequest": "Ваш SOS-запрос отправлен администратору",
+    "yourSosrequestAlreadySubmitted": "Ваш SOS-запрос уже отправлен",
+    "payNow": "Оплатить сейчас",
+    "youDoNothaveSufficientwalletBalance": "Недостаточно средств в кошельке",
+    "somethingWentWrong": "Произошла ошибка, пожалуйста, свяжитесь с администратором.",
+    "cash": "Наличные",
+    "coupon": "Промокод",
+    "couponNotFound": "Промокод не найден.",
+    "tapToApply": "Нажмите, чтобы применить",
+    "home": "Главная",
+    "myBookings": "Мои заказы",
+    "profile": "Профиль",
+    "wallet": "Кошелёк",
+    "cabServiceType": "Тип такси",
+    "everyRideVerified": "Каждая поездка. Каждый водитель. Проверены.",
+    "allDriversIDCheck": "Все водители проходят проверку документов и биографии для вашей безопасности.",
+    "intercity": "Междугородние",
+    "aroundTheCity": "По городу",
+    "rideDetails": "Детали поездки",
+    "orderId": "ID заказа:",
+    "bookingData": "Дата заказа:",
+    "rideAndFareSummary": "Детали поездки и стоимость",
+    "updateReview": "Обновить отзыв",
+    "addReview": "Добавить отзыв",
+    "complain": "Жалоба",
+    "distance": "Расстояние",
+    "km": "км",
+    "duration": "Продолжительность",
+    "howWasTrip": "Как прошла поездка?",
+    "yourFeedbackWillHelp": "Ваш отзыв поможет нам улучшить \n качество поездок",
+    "rateFor": "Оценка для",
+    "typeComment": "Введите комментарий....",
+    "title": "Заголовок",
+    "typeDescription": "Введите описание...",
+    "save": "Сохранить",
+    "popularDestinations": "Популярные направления",
+    "selectPaymentMethod": "Выберите способ оплаты",
+    "prefferedPayment": "Предпочтительный способ оплаты",
+    "otherPaymentOptions": "Другие способы оплаты",
+    "rideHistory": "История поездок",
+    "plsLoginToAcc": "Пожалуйста, войдите, чтобы продолжить",
+    "youAreNotLoggedIn": "Вы не вошли в систему. Пожалуйста, войдите, чтобы получить доступ к аккаунту и функциям.",
+    "noOrderfound": "Заказов не найдено",
+    "reset_password_link_sent": "Ссылка для сброса отправлена на {email}",
+    "pay_amount": "Сумма к оплате: {amount}",
+    "otherServices": "Другие услуги",
+    "foodDelivery": "Доставка еды",
+    "delivery": "Доставка",
+    "bookingTaxi": "Заказ \nТакси",
+    "updateYourWardrobe": "Обновите гардероб",
+    "weDeliverSafely": "Мы доставляем безопасно",
+    "rent": "Аренда",
+    "hugeSelectionOfAds": "Огромный выбор объявлений!",
+    "cosmetics": "Косметика",
+    "moreThan1000Products": "Более 1000 товаров",
+    "foodProducts": "Продукты питания",
+    "enableLocation": "Включите геолокацию",
+    "allowLocation": "Разрешите доступ к геолокации, чтобы найти магазины и услуги рядом с вами.",
+    "useCurrentLocation": "Использовать текущую геолокацию",
+    "setFromMap": "Выбрать на карте",
+    "enterManuallyLocation": "Введите адрес вручную",
+    "changeLanguage": "Изменить язык",
+    "selectPrefferedLanguage": "Выберите предпочитаемый язык для персонализированного использования приложения."
+}

assets/translations/uz.json

@@ -0,0 +1,124 @@
+{
+    "loginToExplore" : "Barcha xizmatlarimizdan foydalanish va qulay xarid qilish uchun tizimga kiring.",
+    "emailAddress": "Email manzil*",
+    "password": "Parol*",
+    "enterPassword": "Parolni kiriting",
+    "forgotPassword": "Parolni unutdingizmi",
+    "login": "Kirish",
+    "orContinueWith": "yoki davom eting",
+    "withGoogle": "Google orqali",
+    "withApple": "Apple orqali",
+    "dontHaveAccount": "Hisobingiz yo‘qmi?",
+    "signUp": "Ro‘yxatdan o‘tish",
+    "skip": "O‘tkazib yuborish",
+    "signUpToExplore": "Ro‘yxatdan o‘ting va barcha xizmatlarimizdan foydalanishni boshlang.",
+    "firstName": "Ism*",
+    "lastName": "Familiya*",
+    "enterMobileNumber": "Telefon raqamini kiriting",
+    "confirmPassword": "Parolni tasdiqlang*",
+    "enterConfirmPassword": "Tasdiqlash parolini kiriting",
+    "referralCode": "Referal kod",
+    "enterReferralCode": "Referal kodni kiriting",
+    "alreadyHaveAccount": "Hisobingiz bormi?",
+    "enterYourregisteredEmail": "Email manzilingizni kiriting — sizga parolni tiklash havolasi yuboriladi.",
+    "sendLink": "Havolani yuborish",
+    "rememberPassword": "Parol esingizga tushdimi?",
+    "enterOtpSent": "Telefoningizga yuborilgan kodni kiriting",
+    "resendOTP": "Kod qayta yuborilsin",
+    "verify": "Tasdiqlash",
+    "useYourMobileNumber": "Telefon raqamingiz orqali oson va xavfsiz kirishingiz mumkin.",
+    "sendCode": "Kod yuborish",
+    "serviceIsUnavailable": "Tanlangan manzilda xizmat mavjud emas.",
+    "pickUpLocation": "Jo‘nash manzili",
+    "destinationLocation": "Borish manzili",
+    "continueT": "Davom etish",
+    "plsSelectSourceLocation": "Iltimos, jo‘nash manzilini tanlang",
+    "plsSelectDestinationLocations": "Iltimos, borish manzilini tanlang",
+    "selectVehicleType": "Transport turini tanlang",
+    "plsSelectVehicleTypeFirst": "Avval transport turini tanlang.",
+    "plsSelectPaymentMethod": "Iltimos, to‘lov usulini tanlang",
+    "insufficientWallet": "Hamyonda mablag‘ yetarli emas. Boshqa to‘lov usulini tanlang.",
+    "promoCode": "Promo kod",
+    "thisOfferNotEligible": "Bu taklif ushbu buyurtma uchun amal qilmaydi",
+    "viewAll": "Barchasini ko‘rish",
+    "writeCoupon": "Promo kodni kiriting",
+    "redeemNow": "Qo‘llash",
+    "plsEnterCouponCode": "Iltimos, promo kodni kiriting",
+    "couponApplied": "Promo kod muvaffaqiyatli qo‘llandi",
+    "couponExpired": "Ushbu promo kodning muddati tugagan",
+    "invalidCouponCode": "Noto‘g‘ri promo kod",
+    "orderSummary": "Buyurtma tafsilotlari",
+    "subtotal": "Oraliq summa",
+    "discount": "Chegirma",
+    "orderTotal": "Umumiy summa",
+    "confirmBooking": "Buyurtmani tasdiqlash",
+    "waitingForDriver": "Haydovchi kutilmoqda....",
+    "cancelRide": "Safarni bekor qilish",
+    "riderCancelledSucces": "Safar muvaffaqiyatli bekor qilindi",
+    "failedToCancel": "Safarni bekor qilish amalga oshmadi",
+    "pleaseWait": "Iltimos, kuting...",
+    "change": "O‘zgartirish",
+    "yourSosRequest": "Sizning SOS so‘rovingiz administratorga yuborildi",
+    "yourSosrequestAlreadySubmitted": "SOS so‘rovi allaqachon yuborilgan",
+    "payNow": "Hozir to‘lash",
+    "youDoNothaveSufficientwalletBalance": "Hamyonda mablag‘ yetarli emas",
+    "somethingWentWrong": "Xatolik yuz berdi, administrator bilan bog‘laning.",
+    "cash": "Naqd",
+    "coupon": "Promo kod",
+    "couponNotFound": "Promo kod topilmadi.",
+    "tapToApply": "Qo‘llash uchun bosing",
+    "home": "Bosh sahifa",
+    "myBookings": "Buyurtmalarim",
+    "profile": "Profil",
+    "wallet": "Hamyon",
+    "cabServiceType": "Taksi xizmati turi",
+    "everyRideVerified": "Har bir safar. Har bir haydovchi. Tasdiqlangan.",
+    "allDriversIDCheck": "Barcha haydovchilar hujjat va tekshiruvdan o‘tadi — xavfsizligingiz uchun.",
+    "intercity": "Shaharlararo",
+    "aroundTheCity": "Shahar bo‘ylab",
+    "rideDetails": "Safar tafsilotlari",
+    "orderId": "Buyurtma ID:",
+    "bookingData": "Buyurtma sanasi:",
+    "rideAndFareSummary": "Safar va to‘lov tafsilotlari",
+    "updateReview": "Sharhni yangilash",
+    "addReview": "Sharh qoldirish",
+    "complain": "Shikoyat",
+    "distance": "Masofa",
+    "km": "km",
+    "duration": "Davomiylik",
+    "howWasTrip": "Safar qanday o‘tdi?",
+    "yourFeedbackWillHelp": "Fikringiz safar sifatini yanada yaxshilashga yordam beradi",
+    "rateFor": "Baholash:",
+    "typeComment": "Izoh yozing....",
+    "title": "Sarlavha",
+    "typeDescription": "Tavsif yozing...",
+    "save": "Saqlash",
+    "popularDestinations": "Mashhur yo‘nalishlar",
+    "selectPaymentMethod": "To‘lov usulini tanlang",
+    "prefferedPayment": "Afzal to‘lov usuli",
+    "otherPaymentOptions": "Boshqa to‘lov usullari",
+    "rideHistory": "Safar tarixi",
+    "plsLoginToAcc": "Davom etish uchun tizimga kiring",
+    "youAreNotLoggedIn": "Siz tizimga kirmagansiz. Hisobingizga kirib barcha funksiyalardan foydalaning.",
+    "noOrderfound": "Buyurtmalar topilmadi",
+    "reset_password_link_sent": "Parol tiklash havolasi {email} manziliga yuborildi",
+    "pay_amount": "To‘lanadigan summa: {amount}",
+    "otherServices": "Boshqa xizmatlar",
+    "foodDelivery": "Oziq-ovqat yetkazib berish",
+    "delivery": "Yetkazib berish",
+    "bookingTaxi": "Taksi \nBuyurtma",
+    "updateYourWardrobe": "Garderobingizni yangilang",
+    "weDeliverSafely": "Biz xavfsiz yetkazib beramiz",
+    "rent": "Ijara",
+    "hugeSelectionOfAds": "Keng e’lonlar tanlovi!",
+    "cosmetics": "Kosmetika",
+    "moreThan1000Products": "1000 dan ortiq mahsulotlar",
+    "foodProducts": "Oziq-ovqat mahsulotlari",
+    "enableLocation": "Shaxsiylashtirilgan tajriba uchun geolokatsiyani yoqing",
+    "allowLocation": "Yaqin atrofdagi do‘kon va xizmatlarni topish uchun geolokatsiyaga ruxsat bering.",
+    "useCurrentLocation": "Joriy manzildan foydalanish",
+    "setFromMap": "Xaritadan tanlash",
+    "enterManuallyLocation": "Manzilni qo‘lda kiriting",
+    "changeLanguage": "Tilni o‘zgartirish",
+    "selectPrefferedLanguage": "Shaxsiylashtirilgan tajriba uchun afzal tilni tanlang."
+}

firebase.json

@@ -1 +1 @@
-{"flutter":{"platforms":{"android":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:android:05002c15a64cf1e0c4ba1f","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"fondexuzb","configurations":{"android":"1:893074789710:android:05002c15a64cf1e0c4ba1f","ios":"1:893074789710:ios:510ebf9e4ebed6a8c4ba1f"}}},"ios":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:ios:510ebf9e4ebed6a8c4ba1f","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}}}}}
+{"flutter":{"platforms":{"android":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:android:e932bc88da6665b3c4ba1f","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"fondexuzb","configurations":{"android":"1:893074789710:android:e932bc88da6665b3c4ba1f","ios":"1:893074789710:ios:7dd456b65070f325c4ba1f"}}},"ios":{"default":{"projectId":"fondexuzb","appId":"1:893074789710:ios:7dd456b65070f325c4ba1f","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}}}}}

ios/Podfile.lock

@@ -1317,6 +1317,8 @@ PODS:
   - Flutter (1.0.0)
   - flutter_local_notifications (0.0.1):
     - Flutter
+  - flutter_localization (0.0.1):
+    - Flutter
   - flutter_osm_plugin (0.0.1):
     - Alamofire
     - Flutter
@@ -1500,7 +1502,9 @@ PODS:
     - Flutter
   - Polyline (5.1.0)
   - PromisesObjC (2.4.0)
-  - razorpay-pod (1.4.7)
+  - razorpay-core-pod (1.0.3)
+  - razorpay-pod (1.5.0):
+    - razorpay-core-pod
   - razorpay_flutter (1.1.10):
     - Flutter
     - razorpay-pod
@@ -1592,6 +1596,7 @@ DEPENDENCIES:
   - firebase_storage (from `.symlinks/plugins/firebase_storage/ios`)
   - Flutter (from `Flutter`)
   - flutter_local_notifications (from `.symlinks/plugins/flutter_local_notifications/ios`)
+  - flutter_localization (from `.symlinks/plugins/flutter_localization/ios`)
   - flutter_osm_plugin (from `.symlinks/plugins/flutter_osm_plugin/ios`)
   - fluttertoast (from `.symlinks/plugins/fluttertoast/ios`)
   - geocoding_ios (from `.symlinks/plugins/geocoding_ios/ios`)
@@ -1651,6 +1656,7 @@ SPEC REPOS:
     - OSMFlutterFramework
     - Polyline
     - PromisesObjC
+    - razorpay-core-pod
     - razorpay-pod
     - RecaptchaInterop
     - Stripe
@@ -1682,6 +1688,8 @@ EXTERNAL SOURCES:
     :path: Flutter
   flutter_local_notifications:
     :path: ".symlinks/plugins/flutter_local_notifications/ios"
+  flutter_localization:
+    :path: ".symlinks/plugins/flutter_localization/ios"
   flutter_osm_plugin:
     :path: ".symlinks/plugins/flutter_osm_plugin/ios"
   fluttertoast:
@@ -1758,13 +1766,14 @@ SPEC CHECKSUMS:
   FirebaseStorage: 20d6b56fb8a40ebaa03d6a2889fe33dac64adb73
   Flutter: cabc95a1d2626b1b06e7179b784ebcf0c0cde467
   flutter_local_notifications: a5a732f069baa862e728d839dd2ebb904737effb
+  flutter_localization: 72299fb6cb4e51cae587bd953ed0b958040b71e6
   flutter_osm_plugin: 3fb57665b32a81fcffa57c6206658d3a0d0d1a96
   fluttertoast: 2c67e14dce98bbdb200df9e1acf610d7a6264ea1
   geocoding_ios: 33776c9ebb98d037b5e025bb0e7537f6dd19646e
   geolocator_apple: ab36aa0e8b7d7a2d7639b3b4e48308394e8cef5e
   Google-Maps-iOS-Utils: 0a484b05ed21d88c9f9ebbacb007956edd508a96
   google_maps_flutter_ios: 0291eb2aa252298a769b04d075e4a9d747ff7264
-  google_sign_in_ios: 205742c688aea0e64db9da03c33121694a365109
+  google_sign_in_ios: 00dfa94252eb10278b64828c81bcb7158a81a53a
   GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
   GoogleMaps: 0608099d4870cac8754bdba9b6953db543432438
   GoogleSignIn: c7f09cfbc85a1abf69187be091997c317cc33b77
@@ -1773,7 +1782,7 @@ SPEC CHECKSUMS:
   gRPC-Core: 860978b7db482de8b4f5e10677216309b5ff6330
   GTMAppAuth: 217a876b249c3c585a54fd6f73e6b58c4f5c4238
   GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
-  image_picker_ios: 7fe1ff8e34c1790d6fff70a32484959f563a928a
+  image_picker_ios: e0ece4aa2a75771a7de3fa735d26d90817041326
   in_app_review: 7dd1ea365263f834b8464673f9df72c80c17c937
   leveldb-library: cc8b8f8e013647a295ad3f8cd2ddf49a6f19be19
   location: 155caecf9da4f280ab5fe4a55f94ceccfab838f8
@@ -1781,15 +1790,16 @@ SPEC CHECKSUMS:
   nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
   OSMFlutterFramework: 2f1260ac2854d3398b92403f2d5e012b4ca2c620
   package_info_plus: af8e2ca6888548050f16fa2f1938db7b5a5df499
-  path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564
+  path_provider_foundation: bb55f6dbba17d0dccd6737fe6f7f34fbd0376880
   permission_handler_apple: 4ed2196e43d0651e8ff7ca3483a069d469701f2d
   Polyline: 2a1f29f87f8d9b7de868940f4f76deb8c678a5b1
   PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
-  razorpay-pod: 7bbc8748a93377d1705f9119b2f947faa9c9e3e1
+  razorpay-core-pod: ef0309dbf8e3e5a1330f6cad89dcf9226d8ef758
+  razorpay-pod: f634f1b8397eb54d547f25d35291f679545ddf17
   razorpay_flutter: 0e98e4fcaae27ad50e011d85f66d85e0a008754a
   RecaptchaInterop: 11e0b637842dfb48308d242afc3f448062325aba
   share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a
-  shared_preferences_foundation: 9e1978ff2562383bd5676f64ec4e9aa8fa06a6f7
+  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
   sign_in_with_apple: c5dcc141574c8c54d5ac99dd2163c0c72ad22418
   sqflite_darwin: 20b2a3a3b70e43edae938624ce550a3cbf66a3d0
   Stripe: a4b6584549bac3698733ed564e55b0b067cfda8a
@@ -1801,9 +1811,9 @@ SPEC CHECKSUMS:
   StripePaymentSheet: 7bc20a0ab10d91acc06dc449ab61bb2cf221b0f4
   StripePaymentsUI: 1590647b3f635a58fb0e7058d86d3e9ff89250d4
   StripeUICore: a63d95d604e70a5895f9d6b09c49a46757e86353
-  url_launcher_ios: 694010445543906933d732453a59da0a173ae33d
+  url_launcher_ios: 7a95fa5b60cc718a708b8f2966718e93db0cef1b
   video_compress: f2133a07762889d67f0711ac831faa26f956980e
-  video_player_avfoundation: 2cef49524dd1f16c5300b9cd6efd9611ce03639b
+  video_player_avfoundation: dd410b52df6d2466a42d28550e33e4146928280a
   webview_flutter_wkwebview: 8ebf4fded22593026f7dbff1fbff31ea98573c8d
   Yams: e10dae147f517ed57ecae37c5e8681bdf8fcab65
 

ios/Runner.xcodeproj/project.pbxproj

@@ -496,7 +496,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 9J9XV5T2VN;
+				DEVELOPMENT_TEAM = N72LCPWT92;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Emart Customer";
@@ -504,10 +504,15 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.emart.customer;
+				PRODUCT_BUNDLE_IDENTIFIER = uz.felix.fondex.customer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Profile;
@@ -521,7 +526,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.emart.customer.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = felix.fondex.uz.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
@@ -539,7 +544,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.emart.customer.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = felix.fondex.uz.RunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -555,7 +560,7 @@
 				CURRENT_PROJECT_VERSION = 1;
 				GENERATE_INFOPLIST_FILE = YES;
 				MARKETING_VERSION = 1.0;
-				PRODUCT_BUNDLE_IDENTIFIER = com.emart.customer.RunnerTests;
+				PRODUCT_BUNDLE_IDENTIFIER = felix.fondex.uzRunnerTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Runner.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/Runner";
@@ -683,7 +688,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 9J9XV5T2VN;
+				DEVELOPMENT_TEAM = N72LCPWT92;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Emart Customer";
@@ -691,11 +696,16 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.emart.customer;
+				PRODUCT_BUNDLE_IDENTIFIER = uz.felix.fondex999;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Debug;
@@ -708,7 +718,7 @@
 				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
-				DEVELOPMENT_TEAM = 9J9XV5T2VN;
+				DEVELOPMENT_TEAM = N72LCPWT92;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Emart Customer";
@@ -716,10 +726,15 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.emart.customer;
+				PRODUCT_BUNDLE_IDENTIFIER = uz.felix.fondex.customer;
 				PRODUCT_NAME = "$(TARGET_NAME)";
+				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
+				SUPPORTS_MACCATALYST = NO;
+				SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO;
+				SUPPORTS_XR_DESIGNED_FOR_IPHONE_IPAD = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = 1;
 				VERSIONING_SYSTEM = "apple-generic";
 			};
 			name = Release;

ios/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -1,134 +1,128 @@
 {
-  "images": [
+  "images" : [
     {
-      "filename": "AppIcon@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "60x60"
+      "filename" : "Icon-App-20x20@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "filename": "AppIcon@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "60x60"
+      "filename" : "Icon-App-20x20@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "filename": "AppIcon~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "76x76"
+      "filename" : "Icon-App-29x29@1x.png",
+      "idiom" : "iphone",
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "filename": "AppIcon@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "76x76"
+      "filename" : "Icon-App-29x29@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "filename": "AppIcon-83.5@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "83.5x83.5"
+      "filename" : "Icon-App-29x29@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "filename": "AppIcon-40@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "40x40"
+      "filename" : "Icon-App-40x40@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "filename": "AppIcon-40@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "40x40"
+      "filename" : "Icon-App-40x40@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "filename": "AppIcon-40~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "40x40"
+      "filename" : "Icon-App-60x60@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
     },
     {
-      "filename": "AppIcon-40@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "40x40"
+      "filename" : "Icon-App-60x60@3x.png",
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "filename": "AppIcon-20@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "20x20"
+      "filename" : "Icon-App-20x20@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
-      "filename": "AppIcon-20@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "20x20"
+      "filename" : "Icon-App-20x20@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "filename": "AppIcon-20~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "20x20"
+      "filename" : "Icon-App-29x29@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "filename": "AppIcon-20@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "20x20"
+      "filename" : "Icon-App-29x29@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "filename": "AppIcon-29.png",
-      "idiom": "iphone",
-      "scale": "1x",
-      "size": "29x29"
+      "filename" : "Icon-App-40x40@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
-      "filename": "AppIcon-29@2x.png",
-      "idiom": "iphone",
-      "scale": "2x",
-      "size": "29x29"
+      "filename" : "Icon-App-40x40@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "filename": "AppIcon-29@3x.png",
-      "idiom": "iphone",
-      "scale": "3x",
-      "size": "29x29"
+      "filename" : "Icon-App-76x76@1x.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
-      "filename": "AppIcon-29~ipad.png",
-      "idiom": "ipad",
-      "scale": "1x",
-      "size": "29x29"
+      "filename" : "Icon-App-76x76@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
     },
     {
-      "filename": "AppIcon-29@2x~ipad.png",
-      "idiom": "ipad",
-      "scale": "2x",
-      "size": "29x29"
+      "filename" : "Icon-App-83.5x83.5@2x.png",
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
-      "filename": "AppIcon-60@2x~car.png",
-      "idiom": "car",
-      "scale": "2x",
-      "size": "60x60"
+      "filename" : "ItunesArtwork@2x.png",
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     },
     {
-      "filename": "AppIcon-60@3x~car.png",
-      "idiom": "car",
-      "scale": "3x",
-      "size": "60x60"
-    },
-    {
-      "filename": "AppIcon~ios-marketing.png",
-      "idiom": "ios-marketing",
-      "scale": "1x",
-      "size": "1024x1024"
+      "filename" : "Icon-App-76x76@2x.png",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "76x76"
     }
   ],
-  "info": {
-    "author": "iconkitchen",
-    "version": 1
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
   }
 }

ios/Runner/Assets.xcassets/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}