diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-Black.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-Black.ttf new file mode 100644 index 0000000000000000000000000000000000000000..997186d421217dd744c9e7e9a2c963cfee5fc2e2 Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-Black.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-BlackItalic.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-BlackItalic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..edd297b2cc9c5703dc6adb2546a25417604e1c5c Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-BlackItalic.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-Bold.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-Bold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..10b68f9b63a5fbb75fc99787be1af927254d9e3e Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-Bold.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-BoldItalic.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-BoldItalic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..1be176f92d02c2e6d6916be2555320c315758b06 Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-BoldItalic.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-ExtraBold.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-ExtraBold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..d7d6a80b723cda071de208690cc3fa248fca6617 Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-ExtraBold.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-ExtraBoldItalic.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-ExtraBoldItalic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..2042a6f7a328235078cca3e4243a1ba5c047f6d4 Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-ExtraBoldItalic.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-ExtraLight.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-ExtraLight.ttf new file mode 100644 index 0000000000000000000000000000000000000000..02f7c48ede6b540dbde62c45f7ddde09ee709d68 Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-ExtraLight.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-ExtraLightItalic.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-ExtraLightItalic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..ebe621d544ba3214ae34ccea6a0dfc5bccc08fdb Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-ExtraLightItalic.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-Italic.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-Italic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..f8987cb02c7208ef9ceb8c5a9128ad467b7a25d6 Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-Italic.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-Light.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-Light.ttf new file mode 100644 index 0000000000000000000000000000000000000000..9d7371a65242542fb4807835895f9d92fb39ebd0 Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-Light.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-LightItalic.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-LightItalic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..d857e5e1d3d834052420abcc4e16adbc6d217800 Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-LightItalic.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-Medium.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-Medium.ttf new file mode 100644 index 0000000000000000000000000000000000000000..874fcf400a95c7ffeaae71dbd1c463f75cb1e1a9 Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-Medium.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-MediumItalic.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-MediumItalic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..3caca8646f3ce5ab7cf0c159b880e68ec18fdd9a Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-MediumItalic.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-Regular.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-Regular.ttf new file mode 100644 index 0000000000000000000000000000000000000000..880ed948b7ae305bd5bd10e2e486e4e9f6b2493a Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-Regular.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-SemiBold.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-SemiBold.ttf new file mode 100644 index 0000000000000000000000000000000000000000..19c4f52e1bfdcd0cf47914bda32034e6cb3cd614 Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-SemiBold.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-SemiBoldItalic.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-SemiBoldItalic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..310e5a8bbd62051fde09e017d22f9d4f6281294a Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-SemiBoldItalic.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-Thin.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-Thin.ttf new file mode 100644 index 0000000000000000000000000000000000000000..2f0e88ba84845d91467da21c0acb10019248fdcf Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-Thin.ttf differ diff --git a/assets/fonts/beVietnamPro/BeVietnamPro-ThinItalic.ttf b/assets/fonts/beVietnamPro/BeVietnamPro-ThinItalic.ttf new file mode 100644 index 0000000000000000000000000000000000000000..7bd95d33dba8ed4efd95791c580f22280b819204 Binary files /dev/null and b/assets/fonts/beVietnamPro/BeVietnamPro-ThinItalic.ttf differ diff --git a/lib/constants/font_constants.dart b/lib/constants/font_constants.dart index 80916342e2796229feaf6e2d1868b3f44c4820b5..3e60c8a67f8a38b229539cf474d7bbdf7fb2aa24 100644 --- a/lib/constants/font_constants.dart +++ b/lib/constants/font_constants.dart @@ -1,4 +1,6 @@ class FontConstants { - static const String fontFamily = "assets/googleFonts/figTree/Figtree.ttf"; + static const String fontFamily = "assets/googleFonts/beVietnamPro/BeVietnamPro.ttf"; static const String fontFamilyValue = "assets/googleFonts/figTree/Figtree.ttf"; + + static const String fontFamilyName = "Be Vietnam Pro"; } \ No newline at end of file diff --git a/lib/firebaseServices/firebase_service.dart b/lib/firebaseServices/firebase_service.dart new file mode 100644 index 0000000000000000000000000000000000000000..0934e1881699815cd2ee41590c157d5dec7791ef --- /dev/null +++ b/lib/firebaseServices/firebase_service.dart @@ -0,0 +1,75 @@ +import 'package:cloud_firestore/cloud_firestore.dart'; +import 'package:exide_crr/data/firestore_service.dart'; +import 'package:exide_crr/model/condition_data.dart'; +import 'package:exide_crr/utils/helper_class.dart'; + +class FirebaseService { + + + /// Initialize Firebase + final FirebaseFirestore db = FireStoreService().fireStore; + // static FirebaseFirestore db = FirebaseFirestore.instance; + static final FirebaseService instance = FirebaseService._internal(); + FirebaseService._internal(); + + Future<String> addNewRecord({collectionName, body}) async { + var query = db.collection(collectionName); + String docId = ""; + + if(body != null) { + var snapshot = await query.add(body); + docId = snapshot.id; + } + + return docId; + } + + Future<void> updateRecord({collectionName, body, docId}) async { + var query = db.collection(collectionName); + + if(docId != null && body != null) { + await query.doc(docId).update(body); + } + } + + Future<void> deleteRecord({collectionName, docId}) async { + var query = db.collection(collectionName); + if(docId != null) { + await query.doc(docId).delete(); + } + } + + Future<List<Map<String, dynamic>>> getAllRecord({required String collectionName, List<ConditionData>? conditions}) async { + var query = db.collection(collectionName); + if(conditions != null) { + for (var element in conditions) { + query.where(element.key!, isEqualTo: element.value!); + } + } + + // query.where("id", isEqualTo: "hello").where("p", isEqualTo: "uhfe"); + HelperClass.printWrapped("query====${query.toString()}"); + + var snapshot = await query.get(); + var data = snapshot.docs.map((e) => e.data()).toList(); + + HelperClass.printWrapped("data====${data.toString()}"); + + return data; + } + + Future<Map<String, dynamic>?> getSingleRecord({required String collectionName, required String docId, List<ConditionData>? conditions}) async { + var query = db.collection(collectionName); + if(conditions != null) { + for (var element in conditions) { + query.where(element.key!, isEqualTo: element.value!); + } + } + HelperClass.printWrapped("query====${query.toString()}"); + + var snapshot = await query.doc(docId).get(); + var data = snapshot.data(); + + return data; + } +} \ No newline at end of file diff --git a/lib/model/condition_data.dart b/lib/model/condition_data.dart new file mode 100644 index 0000000000000000000000000000000000000000..cf0f42fa0e0221d0ac6ea44a889aecae11054631 --- /dev/null +++ b/lib/model/condition_data.dart @@ -0,0 +1,20 @@ +class ConditionData { + String? key; + String? value; + + ConditionData({ + this.key, + this.value + }); + + factory ConditionData.fromJson(Map<String, dynamic> json) => + ConditionData( + key: json["key"], + value: json["value"] + ); + + Map<String, dynamic> toJson() => { + "key": key, + "value": value + }; +} \ No newline at end of file diff --git a/lib/utils/res/styles.dart b/lib/utils/res/styles.dart index c1772cb63052be82a210cea09320b5877bf7f9ae..d2990f4422ef9c69af4ecb0db343c43362b2e11e 100644 --- a/lib/utils/res/styles.dart +++ b/lib/utils/res/styles.dart @@ -9,7 +9,7 @@ import 'package:google_fonts/google_fonts.dart'; class Styles { static TextStyle fontStyle = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: TextSize.textRegularSize, fontWeight: FontWeight.w500, fontStyle: FontStyle.normal, @@ -18,7 +18,7 @@ class Styles { ); static TextStyle subFontStyle = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: TextSize.textSmallSize, fontWeight: FontWeight.w400, fontStyle: FontStyle.normal, @@ -33,7 +33,7 @@ class Styles { fontFamily: FontConstants.fontFamily); static TextStyle textFieldTitleStyle = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: TextSize.textSmallSize, fontWeight: FontWeight.w500, fontStyle: FontStyle.normal, @@ -41,7 +41,7 @@ class Styles { color: AppColor.fontColor, ); static TextStyle errorMessageStyle = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: TextSize.textSmallSize, fontWeight: FontWeight.w400, fontStyle: FontStyle.normal, @@ -50,7 +50,7 @@ class Styles { ); static TextStyle errorMessageStyleMobile = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: TextSize.textSmallSize, fontWeight: FontWeight.w400, fontStyle: FontStyle.normal, @@ -65,7 +65,7 @@ class Styles { fontFamily: FontConstants.fontFamily); static TextStyle textFieldStyle = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: TextSize.textRegularSize, fontWeight: FontWeight.w500, fontStyle: FontStyle.normal, @@ -74,7 +74,7 @@ class Styles { ); static TextStyle textFieldErrorStyle = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: TextSize.textRegularSize, fontWeight: FontWeight.w500, fontStyle: FontStyle.normal, @@ -83,7 +83,7 @@ class Styles { ); static TextStyle textStyle = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: GetPlatform.isWeb ? TextSize.textRegularSize : TextSize.textRegularSize.sp, @@ -94,7 +94,7 @@ class Styles { ); static TextStyle textStyleMobile = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: TextSize.textXSmallSize, fontWeight: FontWeight.w400, fontStyle: FontStyle.normal, @@ -109,7 +109,7 @@ class Styles { fontFamily: FontConstants.fontFamily); static TextStyle hintTextFieldStyle = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: TextSize.textRegularSize, fontWeight: FontWeight.w500, fontStyle: FontStyle.normal, @@ -184,7 +184,7 @@ class Styles { color: AppColor.greyColor); static TextStyle verifyUserWebTextStyle = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: TextSize.textRegularSize, fontWeight: FontWeight.w500, fontStyle: FontStyle.normal, @@ -193,7 +193,7 @@ class Styles { ); static TextStyle mandatoryTitleStyle = GoogleFonts.getFont( - "Figtree", + FontConstants.fontFamilyName, fontSize: TextSize.textSmallSize, fontWeight: FontWeight.w500, fontStyle: FontStyle.normal, diff --git a/lib/views/splash/splash_screen.dart b/lib/views/splash/splash_screen.dart index f8c1160315c2235dcd84537166c9342589ac8476..16ea397b71e68c92af17892867dafe6385cd2785 100644 --- a/lib/views/splash/splash_screen.dart +++ b/lib/views/splash/splash_screen.dart @@ -1,4 +1,6 @@ import 'package:exide_crr/appbar/empty_app_bar.dart'; +import 'package:exide_crr/firebaseServices/firebase_service.dart'; +import 'package:exide_crr/model/condition_data.dart'; import 'package:exide_crr/res/app_color_text_size.dart'; import 'package:exide_crr/utils/res/styles.dart'; import 'package:flutter/material.dart'; @@ -30,8 +32,18 @@ class SplashScreen extends StatelessWidget { mainAxisAlignment: MainAxisAlignment.center, children: [ GestureDetector( - onTap: () { + onTap: () async { Get.updateLocale(const Locale("en", "US")); + + FirebaseService firebaseService = FirebaseService.instance; + + await firebaseService.getAllRecord( + collectionName: "awc", + conditions: [ + ConditionData(key: "id", value: "hello"), + ConditionData(key: "productId", value: "hello"), + ] + ); }, child: Container( width: 120, diff --git a/pubspec.yaml b/pubspec.yaml index 7232101a42a031fe4cae790fc02a0a5d21c66420..c2dca227621ebb159c763007a759adcd58ecc54c 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -130,6 +130,27 @@ flutter: - asset: assets/fonts/figTree/Figtree-Medium.ttf - asset: assets/fonts/figTree/Figtree-Regular.ttf - asset: assets/fonts/figTree/Figtree-SemiBold.ttf + + - family: Be Vietnam Pro + fonts: + - asset: assets/fonts/beVietnamPro/BeVietnamPro-Black.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-BlackItalic.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-Bold.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-BoldItalic.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-ExtraBold.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-ExtraBoldItalic.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-ExtraLight.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-ExtraLightItalic.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-Italic.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-Light.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-LightItalic.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-Medium.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-MediumItalic.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-Regular.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-SemiBold.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-SemiBoldItalic.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-Thin.ttf + - asset: assets/fonts/beVietnamPro/BeVietnamPro-ThinItalic.ttf # fonts: # - family: Schyler # fonts: