From 6fb86330f11c725182dee7169a8222fe2e4d8a9d Mon Sep 17 00:00:00 2001 From: FaizHashmiCS22 Date: Thu, 23 Mar 2023 11:33:56 +0300 Subject: [PATCH] Added few assets --- lib/generated/codegen_loader.g.dart | 42 +++++++++++++++++++++++++++-- lib/generated/locale_keys.g.dart | 19 +++++++++++++ lib/main.dart | 1 - lib/theme/app_theme.dart | 4 +-- pubspec.yaml | 2 +- 5 files changed, 62 insertions(+), 6 deletions(-) diff --git a/lib/generated/codegen_loader.g.dart b/lib/generated/codegen_loader.g.dart index 2bf0a3e..6dd9b28 100644 --- a/lib/generated/codegen_loader.g.dart +++ b/lib/generated/codegen_loader.g.dart @@ -161,7 +161,26 @@ class CodegenLoader extends AssetLoader{ "recommended_ads": "الإعلانات الموصى بها", "upcoming_appointment": "الموعد القادم", "my_service_providers": "مزودي الخدمة الجدد", - "appointment_details": "تفاصيل الموعد" + "appointment_details": "تفاصيل الموعد", + "no_city_available": "لا توجد مدينة متاحة لهذا البلد", + "branch_created": "تم إنشاء الفرع بنجاح", + "branch_updated": "تم تحديث الفرع بنجاح", + "branch_deleted": "تم حذف الفرع بنجاح", + "dashboard_main": "لوحة القيادة / الصفحة الرئيسية", + "logo_brand": "الشعار / العلامة التجارية", + "remove": "إزالة", + "no_branch": "لم يتم إضافة فرع حتى الآن", + "login_once": "الرجاء تسجيل الدخول مرة واحدة", + "defineLicenese": "تحميل التراخيص والشهادات", + "description": "وصف", + "attachFile": "أرفق ملف", + "branchLocation": "معلومات الفرع والموقع", + "tapToEdit": "انقر للتعديل", + "myServiceBranches": "فروع خدمتي", + "enter_licence_detail": "الرجاء إدخال تفاصيل السجلات التجارية وإرفاق صور الترخيص", + "country": "بلد", + "city": "مدينة", + "editServices": "تحرير الخدمات" }; static const Map en_US = { "firstTimeLogIn": "First Time Log In", @@ -310,7 +329,26 @@ static const Map en_US = { "recommended_ads": "Recommended Ads", "upcoming_appointment": "Upcoming Appointment", "my_service_providers": "My Recent Service Providers", - "appointment_details": "Appointment Details" + "appointment_details": "Appointment Details", + "no_city_available": "No City Available for this country", + "branch_created": "Branch is successfully created", + "branch_updated": "Branch is successfully Updated", + "branch_deleted": "Branch is successfully Deleted", + "dashboard_main": "Dashboard/Main Page", + "logo_brand": "Logo/Brand", + "remove": "Remove", + "no_branch": "No Branch Added Yet", + "login_once": "Please login once", + "defineLicenese": "Upload Licenses and Certificates", + "description": "Description", + "attachFile": "Attach File", + "branchLocation": "Branch info and Location", + "tapToEdit": "Tap to edit", + "myServiceBranches": "My Service Branches", + "enter_licence_detail": "Please enter the detail for commercial records and attach the license images", + "country": "country", + "city": "city", + "editServices": "Edit Services" }; static const Map> mapLocales = {"ar_SA": ar_SA, "en_US": en_US}; } diff --git a/lib/generated/locale_keys.g.dart b/lib/generated/locale_keys.g.dart index 6b2c80b..8c87b09 100644 --- a/lib/generated/locale_keys.g.dart +++ b/lib/generated/locale_keys.g.dart @@ -126,5 +126,24 @@ abstract class LocaleKeys { static const upcoming_appointment = 'upcoming_appointment'; static const my_service_providers = 'my_service_providers'; static const appointment_details = 'appointment_details'; + static const no_city_available = 'no_city_available'; + static const branch_created = 'branch_created'; + static const branch_updated = 'branch_updated'; + static const branch_deleted = 'branch_deleted'; + static const dashboard_main = 'dashboard_main'; + static const logo_brand = 'logo_brand'; + static const remove = 'remove'; + static const no_branch = 'no_branch'; + static const login_once = 'login_once'; + static const defineLicenese = 'defineLicenese'; + static const description = 'description'; + static const attachFile = 'attachFile'; + static const branchLocation = 'branchLocation'; + static const tapToEdit = 'tapToEdit'; + static const myServiceBranches = 'myServiceBranches'; + static const enter_licence_detail = 'enter_licence_detail'; + static const country = 'country'; + static const city = 'city'; + static const editServices = 'editServices'; } diff --git a/lib/main.dart b/lib/main.dart index 20bb940..44fdfbb 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -80,7 +80,6 @@ class MyApp extends StatelessWidget { navigatorKey: navigatorKey, theme: AppTheme.getTheme( isArabic: EasyLocalization.of(context)?.locale.languageCode == "ar", - englishFont: MyFonts.poppinsFont, ), debugShowCheckedModeBanner: false, localizationsDelegates: delegates, diff --git a/lib/theme/app_theme.dart b/lib/theme/app_theme.dart index 6f32f57..ffe07b2 100644 --- a/lib/theme/app_theme.dart +++ b/lib/theme/app_theme.dart @@ -3,8 +3,8 @@ import 'package:flutter/material.dart'; import 'colors.dart'; class AppTheme { - static getTheme({required isArabic, String? englishFont}) => ThemeData( - fontFamily: !isArabic ? englishFont : null, + static getTheme({required isArabic}) => ThemeData( + fontFamily: !isArabic ? "Poppins" : null, primaryColor: primaryColor, primaryTextTheme: const TextTheme( titleLarge: TextStyle(color: Colors.white), diff --git a/pubspec.yaml b/pubspec.yaml index e2d2ab8..b426b6e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -57,7 +57,7 @@ flutter: - assets/langs/ - assets/icons/ - assets/images/ - - assets/fonts/ + - assets/fonts/Poppins-Medium.ttf fonts: - family: Poppins