From 78a6aa2ec5ce01a08adc57d649827060b14b8b47 Mon Sep 17 00:00:00 2001 From: TejasBaid Date: Thu, 16 Jan 2025 14:43:53 +0530 Subject: [PATCH 1/2] Emoji bar issue fixed --- .gitignore | 2 ++ iOS/Podfile.lock | 14 +++++++------- lib/view/homescreen.dart | 25 ++++++++++++++----------- lib/view/widgets/homescreentabs.dart | 3 +++ lib/view/widgets/vectorview.dart | 6 +++--- 5 files changed, 29 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index f93043f44..3c3b56c2c 100644 --- a/.gitignore +++ b/.gitignore @@ -5,9 +5,11 @@ *.swp .DS_Store .atom/ +.build/ .buildlog/ .history .svn/ +.swiftpm/ migrate_working_dir/ # IntelliJ related diff --git a/iOS/Podfile.lock b/iOS/Podfile.lock index ab3c672f2..167fd1f4e 100644 --- a/iOS/Podfile.lock +++ b/iOS/Podfile.lock @@ -85,16 +85,16 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60 - file_picker: 9b3292d7c8bc68c8a7bf8eb78f730e49c8efc517 + file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655 Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7 - flutter_blue_plus: e5808fc4e5ebc58bb911635f8fdaf5e2b4da2754 - integration_test: 4a889634ef21a45d28d50d622cf412dc6d9f586e - path_provider_foundation: 080d55be775b7414fd5a5ef3ac137b97b097e564 + flutter_blue_plus: 4837da7d00cf5d441fdd6635b3a57f936778ea96 + integration_test: 252f60fa39af5e17c3aa9899d35d908a0721b573 + path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46 SDWebImage: 73c6079366fea25fa4bb9640d5fb58f0893facd8 - share_plus: 50da8cb520a8f0f65671c6c6a99b3617ed10a58a + share_plus: 8b6f8b3447e494cca5317c8c3073de39b3600d1f SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4 - url_launcher_ios: 694010445543906933d732453a59da0a173ae33d + url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe PODFILE CHECKSUM: 819463e6a0290f5a72f145ba7cde16e8b6ef0796 -COCOAPODS: 1.16.2 +COCOAPODS: 1.15.2 diff --git a/lib/view/homescreen.dart b/lib/view/homescreen.dart index 6be947475..5dd9d7ac7 100644 --- a/lib/view/homescreen.dart +++ b/lib/view/homescreen.dart @@ -189,13 +189,12 @@ class _HomeScreenState extends State Visibility( visible: isPrefixIconClicked, child: Container( - height: 150.h, decoration: BoxDecoration( borderRadius: BorderRadius.circular(10.r), color: backCircleColor), margin: EdgeInsets.symmetric(horizontal: 15.w), padding: EdgeInsets.symmetric( - vertical: 10.h, horizontal: 10.w), + vertical: 5.h, horizontal: 5.w), child: VectorGridView())), TabBar( indicatorSize: TabBarIndicatorSize.tab, @@ -272,19 +271,19 @@ class _HomeScreenState extends State }, child: Container( padding: EdgeInsets.symmetric( - horizontal: 33.w, vertical: 8.h), + horizontal: 35.w, vertical: 8.h), decoration: BoxDecoration( - borderRadius: BorderRadius.circular(2.r), - color: mdGrey400, + borderRadius: BorderRadius.circular(10.r), + color: colorAccent, ), - child: const Text('Save'), + child: const Text('Save', style: TextStyle(color: Colors.white, fontWeight: FontWeight.bold),), ), ), ], ), ), SizedBox( - width: 100.w, + width: 75.w, ), Container( padding: EdgeInsets.symmetric(vertical: 20.h), @@ -311,10 +310,14 @@ class _HomeScreenState extends State padding: EdgeInsets.symmetric( horizontal: 20.w, vertical: 8.h), decoration: BoxDecoration( - borderRadius: BorderRadius.circular(2.r), - color: mdGrey400, - ), - child: const Text('Transfer'), + borderRadius: BorderRadius.circular(10.r), + color: Colors.white, // White background + border: Border.all( + color: colorAccent, // Accent color border + width: 2.0, // Border width + ), + ), + child: const Text('Transfer', style: TextStyle(color: colorAccent, fontWeight: FontWeight.bold),), ), ), ], diff --git a/lib/view/widgets/homescreentabs.dart b/lib/view/widgets/homescreentabs.dart index 16269f21c..dd693ad63 100644 --- a/lib/view/widgets/homescreentabs.dart +++ b/lib/view/widgets/homescreentabs.dart @@ -2,6 +2,7 @@ import 'package:badgemagic/constants.dart'; import 'package:badgemagic/view/widgets/animation_container.dart'; import 'package:badgemagic/view/widgets/effects_container.dart'; import 'package:flutter/material.dart'; +import 'package:flutter_screenutil/flutter_screenutil.dart'; //effects tab to show effects that the user can select class EffectTab extends StatefulWidget { @@ -24,6 +25,7 @@ class _EffectsTabState extends State { return Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ + SizedBox(height: 15.h,), EffectContainer( effect: effInvert, effectName: 'Invert', @@ -59,6 +61,7 @@ class _AnimationTabState extends State { Widget build(BuildContext context) { return Column( children: [ + SizedBox(height: 15.h,), Row( children: [ AniContainer( diff --git a/lib/view/widgets/vectorview.dart b/lib/view/widgets/vectorview.dart index aeded0e0b..0bf90d1d6 100644 --- a/lib/view/widgets/vectorview.dart +++ b/lib/view/widgets/vectorview.dart @@ -18,9 +18,9 @@ class _VectorGridViewState extends State { return GridView.builder( shrinkWrap: true, gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount( - crossAxisCount: 7, - crossAxisSpacing: 5, - mainAxisSpacing: 5, + crossAxisCount: 8, + crossAxisSpacing: 3, + mainAxisSpacing: 3, ), itemBuilder: (context, index) { return GestureDetector( From 97492e0534049e82afaed5961d97a7726ed305d5 Mon Sep 17 00:00:00 2001 From: TejasBaid Date: Thu, 16 Jan 2025 14:44:15 +0530 Subject: [PATCH 2/2] UI fixes --- lib/view/widgets/homescreentabs.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/view/widgets/homescreentabs.dart b/lib/view/widgets/homescreentabs.dart index dd693ad63..16438992d 100644 --- a/lib/view/widgets/homescreentabs.dart +++ b/lib/view/widgets/homescreentabs.dart @@ -26,6 +26,7 @@ class _EffectsTabState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ SizedBox(height: 15.h,), + EffectContainer( effect: effInvert, effectName: 'Invert',