Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Show five lines of emojis Fixes #1133 #1162

Closed
wants to merge 3 commits into from
Closed

fix: Show five lines of emojis Fixes #1133 #1162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78a6aa2
Emoji bar issue fixed
TejasBaid Jan 16, 2025
97492e0
UI fixes
TejasBaid Jan 16, 2025
103880d
Merge branch 'flutter_app' into emoji-fix
mariobehling Jan 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
*.swp
.DS_Store
.atom/
.build/
.buildlog/
.history
.svn/
.swiftpm/
migrate_working_dir/

# IntelliJ related
Expand Down
14 changes: 7 additions & 7 deletions iOS/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
25 changes: 14 additions & 11 deletions lib/view/homescreen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,13 +189,12 @@ class _HomeScreenState extends State<HomeScreen>
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,
Expand Down Expand Up @@ -272,19 +271,19 @@ class _HomeScreenState extends State<HomeScreen>
},
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),
Expand All @@ -311,10 +310,14 @@ class _HomeScreenState extends State<HomeScreen>
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),),
),
),
],
Expand Down
4 changes: 4 additions & 0 deletions lib/view/widgets/homescreentabs.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -24,6 +25,8 @@ class _EffectsTabState extends State<EffectTab> {
return Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SizedBox(height: 15.h,),

EffectContainer(
effect: effInvert,
effectName: 'Invert',
Expand Down Expand Up @@ -59,6 +62,7 @@ class _AnimationTabState extends State<AnimationTab> {
Widget build(BuildContext context) {
return Column(
children: [
SizedBox(height: 15.h,),
Row(
children: [
AniContainer(
Expand Down
6 changes: 3 additions & 3 deletions lib/view/widgets/vectorview.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ class _VectorGridViewState extends State<VectorGridView> {
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(
Expand Down
Loading