Skip to content

Profile page 02 added #16

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.

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

Merged
merged 4 commits into from
Jan 24, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added assets/images/profile/icon_heart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/profile/icon_home.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/profile/icon_stats.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/profile/profile_add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/profile/profile_landscape.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/profile/profile_photos_04.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/profile/profile_photos_05.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/profile/profile_photos_06.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/profile/profile_photos_07.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion lib/const/images_const.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ImagePath {

class MainImagePath {
static const String image_path = "assets/images/main";
static const String image_app = "$image_path/ic_launcher.png";
static const String image_app = "assets/images/media/ic_launcher.png";
static const String image_header = "$image_path/pic04.png";
static const String image_sign_up = "$image_path/pic03.png";
static const String image_walk_through = "$image_path/pic01.png";
Expand Down
1 change: 1 addition & 0 deletions lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class MyApp extends StatelessWidget {
routes: {
//PROFILE pages
PROFILE_PAGES[0]: (context) => ProfilePageOne(),
PROFILE_PAGES[1]: (context) => ProfilePageTwo(),

SIGN_UP_PAGES[0]: (context) => SignPageOne(),
SIGN_UP_PAGES[1]: (context) => SignPageTwo(),
Expand Down
1 change: 1 addition & 0 deletions lib/page/page_const.dart
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ export 'signup/SingPageTen.dart';

//PROFILE pages
export 'profile/ProfilePageOne.dart';
export 'profile/ProfilePageTwo.dart';

export 'feed/FeedPageFour.dart';
export 'feed/FeedPageOne.dart';
Expand Down
1 change: 1 addition & 0 deletions lib/page/profile/ProfilePageOne.dart
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ class _ProfileState extends State<ProfilePageOne> {
children: <Widget>[
TopBar(
leftIcon: ProfileImages.arrow_left,
title: ProfileStrings.STRING_PROFILE,
onLeftIconPressed: () => Navigator.pop(context),
),
Expanded(
Expand Down
379 changes: 379 additions & 0 deletions lib/page/profile/ProfilePageTwo.dart

Large diffs are not rendered by default.

16 changes: 15 additions & 1 deletion lib/page/profile/profile_const.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
///
import "package:flutter/material.dart";
class ProfileStrings {
static const STRING_NAME = "PROFILE";
static const STRING_PROFILE = "PROFILE";
static const STRING_FOLLOW = "FOLLOW";
static const STRING_PHOTOS = "photos";
}
Expand All @@ -16,6 +16,8 @@ class ProfileColors {
static const COLOR_WHITE = Color(0xFFF7FFE3);
static const COLOR_DARK = Color(0xFF34323D);
static const COLOR_YELLOW = Color(0xFFF1EA94);
static const COLOR_LIGHT_ORANGE = Color(0xFFFFC3A0);
static const COLOR_LIGHT_RED = Color(0xFFFFAFBD);
}

const CIRCLE_BUTTON_HEIGHT = 87.0;
Expand All @@ -26,6 +28,8 @@ const REC_BUTTON_HEIGHT = 96.0;
const TOP_BAR_HEIGHT = 152.0;
const TOP_BAR_GRADIENT_HEIGHT = 133.0;
const BOTTOM_BAR_HEIGHT = 200.0;
const ICON_BUTTON_WIDTH = 32.0;
const ICON_BUTTON_HEIGHT = 32.0;

const TEXT_SIZE_XXL = 50.0;
const TEXT_SIZE_XL = 40.0;
Expand All @@ -35,10 +39,20 @@ const TEXT_SIZE_S = 24.0;

class ProfileImages {
static const IMAGE_PATH = "assets/images/profile";
static const add = "$IMAGE_PATH/profile_add.png";
static const arrow_left = "$IMAGE_PATH/profile_arrow_left.png";
static const avatar = "$IMAGE_PATH/profile_avatar.png";
static const follow = "$IMAGE_PATH/profile_follow.png";
static const profile_landscape = "$IMAGE_PATH/profile_landscape.png";
static const icons_home = "$IMAGE_PATH/icon_home.png";
static const icons_stats = "$IMAGE_PATH/icon_stats.png";
static const icons_heart = "$IMAGE_PATH/icon_heart.png";
static const photos_01 = "$IMAGE_PATH/profile_photos_01.png";
static const photos_02 = "$IMAGE_PATH/profile_photos_02.png";
static const photos_03 = "$IMAGE_PATH/profile_photos_03.png";
static const photos_04 = "$IMAGE_PATH/profile_photos_04.png";
static const photos_05 = "$IMAGE_PATH/profile_photos_05.png";
static const photos_06 = "$IMAGE_PATH/profile_photos_06.png";
static const photos_07 = "$IMAGE_PATH/profile_photos_07.png";
static const photos_08 = "$IMAGE_PATH/profile_photos_08.png";
}
4 changes: 3 additions & 1 deletion lib/page/profile/top_bar.dart
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,13 @@ class TopBar extends StatelessWidget {
TopBar(
{this.leftIcon,
this.rightIcon,
this.title,
this.onLeftIconPressed,
this.onRightIconPressed});

final String leftIcon;
final String rightIcon;
final String title;
final Function() onLeftIconPressed;
final Function() onRightIconPressed;

Expand Down Expand Up @@ -55,7 +57,7 @@ class TopBar extends StatelessWidget {
child: Padding(
padding: EdgeInsets.only(top: SizeUtil.getAxisY(30.0)),
child: Text(
ProfileStrings.STRING_NAME,
this.title.toUpperCase(),
style: TextStyle(
color: TEXT_BLACK,
fontSize: SizeUtil.getAxisBoth(TEXT_SIZE_L),
Expand Down