diff --git a/lib/scaffolds/long_list.dart b/lib/scaffolds/long_list.dart index 28fb890..e92eb92 100644 --- a/lib/scaffolds/long_list.dart +++ b/lib/scaffolds/long_list.dart @@ -115,7 +115,7 @@ class _LongListScaffoldState extends State> { payload.leadingItems.length + payload.trailingItems.length; return Container( - padding: EdgeInsets.all(16), + padding: commonItemPadding, decoration: BoxDecoration( image: DecorationImage( image: ExactAssetImage('images/progressive-disclosure-line.png', @@ -127,7 +127,7 @@ class _LongListScaffoldState extends State> { child: Link( onTap: _loadMore, child: Container( - padding: EdgeInsets.all(10), + padding: commonItemPadding, decoration: BoxDecoration( border: Border.all(color: Colors.black12), ), diff --git a/lib/screens/code_theme.dart b/lib/screens/code_theme.dart index 039a0f0..90ff0fa 100644 --- a/lib/screens/code_theme.dart +++ b/lib/screens/code_theme.dart @@ -5,6 +5,7 @@ import 'package:flutter_highlight/theme_map.dart'; import 'package:git_touch/models/code.dart'; import 'package:git_touch/models/theme.dart'; import 'package:git_touch/scaffolds/single.dart'; +import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:git_touch/widgets/table_view.dart'; import 'package:provider/provider.dart'; @@ -95,7 +96,7 @@ class CodeThemeScreen extends StatelessWidget { fontSize: codeProvider.fontSize.toDouble(), fontFamily: codeProvider.fontFamilyUsed, ), - padding: const EdgeInsets.all(10), + padding: commonItemPadding, ), ) ], diff --git a/lib/screens/commits.dart b/lib/screens/commits.dart index e6d842d..119d547 100644 --- a/lib/screens/commits.dart +++ b/lib/screens/commits.dart @@ -90,7 +90,7 @@ class CommitsScreen extends StatelessWidget { return Link( url: payload['url'], child: Container( - padding: EdgeInsets.all(12), + padding: commonItemPadding, child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/screens/issue.dart b/lib/screens/issue.dart index 117cdbc..670d868 100644 --- a/lib/screens/issue.dart +++ b/lib/screens/issue.dart @@ -355,7 +355,7 @@ mutation { crossAxisAlignment: CrossAxisAlignment.stretch, children: [ Container( - padding: EdgeInsets.all(10), + padding: commonItemPadding, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/screens/login.dart b/lib/screens/login.dart index f0b2881..3895a4d 100644 --- a/lib/screens/login.dart +++ b/lib/screens/login.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:git_touch/models/auth.dart'; import 'package:git_touch/scaffolds/single.dart'; +import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/app_bar_title.dart'; import 'package:provider/provider.dart'; import '../widgets/link.dart'; @@ -24,7 +25,7 @@ class _LoginScreenState extends State { settings.setActiveAccountIndex(index); }, child: Container( - padding: EdgeInsets.all(10), + padding: commonItemPadding, decoration: BoxDecoration( border: Border(bottom: BorderSide(color: Colors.black12)), ), diff --git a/lib/screens/object.dart b/lib/screens/object.dart index 518f96f..3eb18f5 100644 --- a/lib/screens/object.dart +++ b/lib/screens/object.dart @@ -116,7 +116,7 @@ class ObjectScreen extends StatelessWidget { case 'md': case 'markdown': return Padding( - padding: const EdgeInsets.all(12), + padding: commonItemPadding, child: MarkdownView(payload['text']), ); case 'png': @@ -133,7 +133,7 @@ class ObjectScreen extends StatelessWidget { payload['text'], language: _language, theme: themeMap[codeProvider.theme], - padding: EdgeInsets.all(10), + padding: commonItemPadding, textStyle: TextStyle( fontSize: codeProvider.fontSize.toDouble(), fontFamily: codeProvider.fontFamilyUsed), diff --git a/lib/screens/repository.dart b/lib/screens/repository.dart index 2a8422d..08d9b4c 100644 --- a/lib/screens/repository.dart +++ b/lib/screens/repository.dart @@ -26,8 +26,6 @@ class RepositoryScreen extends StatelessWidget { final String name; final String branch; - static const _languageBarPadding = 10.0; - RepositoryScreen(this.owner, this.name, {this.branch}); RepositoryScreen.fromFullName(String fullName, {this.branch}) : owner = fullName.split('/')[0], @@ -213,7 +211,8 @@ class RepositoryScreen extends StatelessWidget { var readme = payload.data[1] as String; final langWidth = MediaQuery.of(context).size.width - - _languageBarPadding * 2 - + commonItemPadding.left - + commonItemPadding.right - (data['languages']['edges'] as List).length + 1; @@ -246,7 +245,7 @@ class RepositoryScreen extends StatelessWidget { if ((data['languages']['edges'] as List).isNotEmpty) Container( color: Colors.white, - padding: const EdgeInsets.all(_languageBarPadding), + padding: commonItemPadding.copyWith(top: 8, bottom: 8), child: ClipRRect( borderRadius: BorderRadius.circular(2), child: SizedBox( @@ -370,7 +369,7 @@ class RepositoryScreen extends StatelessWidget { verticalGap, if (readme != null) Container( - padding: EdgeInsets.all(12), + padding: commonItemPadding, color: Colors.white, child: MarkdownView(readme), ), diff --git a/lib/screens/user.dart b/lib/screens/user.dart index c41185a..d6167e6 100644 --- a/lib/screens/user.dart +++ b/lib/screens/user.dart @@ -127,7 +127,7 @@ class UserScreen extends StatelessWidget { return Container( color: Colors.white, - padding: EdgeInsets.all(10), + padding: commonItemPadding, child: SingleChildScrollView( scrollDirection: Axis.horizontal, reverse: true, diff --git a/lib/utils/utils.dart b/lib/utils/utils.dart index f3b17fb..af37495 100644 --- a/lib/utils/utils.dart +++ b/lib/utils/utils.dart @@ -125,7 +125,7 @@ bool isNotNullOrEmpty(String text) { } const borderView = BorderView(); -const verticalGap = SizedBox(height: 20); +const verticalGap = SizedBox(height: 18); String getBranchQueryKey(String branch, {bool withParams = false}) { if (branch == null) return 'defaultBranchRef'; @@ -171,3 +171,5 @@ launchUrl(String url) async { // TODO: fallback } } + +const commonItemPadding = EdgeInsets.all(12); diff --git a/lib/widgets/event_item.dart b/lib/widgets/event_item.dart index 1ea91f9..81c7626 100644 --- a/lib/widgets/event_item.dart +++ b/lib/widgets/event_item.dart @@ -72,7 +72,7 @@ class EventItem extends StatelessWidget { screenBuilder: screenBuilder, url: url, child: Container( - padding: EdgeInsets.all(12), + padding: commonItemPadding, child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/widgets/issue_item.dart b/lib/widgets/issue_item.dart index 6d64d0e..ab4d4e6 100644 --- a/lib/widgets/issue_item.dart +++ b/lib/widgets/issue_item.dart @@ -49,7 +49,7 @@ class IssueItem extends StatelessWidget { ); }, child: Container( - padding: EdgeInsets.all(12), + padding: commonItemPadding, // color: payload.unread ? Colors.white : Colors.black12, child: Column( crossAxisAlignment: CrossAxisAlignment.start, diff --git a/lib/widgets/repository_item.dart b/lib/widgets/repository_item.dart index b43e3d0..aace9a2 100644 --- a/lib/widgets/repository_item.dart +++ b/lib/widgets/repository_item.dart @@ -126,7 +126,7 @@ class RepositoryItem extends StatelessWidget { ? null : (_) => RepositoryScreen(payload['owner']['login'], payload['name']), child: Container( - padding: EdgeInsets.all(10), + padding: commonItemPadding, child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [ diff --git a/lib/widgets/timeline_item.dart b/lib/widgets/timeline_item.dart index d577a18..ba9a2d4 100644 --- a/lib/widgets/timeline_item.dart +++ b/lib/widgets/timeline_item.dart @@ -302,7 +302,7 @@ class TimelineItem extends StatelessWidget { @override Widget build(BuildContext context) { return Container( - padding: EdgeInsets.all(12), + padding: commonItemPadding, child: _buildByType(context), ); } diff --git a/lib/widgets/user_item.dart b/lib/widgets/user_item.dart index 45ddf76..7f73290 100644 --- a/lib/widgets/user_item.dart +++ b/lib/widgets/user_item.dart @@ -1,6 +1,7 @@ import 'package:flutter/material.dart'; import 'package:git_touch/screens/organization.dart'; import 'package:git_touch/screens/user.dart'; +import 'package:git_touch/utils/utils.dart'; import 'package:git_touch/widgets/avatar.dart'; import 'package:git_touch/widgets/link.dart'; import 'package:git_touch/widgets/text_contains_organization.dart'; @@ -46,7 +47,7 @@ class UserItem extends StatelessWidget { : (_) => isOrganization ? OrganizationScreen(login) : UserScreen(login), child: Container( - padding: EdgeInsets.all(10), + padding: commonItemPadding, child: Row( crossAxisAlignment: CrossAxisAlignment.start, children: [