Skip to content

Commit

Permalink
Fixed Bug
Browse files Browse the repository at this point in the history
  • Loading branch information
mirmoktadir committed Aug 17, 2023
1 parent 3e19547 commit 35cd241
Show file tree
Hide file tree
Showing 8 changed files with 65 additions and 77 deletions.
Binary file removed assets/images/readmeOnly/bg1.png
Binary file not shown.
Binary file removed assets/images/readmeOnly/bg2.png
Binary file not shown.
16 changes: 8 additions & 8 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -634,7 +634,7 @@ PODS:
- BoringSSL-GRPC/Implementation (0.0.24):
- BoringSSL-GRPC/Interface (= 0.0.24)
- BoringSSL-GRPC/Interface (0.0.24)
- cloud_firestore (4.8.4):
- cloud_firestore (4.8.5):
- Firebase/Firestore (= 10.12.0)
- firebase_core
- Flutter
Expand Down Expand Up @@ -689,14 +689,14 @@ PODS:
- Firebase/Messaging (10.12.0):
- Firebase/CoreOnly
- FirebaseMessaging (~> 10.12.0)
- firebase_auth (4.7.2):
- firebase_auth (4.7.3):
- Firebase/Auth (= 10.12.0)
- firebase_core
- Flutter
- firebase_core (2.15.0):
- firebase_core (2.15.1):
- Firebase/CoreOnly (= 10.12.0)
- Flutter
- firebase_messaging (14.6.5):
- firebase_messaging (14.6.6):
- Firebase/Messaging (= 10.12.0)
- firebase_core
- Flutter
Expand Down Expand Up @@ -926,16 +926,16 @@ EXTERNAL SOURCES:
SPEC CHECKSUMS:
abseil: 926fb7a82dc6d2b8e1f2ed7f3a718bce691d1e46
BoringSSL-GRPC: 3175b25143e648463a56daeaaa499c6cb86dad33
cloud_firestore: 005e157ad342dbfb2e461cb111a9020aa71bfb22
cloud_firestore: c556fefce96568e422e453bf9aeda683dd435367
connectivity_plus: 07c49e96d7fc92bc9920617b83238c4d178b446a
device_info_plus: 7545d84d8d1b896cb16a4ff98c19f07ec4b298ea
DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
file_picker: ce3938a0df3cc1ef404671531facef740d03f920
Firebase: 07150e75d142fb9399f6777fa56a187b17f833a0
firebase_auth: 3f7820b22557dd4a1b024f4d86947d1a0ff8a10f
firebase_core: e477125798fc37cd4ab43ca6a8536bf7e0929c00
firebase_messaging: 334d68c3a36b6d4d5cd91e4f42509e0d4ae49828
firebase_auth: 95f4a6acafa6a7a0d902aa467dd4d7ca336ee4be
firebase_core: 4a3246a02f828a01c74a2c26427037786d90f17f
firebase_messaging: 13b378c8449cae7ec96c79570170943dd73d4738
FirebaseAppCheckInterop: 5e12dc623d443dedffcde9c6f3ed41510125d8ef
FirebaseAuth: a66c1e14ec58f41d154a4b41ce1a23ea00ad4805
FirebaseCore: f86a1394906b97ac445ae49c92552a9425831bed
Expand Down
50 changes: 19 additions & 31 deletions lib/app/components/navbar/bottom_navbar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -51,27 +51,21 @@ class BottomNavbar extends GetView<NavbarController> {
SizedBox(
height: 40.h,
width: 40.w,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
padding: EdgeInsets.zero,
splashFactory: NoSplash.splashFactory,
backgroundColor: Colors.transparent,
),
child: IconButton(
hoverColor: Colors.transparent,
onPressed: () {
controller.onTap(0);
},
child: Center(
child: Icon(
controller.selectedIndex.value == 0
? IconlyBold.home
: IconlyLight.home,
color: Colors.white,
size: 32,
),
icon: Icon(
controller.selectedIndex.value == 0
? IconlyBold.home
: IconlyLight.home,
color: Colors.white,
size: 25.sp,
),
),
),
const SizedBox(height: 3),
SizedBox(height: 2.sp),
Container(
height: 8,
width: 8,
Expand All @@ -92,27 +86,21 @@ class BottomNavbar extends GetView<NavbarController> {
SizedBox(
height: 40.h,
width: 40.w,
child: ElevatedButton(
style: ElevatedButton.styleFrom(
padding: EdgeInsets.zero,
splashFactory: NoSplash.splashFactory,
backgroundColor: Colors.transparent,
),
child: IconButton(
hoverColor: Colors.transparent,
onPressed: () {
controller.onTap(1);
},
child: Center(
child: Icon(
controller.selectedIndex.value == 1
? IconlyBold.graph
: IconlyLight.graph,
color: Colors.white,
size: 32,
),
icon: Icon(
controller.selectedIndex.value == 1
? IconlyBold.graph
: IconlyLight.graph,
color: Colors.white,
size: 25.sp,
),
),
),
const SizedBox(height: 3),
SizedBox(height: 2.sp),
Container(
height: 8,
width: 8,
Expand All @@ -134,4 +122,4 @@ class BottomNavbar extends GetView<NavbarController> {
)),
);
}
}
}
14 changes: 7 additions & 7 deletions lib/app/service/helper/dialog_helper.dart
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ class DialogHelper {
color: Colors.redAccent,
fontWeight: FontWeight.w400,
fontSize: 16.sp,

),
maxLines: 4, overflow: TextOverflow.ellipsis,
maxLines: 4,
overflow: TextOverflow.ellipsis,
),
SizedBox(height: 5.h),
Lottie.asset(
Expand Down Expand Up @@ -97,20 +97,20 @@ class DialogHelper {
),
// Loader
SizedBox(
height: 60.h,
width: 60.w,
child: const CircularProgressIndicator()),
height: 60.sp,
width: 60.sp,
child: const CircularProgressIndicator(),
),
],
),
),
),
);
}

//hide loading
static void hideLoading() {
if (Get.isDialogOpen!) {
Get.back();
}
}
}
}
2 changes: 1 addition & 1 deletion lib/utils/constants.dart
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
class AppImages {
static String get kAppIcon => 'assets/images/icon-splash/app_icon.png';
}
}
52 changes: 26 additions & 26 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ packages:
dependency: transitive
description:
name: _flutterfire_internals
sha256: "5dce45a06d386358334eb1689108db6455d90ceb0d75848d5f4819283d4ee2b8"
sha256: "1a5e13736d59235ce0139621b4bbe29bc89839e202409081bc667eb3cd20674c"
url: "https://pub.dev"
source: hosted
version: "1.3.4"
version: "1.3.5"
analyzer:
dependency: transitive
description:
Expand Down Expand Up @@ -205,26 +205,26 @@ packages:
dependency: "direct main"
description:
name: cloud_firestore
sha256: f1a06ad4499ed9ab73703560d44893e6b9e66ce3923c9121f4ef3981c972057f
sha256: "6ffb0e84efbaab16245994bcf61ba10a98ee1e73bac075cae8036ba6427a7ac0"
url: "https://pub.dev"
source: hosted
version: "4.8.4"
version: "4.8.5"
cloud_firestore_platform_interface:
dependency: transitive
description:
name: cloud_firestore_platform_interface
sha256: "86bd1865abbeb09a7d09da3e70364a09f894937270651fc611a1c6d6a9f7b02c"
sha256: "1487af8fd74a9ca754995cae1cf6bb2440ac4a93a5f7c7bbe7cc434231cc03c9"
url: "https://pub.dev"
source: hosted
version: "5.15.3"
version: "5.15.4"
cloud_firestore_web:
dependency: transitive
description:
name: cloud_firestore_web
sha256: ac2eeb2a7ab1928c3aacc30eed750fa839d6f620e112a5459e321df217be2f47
sha256: c3d37dad0b5637ab337acc4ab204e6d739e3be0e7972cdc85bdc4aac5145c92d
url: "https://pub.dev"
source: hosted
version: "3.6.3"
version: "3.6.4"
code_builder:
dependency: transitive
description:
Expand Down Expand Up @@ -373,34 +373,34 @@ packages:
dependency: "direct main"
description:
name: firebase_auth
sha256: "49fd35ce06f2530dd460e5dc123235731cb61dd7c76b0af4b6e190404880d04d"
sha256: ae8029eee0ed24a0ae4a9bcc94c5ef9c2e0c31066c5132c56575da929dd14a46
url: "https://pub.dev"
source: hosted
version: "4.7.2"
version: "4.7.3"
firebase_auth_platform_interface:
dependency: transitive
description:
name: firebase_auth_platform_interface
sha256: "817f3ceb84ef5e9adaaf50cf7a19255f6ffcdd12c6f9e9aa4cf00fc7f2eb3cfb"
sha256: cb099fbd3d48f7983c8d7cea45947d98d36174fb7d611e4ff08f802491e8a945
url: "https://pub.dev"
source: hosted
version: "6.16.1"
version: "6.16.2"
firebase_auth_web:
dependency: transitive
description:
name: firebase_auth_web
sha256: e9044778287f1ff8f9f4cee7e247b03ec87bb8977e0e65ad27dc337e196132e8
sha256: d35abf4c6c77c9e7be5d7a637e6e07765b70426015800ba031257f382bff5f83
url: "https://pub.dev"
source: hosted
version: "5.6.2"
version: "5.6.3"
firebase_core:
dependency: "direct main"
description:
name: firebase_core
sha256: "2e9324f719e90200dc7d3c4f5d2abc26052f9f2b995d3b6626c47a0dfe1c8192"
sha256: c78132175edda4bc532a71e01a32964e4b4fcf53de7853a422d96dac3725f389
url: "https://pub.dev"
source: hosted
version: "2.15.0"
version: "2.15.1"
firebase_core_platform_interface:
dependency: transitive
description:
Expand All @@ -413,34 +413,34 @@ packages:
dependency: transitive
description:
name: firebase_core_web
sha256: "0fd5c4b228de29b55fac38aed0d9e42514b3d3bd47675de52bf7f8fccaf922fa"
sha256: "4cf4d2161530332ddc3c562f19823fb897ff37a9a774090d28df99f47370e973"
url: "https://pub.dev"
source: hosted
version: "2.6.0"
version: "2.7.0"
firebase_messaging:
dependency: "direct main"
description:
name: firebase_messaging
sha256: "8ac91d83a028eef050de770f1dc98421e215714d245f34de7b154d436676fbd0"
sha256: db4a38be54fd84849c21be1ae1b44f0d4637eec1069bf5c49ea95e81f582bbc0
url: "https://pub.dev"
source: hosted
version: "14.6.5"
version: "14.6.6"
firebase_messaging_platform_interface:
dependency: transitive
description:
name: firebase_messaging_platform_interface
sha256: b2995e3640efb646e9ebf0e2fa50dea84895f0746a31d7e3af0e5e009a533a1a
sha256: "164119eed47ff19284e28bea9165a03da110c56ea09dd996622cfccad14d0efd"
url: "https://pub.dev"
source: hosted
version: "4.5.4"
version: "4.5.5"
firebase_messaging_web:
dependency: transitive
description:
name: firebase_messaging_web
sha256: "5d8446a28339124a2cb4f57a6ca454a3aca7d0c5c0cdfa5707afb192f7c830a7"
sha256: "6196d20731733834d7afb175c4345be57ddbd5daebca83cd52a430d62c2279fe"
url: "https://pub.dev"
source: hosted
version: "3.5.4"
version: "3.5.5"
fixnum:
dependency: transitive
description:
Expand Down Expand Up @@ -956,10 +956,10 @@ packages:
dependency: transitive
description:
name: platform
sha256: "4a451831508d7d6ca779f7ac6e212b4023dd5a7d08a27a63da33756410e32b76"
sha256: "57c07bf82207aee366dfaa3867b3164e4f03a238a461a11b0e8a3a510d51203d"
url: "https://pub.dev"
source: hosted
version: "3.1.0"
version: "3.1.1"
plugin_platform_interface:
dependency: transitive
description:
Expand Down
8 changes: 4 additions & 4 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ dependencies:
flutter_otp_text_field: ^1.1.1
flutter_launcher_icons: ^0.13.1
flutter_native_splash: ^2.3.2
firebase_core: ^2.15.0
firebase_auth: ^4.7.2
cloud_firestore: ^4.8.4
firebase_messaging: ^14.6.5
firebase_core: ^2.15.1
firebase_auth: ^4.7.3
cloud_firestore: ^4.8.5
firebase_messaging: ^14.6.6
carousel_slider: ^4.2.1
cached_network_image: ^3.2.3
graphql_flutter: ^5.1.2
Expand Down

0 comments on commit 35cd241

Please sign in to comment.