Gitea/git-touch-android-ios-app
1
0
Fork 0
mirror of https://github.com/git-touch/git-touch synced 2024-12-20 20:13:55 +01:00
Code Issues Releases Wiki Activity

refactor: text with organization

Browse Source
This commit is contained in:
Rongjian Zhang 2020-01-01 12:55:27 +08:00
parent cdd8876657
commit 9f4df079a2
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/screens/me.dart
View File

@ -95,7 +95,7 @@ class MeScreen extends StatelessWidget {
text: TextContainsOrganization(
user.company,
style: TextStyle(fontSize: 16, color: theme.palette.text),
overflow: TextOverflow.ellipsis,
oneLine: true,
),
),
if (isNotNullOrEmpty(user.location))

2
lib/screens/user.dart
View File

@ -143,7 +143,7 @@ class UserScreen extends StatelessWidget {
text: TextContainsOrganization(
user.company,
style: TextStyle(fontSize: 16, color: theme.palette.text),
overflow: TextOverflow.ellipsis,
oneLine: true,
),
),
if (isNotNullOrEmpty(user.location))

1
lib/screens/users.dart
View File

@ -105,7 +105,6 @@ class UsersScreen extends StatelessWidget {
name: payload.name,
avatarUrl: payload.avatarUrl,
bio: payload.bio,
inUserScreen: true,
);
},
);

10
lib/widgets/text_contains_organization.dart
View File

@ -4,10 +4,9 @@ import 'package:git_touch/utils/utils.dart';
class TextContainsOrganization extends StatelessWidget {
final String text;
final TextStyle style;
final TextOverflow overflow;
final bool oneLine;
TextContainsOrganization(this.text,
{this.style, this.overflow = TextOverflow.clip});
TextContainsOrganization(this.text, {this.style, this.oneLine = false});
static final _reg = RegExp(r'@[A-Za-z-]+');
@ -29,6 +28,9 @@ class TextContainsOrganization extends StatelessWidget {
}
return RichText(
text: TextSpan(children: spans, style: style), overflow: overflow);
text: TextSpan(children: spans, style: style),
overflow: oneLine ? TextOverflow.ellipsis : null,
maxLines: oneLine ? 1 : null,
);
}
}

2
lib/widgets/user_item.dart
View File

@ -76,7 +76,7 @@ class UserItem extends StatelessWidget {
color: theme.palette.secondaryText,
fontSize: 15,
),
overflow: TextOverflow.ellipsis,
oneLine: true,
),
],
),