Skip to content

Commit 0504d96

Browse files
samruddhi-RahegaonkarJhalakupadhyay
samruddhi-Rahegaonkar
and
Jhalakupadhyay
authored
fix: Layout overflow in About Us Screen #1136 (#1218)
Co-authored-by: Jhalak Upadhyay <[email protected]>
1 parent 0612802 commit 0504d96

File tree

1 file changed

+88
-63
lines changed

1 file changed

+88
-63
lines changed

‎lib/view/about_us_screen.dart‎

Lines changed: 88 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,11 @@ class _AboutUsScreenState extends State<AboutUsScreen> {
5656
height: 25,
5757
),
5858
Center(
59-
child:
60-
Image.asset('assets/icons/icon.png', height: 100),
59+
child: Image.asset(
60+
'assets/icons/icon.png',
61+
height: 100,
62+
fit: BoxFit.contain,
63+
),
6164
),
6265
const SizedBox(height: 30),
6366
Text(
@@ -66,33 +69,41 @@ class _AboutUsScreenState extends State<AboutUsScreen> {
6669
'For the data transfer from the smartphone to the LED badge we use Bluetooth. The project is based on the work of Nihlcem.',
6770
textAlign: TextAlign.justify,
6871
style: GoogleFonts.sora(
69-
wordSpacing: 3,
70-
fontWeight: FontWeight.w400,
71-
color: Colors.black,
72-
fontSize: 12),
72+
wordSpacing: 3,
73+
fontWeight: FontWeight.w400,
74+
color: Colors.black,
75+
fontSize: 12,
76+
),
77+
softWrap: true,
7378
),
7479
const SizedBox(height: 16),
7580
Row(
7681
mainAxisAlignment: MainAxisAlignment.center,
7782
children: [
78-
Text(
79-
'Developed by',
80-
style: GoogleFonts.sora(
81-
fontWeight: FontWeight.w500,
82-
color: Colors.grey),
83-
),
84-
SizedBox(
85-
width: 10,
86-
),
87-
GestureDetector(
88-
onTap: () => openUrl(
89-
'https://github.com/fossasia/badgemagic-app/graphs/contributors'),
83+
Flexible(
9084
child: Text(
91-
'FOSSASIA contributors',
85+
'Developed by',
9286
style: GoogleFonts.sora(
87+
fontWeight: FontWeight.w500,
88+
color: Colors.grey,
89+
),
90+
overflow: TextOverflow.ellipsis,
91+
),
92+
),
93+
SizedBox(width: 10),
94+
Flexible(
95+
child: GestureDetector(
96+
onTap: () => openUrl(
97+
'https://github.com/fossasia/badgemagic-app/graphs/contributors'),
98+
child: Text(
99+
'FOSSASIA contributors',
100+
style: GoogleFonts.sora(
93101
fontWeight: FontWeight.w500,
94102
color: Colors.red,
95-
decoration: TextDecoration.underline),
103+
decoration: TextDecoration.underline,
104+
),
105+
overflow: TextOverflow.ellipsis,
106+
),
96107
),
97108
),
98109
],
@@ -104,15 +115,16 @@ class _AboutUsScreenState extends State<AboutUsScreen> {
104115
SizedBox(height: 10),
105116
Container(
106117
decoration: BoxDecoration(
107-
color: Colors.white,
108-
boxShadow: [
109-
BoxShadow(
110-
blurRadius: 1,
111-
color: Colors.grey,
112-
offset: Offset(0, 1),
113-
)
114-
],
115-
borderRadius: BorderRadius.circular(6)),
118+
color: Colors.white,
119+
boxShadow: [
120+
BoxShadow(
121+
blurRadius: 1,
122+
color: Colors.grey,
123+
offset: Offset(0, 1),
124+
)
125+
],
126+
borderRadius: BorderRadius.circular(6),
127+
),
116128
child: Column(
117129
crossAxisAlignment: CrossAxisAlignment.start,
118130
children: [
@@ -121,48 +133,54 @@ class _AboutUsScreenState extends State<AboutUsScreen> {
121133
child: Text(
122134
'Contact With Us',
123135
style: GoogleFonts.sora(
124-
fontSize: 16,
125-
fontWeight: FontWeight.w500,
126-
color: Colors.grey),
136+
fontSize: 16,
137+
fontWeight: FontWeight.w500,
138+
color: Colors.grey,
139+
),
127140
),
128141
),
129142
ListTile(
130-
leading:
131-
Image.asset('assets/icons/github.png', height: 40),
143+
leading: Image.asset(
144+
'assets/icons/github.png',
145+
height: 40,
146+
fit: BoxFit.contain,
147+
),
132148
title: Text(
133149
'GitHub',
134150
style: GoogleFonts.sora(
135-
fontSize: 16,
136-
fontWeight: FontWeight.w500,
137-
color: Colors.black),
151+
fontSize: 16,
152+
fontWeight: FontWeight.w500,
153+
color: Colors.black,
154+
),
138155
),
139156
subtitle: Text(
140157
'Fork the repo and push changes or submit new issues.',
141158
style: GoogleFonts.sora(
142-
fontSize: 12,
143-
fontWeight: FontWeight.w500,
144-
color: Colors.grey),
159+
fontSize: 12,
160+
fontWeight: FontWeight.w500,
161+
color: Colors.grey,
162+
),
163+
softWrap: true,
145164
),
146165
onTap: () =>
147166
openUrl('https://github.com/fossasia/badgemagic-app'),
148167
),
149168
],
150169
),
151170
),
152-
SizedBox(
153-
height: 10,
154-
),
171+
SizedBox(height: 10),
155172
Container(
156173
decoration: BoxDecoration(
157-
color: Colors.white,
158-
boxShadow: [
159-
BoxShadow(
160-
blurRadius: 1,
161-
color: Colors.grey,
162-
offset: Offset(0, 1),
163-
)
164-
],
165-
borderRadius: BorderRadius.circular(6)),
174+
color: Colors.white,
175+
boxShadow: [
176+
BoxShadow(
177+
blurRadius: 1,
178+
color: Colors.grey,
179+
offset: Offset(0, 1),
180+
)
181+
],
182+
borderRadius: BorderRadius.circular(6),
183+
),
166184
child: Column(
167185
crossAxisAlignment: CrossAxisAlignment.start,
168186
children: [
@@ -171,27 +189,34 @@ class _AboutUsScreenState extends State<AboutUsScreen> {
171189
child: Text(
172190
"License",
173191
style: GoogleFonts.sora(
174-
fontSize: 18,
175-
fontWeight: FontWeight.w500,
176-
color: Colors.grey),
192+
fontSize: 18,
193+
fontWeight: FontWeight.w500,
194+
color: Colors.grey,
195+
),
177196
),
178197
),
179198
ListTile(
180-
leading:
181-
Image.asset('assets/icons/badge.png', height: 40),
199+
leading: Image.asset(
200+
'assets/icons/badge.png',
201+
height: 40,
202+
fit: BoxFit.contain,
203+
),
182204
title: Text(
183205
'License',
184206
style: GoogleFonts.sora(
185-
fontSize: 16,
186-
fontWeight: FontWeight.w500,
187-
color: Colors.black),
207+
fontSize: 16,
208+
fontWeight: FontWeight.w500,
209+
color: Colors.black,
210+
),
188211
),
189212
subtitle: Text(
190213
'Check Apache License 2.0 terms used on Badge Magic',
191214
style: GoogleFonts.sora(
192-
fontSize: 12,
193-
fontWeight: FontWeight.w500,
194-
color: Colors.grey),
215+
fontSize: 12,
216+
fontWeight: FontWeight.w500,
217+
color: Colors.grey,
218+
),
219+
softWrap: true,
195220
),
196221
onTap: () => openUrl(
197222
'https://github.com/fossasia/badgemagic-app/blob/development/LICENSE'),

0 commit comments

Comments
 (0)