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

Jump to bottom

fix some bug in the feed group5. #17

Merged
merged 2 commits into from Jan 28, 2019
Merged

fix some bug in the feed group5. #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4d9632
add the gradient for the feed page.
nb312 Jan 28, 2019
ec9fd11
Merge branch 'master' into dev
nb312 Jan 28, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 6 additions & 4 deletions lib/page/feed/FeedPageOne.dart
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import 'package:flutter_ui_nice/const/color_const.dart';
import 'package:flutter_ui_nice/page/feed/feed_const.dart';
import 'package:flutter_ui_nice/page/feed/top_title.dart';
import 'package:flutter_ui_nice/util/SizeUtil.dart';
import 'package:flutter_ui_nice/util/GradientUtil.dart';

class FeedPageOne extends StatefulWidget {
@override
Expand Down Expand Up @@ -123,7 +124,8 @@ class _FeedState extends State<FeedPageOne> {
height: SizeUtil.getAxisY(110.0),
width: SizeUtil.getAxisX(603.0)),
decoration: BoxDecoration(
color: RED, borderRadius: BorderRadius.circular(10.0)),
borderRadius: BorderRadius.circular(10.0),
gradient: GradientUtil.red()),
child: Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceEvenly,
Expand Down Expand Up @@ -162,11 +164,10 @@ class _FeedState extends State<FeedPageOne> {
],
),
),
),
),
],
),
),

],
),
));
Expand All @@ -177,7 +178,8 @@ class _FeedState extends State<FeedPageOne> {
children: <Widget>[
_listItem(index),
Padding(
padding: const EdgeInsets.symmetric(horizontal: 40.0, vertical: 10.0),
padding: const EdgeInsets.symmetric(
horizontal: 40.0, vertical: 10.0),
child: Divider(color: Colors.black87),
)
],
Expand Down
11 changes: 6 additions & 5 deletions lib/page/feed/FeedPageTwo.dart
View file
Open in desktop
Expand Up @@ -9,6 +9,7 @@ import 'package:flutter_ui_nice/const/color_const.dart';
import 'package:flutter_ui_nice/page/feed/feed_const.dart';
import 'package:flutter_ui_nice/page/feed/top_title.dart';
import 'package:flutter_ui_nice/util/SizeUtil.dart';
import 'package:flutter_ui_nice/util/GradientUtil.dart';

class FeedPageTwo extends StatefulWidget {
@override
Expand Down Expand Up @@ -89,7 +90,8 @@ class _FeedState extends State<FeedPageTwo> {
height: SizeUtil.getAxisY(110.0),
width: SizeUtil.getAxisX(603.0)),
decoration: BoxDecoration(
color: RED, borderRadius: BorderRadius.circular(10.0)),
borderRadius: BorderRadius.circular(10.0),
gradient: GradientUtil.red()),
child: Center(
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceAround,
Expand All @@ -103,7 +105,7 @@ class _FeedState extends State<FeedPageTwo> {
size: TEXT_SMALL_SIZE,
isBold: true),
),
Container(
Container(
padding: EdgeInsets.all(10.0),
width: 70.0,
child: _textBack("127 LIKES",
Expand All @@ -120,9 +122,8 @@ class _FeedState extends State<FeedPageTwo> {
bottom: SizeUtil.getAxisY(70.0),
right: SizeUtil.getAxisX(0.0),
child: Image.asset(FeedImage.heart,
width: SizeUtil.getAxisY(CIRCLE_BUTTON_HEIGHT),
height: SizeUtil.getAxisY(CIRCLE_BUTTON_HEIGHT))
),
width: SizeUtil.getAxisY(CIRCLE_BUTTON_HEIGHT),
height: SizeUtil.getAxisY(CIRCLE_BUTTON_HEIGHT))),
],
),
));
Expand Down