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 text overflow #6

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix text overflow #6

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
d15b926
Added text-wrap to the motivation page
HarryPeach Oct 4, 2020
e7250d5
Fixed overflow in the running view
HarryPeach Oct 4, 2020
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
42 changes: 22 additions & 20 deletions lib/ui_view/emotion_running_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ class EmotionRunningView extends StatelessWidget {
children: <Widget>[
ClipRRect(
borderRadius:
BorderRadius.all(Radius.circular(8.0)),
BorderRadius.all(Radius.circular(8.0)),
child: SizedBox(
height: 74,
child: AspectRatio(
aspectRatio: 1.714,
child: Image.asset(
"assets/dexify/back.png"),
child:
Image.asset("assets/dexify/back.png"),
),
),
),
Expand All @@ -63,23 +63,25 @@ class EmotionRunningView extends StatelessWidget {
children: <Widget>[
Row(
children: <Widget>[
Padding(
padding: const EdgeInsets.only(
left: 100,
right: 16,
top: 16,
),
child: Text(
"We have some motivation for you!",
textAlign: TextAlign.left,
style: TextStyle(
fontFamily:
DexifyAppTheme.fontName,
fontWeight: FontWeight.w500,
fontSize: 14,
letterSpacing: 0.0,
color:
DexifyAppTheme.nearlyDarkBlue,
Flexible(
child: Padding(
padding: const EdgeInsets.only(
left: 100,
right: 16,
top: 16,
),
child: Text(
"We have some motivation for you!",
textAlign: TextAlign.left,
style: TextStyle(
fontFamily:
DexifyAppTheme.fontName,
fontWeight: FontWeight.w500,
fontSize: 14,
letterSpacing: 0.0,
color:
DexifyAppTheme.nearlyDarkBlue,
),
),
),
),
Expand Down
40 changes: 21 additions & 19 deletions lib/ui_view/running_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ class RunningView extends StatelessWidget {
height: 74,
child: AspectRatio(
aspectRatio: 1.714,
child: Image.asset(
"assets/dexify/back.png"),
child:
Image.asset("assets/dexify/back.png"),
),
),
),
Expand All @@ -63,23 +63,25 @@ class RunningView extends StatelessWidget {
children: <Widget>[
Row(
children: <Widget>[
Padding(
padding: const EdgeInsets.only(
left: 100,
right: 16,
top: 16,
),
child: Text(
"You're doing great!",
textAlign: TextAlign.left,
style: TextStyle(
fontFamily:
DexifyAppTheme.fontName,
fontWeight: FontWeight.w500,
fontSize: 14,
letterSpacing: 0.0,
color:
DexifyAppTheme.nearlyDarkBlue,
Flexible(
child: Padding(
padding: const EdgeInsets.only(
left: 100,
right: 16,
top: 16,
),
child: Text(
"You're doing great!",
textAlign: TextAlign.left,
style: TextStyle(
fontFamily:
DexifyAppTheme.fontName,
fontWeight: FontWeight.w500,
fontSize: 14,
letterSpacing: 0.0,
color:
DexifyAppTheme.nearlyDarkBlue,
),
),
),
),
Expand Down