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: UI fixed for the Contributors box and made scrollable #1282

Closed
wants to merge 4 commits into from
Closed

fix: UI fixed for the Contributors box and made scrollable #1282

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1049a46
Bug:UI fixed for the Contributors box and made scrollable
abhay1821 Mar 21, 2022
803ece8
Merge branch 'openfoodfacts:develop' into contributors_box
abhay1821 Mar 22, 2022
757536f
Merge branch 'openfoodfacts:develop' into contributors_box
abhay1821 Mar 24, 2022
757e0cc
Merge branch 'openfoodfacts:develop' into contributors_box
abhay1821 Apr 3, 2022
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
14 changes: 8 additions & 6 deletions packages/smooth_app/lib/generic_lib/dialogs/smooth_alert_dialog.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,12 +35,14 @@ class SmoothAlertDialog extends StatelessWidget {
shape: const RoundedRectangleBorder(
borderRadius: ROUNDED_BORDER_RADIUS,
),
content: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
_buildTitle(context),
SizedBox(height: height, child: body),
],
content: SingleChildScrollView(
child: Column(
mainAxisSize: MainAxisSize.min,
children: <Widget>[
_buildTitle(context),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This would also make the cross as well as the title scrollable, I don't know about you but this doesn't seem right to me.

I'd recommend to leave it as Column and put the ListView/SingleChildScroll only for Dialogs where we need it or if that's not possible just putting the body inside a scrollable widget

SizedBox(height: height, child: body),
],
),
),
actions: actions == null
? null
Expand Down
140 changes: 55 additions & 85 deletions packages/smooth_app/lib/views/bottom_sheet_views/user_contribution_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'dart:convert';

import 'package:flutter/material.dart';
import 'package:flutter_gen/gen_l10n/app_localizations.dart';
import 'package:http/http.dart' as http;
Expand All @@ -14,72 +13,46 @@ class UserContributionView extends StatelessWidget {
Widget build(BuildContext context) {
return Material(
child: SizedBox(
height: MediaQuery.of(context).size.height * 0.9,
child: Stack(
height: MediaQuery.of(context).size.height * 0.8,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you change the ratio here? @abhay1821

child: ListView(
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

A ListView.builder would be better here in terms of performance

shrinkWrap: true,
scrollDirection: Axis.vertical,
children: <Widget>[
Column(
mainAxisSize: MainAxisSize.max,
mainAxisAlignment: MainAxisAlignment.end,
children: <Widget>[
SizedBox(
height: MediaQuery.of(context).size.height * 0.9,
child: ListView(
shrinkWrap: true,
scrollDirection: Axis.vertical,
children: <Widget>[
Container(
padding: const EdgeInsets.symmetric(horizontal: 20.0),
margin: const EdgeInsets.only(top: 20.0, bottom: 24.0),
child: Text(
AppLocalizations.of(context)!.contribute,
style: Theme.of(context).textTheme.headline1,
),
),
Column(
mainAxisSize: MainAxisSize.min,
children: <SmoothListTile>[
//Contribute
SmoothListTile(
text: AppLocalizations.of(context)!
.contribute_improve_header,
onPressed: () => _contribute(context)),
Container(
padding: const EdgeInsets.symmetric(horizontal: 20.0),
margin: const EdgeInsets.only(top: 20.0, bottom: 24.0),
child: Text(
AppLocalizations.of(context)!.contribute,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of evoking multiple times AppLocalizations.of(context)! and Theme.of(context), you should use a single variable

style: Theme.of(context).textTheme.headline1,
),
),
SmoothListTile(
text: AppLocalizations.of(context)!.contribute_improve_header,
onPressed: () => _contribute(context)),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add a comma here(to format well your code)


//Develop
SmoothListTile(
text: AppLocalizations.of(context)!
.contribute_sw_development,
onPressed: () => _develop(context),
),
//Develop
SmoothListTile(
text: AppLocalizations.of(context)!.contribute_sw_development,
onPressed: () => _develop(context),
),

//Translate
SmoothListTile(
text: AppLocalizations.of(context)!
.contribute_translate_header,
onPressed: () => _translate(context),
),
//Translate
SmoothListTile(
text: AppLocalizations.of(context)!.contribute_translate_header,
onPressed: () => _translate(context),
),

//Donate
SmoothListTile(
text: AppLocalizations.of(context)!
.contribute_donate_header,
leadingWidget: const Icon(Icons.open_in_new),
onPressed: () => _donate(context),
),
//Donate
SmoothListTile(
text: AppLocalizations.of(context)!.contribute_donate_header,
leadingWidget: const Icon(Icons.open_in_new),
onPressed: () => _donate(context),
),

//Contributors list
SmoothListTile(
text: AppLocalizations.of(context)!.contributors,
onPressed: () => _contributors(context),
),
],
),
SizedBox(
height: MediaQuery.of(context).size.height * 0.15,
)
],
),
),
],
//Contributors list
SmoothListTile(
text: AppLocalizations.of(context)!.contributors,
onPressed: () => _contributors(context),
),
],
),
Expand Down Expand Up @@ -241,31 +214,28 @@ class UserContributionView extends StatelessWidget {
final List<dynamic> contributors =
jsonDecode(snap.data!.body) as List<dynamic>;

return SingleChildScrollView(
child: Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: contributors.map((dynamic contributorsData) {
final ContributorsModel _contributor =
ContributorsModel.fromJson(
contributorsData as Map<String, dynamic>);
return Wrap(
crossAxisAlignment: WrapCrossAlignment.center,
children: contributors.map((dynamic contributorsData) {
final ContributorsModel _contributor =
ContributorsModel.fromJson(
contributorsData as Map<String, dynamic>);

return Padding(
padding: const EdgeInsets.all(5.0),
child: InkWell(
onTap: () {
LaunchUrlHelper.launchURL(
_contributor.profilePath, false);
},
child: CircleAvatar(
foregroundImage:
NetworkImage(_contributor.avatarUrl),
backgroundColor:
Theme.of(context).colorScheme.primary,
),
return Padding(
padding: const EdgeInsets.all(5.0),
child: InkWell(
onTap: () {
LaunchUrlHelper.launchURL(
_contributor.profilePath, false);
},
child: CircleAvatar(
foregroundImage: NetworkImage(_contributor.avatarUrl),
backgroundColor:
Theme.of(context).colorScheme.primary,
),
);
}).toList(),
),
),
);
}).toList(),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please add toList(growable: false)

);
}

Expand Down