Skip to content

Feature/design system #366

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

Merged
jorre127 merged 10 commits into from
Jan 28, 2025
Merged

Feature/design system #366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bb4ff38
added primitive colors
jorre127 Jan 27, 2025
18515be
added theme colors
jorre127 Jan 27, 2025
1a79ddb
added text styles
jorre127 Jan 27, 2025
4f9c1c6
added new font
jorre127 Jan 27, 2025
28bc087
updated font style
jorre127 Jan 27, 2025
749e047
implemented colors
jorre127 Jan 27, 2025
5740812
replaced text styles
jorre127 Jan 27, 2025
07ef686
updated tests
jorre127 Jan 27, 2025
f395d1a
added shadows
jorre127 Jan 27, 2025
3fd5786
fix tests
jorre127 Jan 28, 2025
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/fonts/aeonik_pro/AeonikPro-Bold.otf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/aeonik_pro/AeonikPro-Light.otf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/aeonik_pro/AeonikPro-Medium.otf
View file
Open in desktop
Binary file not shown.
Binary file added assets/fonts/aeonik_pro/AeonikPro-Regular.otf
View file
Open in desktop
Binary file not shown.
Binary file removed assets/fonts/open_sans/OpenSans-Regular.ttf
View file
Open in desktop
Binary file not shown.
6 changes: 3 additions & 3 deletions lib/screen/license/license_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,20 +26,20 @@ class LicenseScreenState extends State<LicenseScreen> {
itemBuilder: (context, index) {
final item = viewModel.licenses[index];
return Card(
color: theme.background,
color: theme.level1,
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
item.name,
style: theme.text.titleNormal,
style: theme.bodyNeutralDefault.headingS,
),
Container(height: 8),
Text(
item.license,
style: theme.text.bodySmall,
style: theme.bodyNeutralDefault.paragraphS,
),
],
),
Expand Down
2 changes: 1 addition & 1 deletion lib/screen/log_detail/log_detail_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ class LogDetailScreenState extends State<LogDetailScreen> {
final log = viewModel.logs.reversed.toList()[index];
return Text(
log,
style: theme.text.bodySmall,
style: theme.bodyNeutralDefault.paragraphS,
);
},
),
Expand Down
4 changes: 2 additions & 2 deletions lib/screen/login/login_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ class LoginScreenState extends State<LoginScreen> {
Container(height: 16),
Text(
'Login',
style: theme.text.titleNormal,
style: theme.bodyNeutralDefault.headingS,
textAlign: TextAlign.center,
),
Container(height: 32),
Text(
'Just fill in some text. There is no validator for the login',
style: theme.text.labelButtonSmall,
style: theme.bodyNeutralDefault.labelS,
),
Container(height: 32),
FlutterTemplateInputField(
Expand Down
6 changes: 3 additions & 3 deletions lib/screen/logs/logs_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ class LogsScreenState extends State<LogsScreen> {
final item = viewModel.availableDates[index];
return TouchFeedBack(
onTapped: () => viewModel.onLogTapped(item),
color: theme.cardBackground,
color: theme.canvas,
borderRadius: BorderRadius.circular(12),
child: Padding(
padding: const EdgeInsets.all(16),
Expand All @@ -46,12 +46,12 @@ class LogsScreenState extends State<LogsScreen> {
Expanded(
child: Text(
item.shortDateWeekdayFormat,
style: theme.text.bodyBig,
style: theme.bodyNeutralDefault.paragraphM,
),
),
Icon(
IcappsIcons.chevronRight,
color: theme.icon,
color: theme.bodyNeutralFaded,
)
],
),
Expand Down
4 changes: 2 additions & 2 deletions lib/screen/permission/analytics_permission_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ class AnalyticsPermissionScreen extends StatelessWidget {
const SizedBox(height: 32),
Text(
localization.permissionAnalyticsTitle,
style: theme.text.titleNormal,
style: theme.bodyNeutralDefault.headingS,
),
const SizedBox(height: 16),
Text(
localization.permissionAnalyticsDescription,
textAlign: TextAlign.center,
style: theme.text.bodyNormal,
style: theme.bodyNeutralDefault.paragraphM,
),
const Spacer(),
],
Expand Down
2 changes: 1 addition & 1 deletion lib/screen/splash/splash_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class SplashScreenState extends State<SplashScreen> {
consumerWithThemeAndLocalization: (context, viewModel, child, theme, localization) => StatusBar.animated(
isDarkStyle: theme.isDarkTheme,
child: Scaffold(
backgroundColor: theme.primary,
backgroundColor: theme.main,
body: const Center(
child: FlutterTemplateProgressIndicator.light(),
),
Expand Down
4 changes: 2 additions & 2 deletions lib/screen/todo/todo_add/todo_add_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,14 @@ class TodoAddScreenState extends State<TodoAddScreen> {
return ProviderWidget<TodoAddViewModel>(
create: getIt.call,
childBuilderWithViewModel: (context, viewModel, theme, localization) => Scaffold(
backgroundColor: theme.background,
backgroundColor: theme.level2,
appBar: AppBar(
systemOverlayStyle: SystemUiOverlayStyle.light,
leading: FlutterTemplateBackButton.light(
onClick: viewModel.onBackClicked,
),
title: Text(localization.todoAddTitle),
backgroundColor: theme.primary,
backgroundColor: theme.main,
),
body: ScrollConfiguration(
behavior: ScrollWhenNeededBehavior(),
Expand Down
14 changes: 7 additions & 7 deletions lib/screen/todo/todo_list/todo_list_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ class TodoListScreenState extends State<TodoListScreen> {
key: Keys.downloadAction,
icon: IcappsIcons.arrowDownToLine,
onClick: viewModel.onDownloadClicked,
color: theme.appBarAction,
color: theme.main,
),
ActionItem(
key: Keys.addAction,
icon: IcappsIcons.plus,
onClick: viewModel.onAddClicked,
color: theme.appBarAction,
color: theme.main,
),
],
child: Builder(
Expand All @@ -50,7 +50,7 @@ class TodoListScreenState extends State<TodoListScreen> {
return Center(
child: Text(
localization.getTranslation(errorKey),
style: theme.errorText.bodyNormal,
style: theme.bodySystemNegative.paragraphM,
),
);
}
Expand All @@ -68,21 +68,21 @@ class TodoListScreenState extends State<TodoListScreen> {
child: Container(
padding: const EdgeInsets.all(16),
decoration: BoxDecoration(
color: theme.fillInformative,
color: theme.systemInformative,
borderRadius: BorderRadius.circular(8),
),
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(
IcappsIcons.fileData,
color: theme.accent,
color: theme.accentThink,
),
const SizedBox(height: 8),
Text(
localization.todoEmptyState,
textAlign: TextAlign.center,
style: theme.text.bodyNormal,
style: theme.bodyNeutralDefault.paragraphM,
),
],
),
Expand All @@ -104,7 +104,7 @@ class TodoListScreenState extends State<TodoListScreen> {
padding: const EdgeInsets.symmetric(horizontal: 16),
child: Container(
height: 1,
color: theme.primary.withOpacity(0.1),
color: theme.main.withOpacity(0.1),
),
),
);
Expand Down
Loading
Loading