From 29f4bb733807d559c21d329a89e47a2ecf6810ba Mon Sep 17 00:00:00 2001 From: Clemens Tiedt Date: Mon, 14 Oct 2019 16:56:57 +0200 Subject: [PATCH 1/3] feat: make HPI logos buttons to open hpi.de --- lib/app/widgets/dashboard_page.dart | 20 +++++++++++++------- lib/app/widgets/main_scaffold.dart | 17 +++++++++++++---- 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/lib/app/widgets/dashboard_page.dart b/lib/app/widgets/dashboard_page.dart index e06a73e..a6ef0ae 100644 --- a/lib/app/widgets/dashboard_page.dart +++ b/lib/app/widgets/dashboard_page.dart @@ -3,6 +3,7 @@ import 'dart:io'; import 'package:align_positioned/align_positioned.dart'; import 'package:flutter/material.dart'; import 'package:hpi_flutter/core/localizations.dart'; +import 'package:hpi_flutter/core/utils.dart'; import 'package:hpi_flutter/feedback/widgets/feedback_dialog.dart'; import 'package:hpi_flutter/food/widgets/food_fragment.dart'; import 'package:hpi_flutter/news/widgets/news_fragment.dart'; @@ -34,15 +35,20 @@ class DashboardPage extends StatelessWidget { padding: EdgeInsets.fromLTRB(16, MediaQuery.of(context).padding.top, 16, 32), children: [ - Padding( - padding: const EdgeInsets.symmetric(vertical: 8.0), - child: Align( - alignment: Alignment.topRight, - child: ConstrainedBox( - constraints: BoxConstraints(maxWidth: 200, maxHeight: 100), - child: Image.asset('assets/logo/logo_text.png'), + FlatButton( + child: Padding( + padding: const EdgeInsets.symmetric(vertical: 8.0), + child: Align( + alignment: Alignment.topRight, + child: ConstrainedBox( + constraints: BoxConstraints(maxWidth: 200, maxHeight: 100), + child: Image.asset('assets/logo/logo_text.png'), + ), ), ), + onPressed: () { + tryLaunch('https://hpi.de'); + }, ), OpenHpiFragment(), NewsFragment(), diff --git a/lib/app/widgets/main_scaffold.dart b/lib/app/widgets/main_scaffold.dart index 39a8f44..0fcc9f3 100644 --- a/lib/app/widgets/main_scaffold.dart +++ b/lib/app/widgets/main_scaffold.dart @@ -1,7 +1,9 @@ import 'package:flutter/material.dart' hide Route; +import 'package:flutter/material.dart' as prefix0; import 'package:hpi_flutter/app/services/navigation.dart'; import 'package:hpi_flutter/core/hpi_icons.dart'; import 'package:hpi_flutter/core/localizations.dart'; +import 'package:hpi_flutter/core/utils.dart'; import 'package:hpi_flutter/route.dart'; import 'package:kt_dart/collection.dart'; import 'package:outline_material_icons/outline_material_icons.dart'; @@ -53,11 +55,18 @@ class MainScaffold extends StatelessWidget { shrinkWrap: true, children: [ Padding( - padding: const EdgeInsets.all(8), + padding: const EdgeInsets.fromLTRB(0, 8, 8, 0), child: Row( children: [ - SizedBox(width: 16), - Image.asset('assets/logo/logo_text.png', height: 56), + FlatButton( + child: Padding( + padding: const EdgeInsets.all(8), + child: + Image.asset('assets/logo/logo_text.png', height: 50)), + onPressed: () { + tryLaunch('https://hpi.de'); + }, + ), Spacer(), IconButton( icon: Icon(OMIcons.settings), @@ -70,7 +79,7 @@ class MainScaffold extends StatelessWidget { ], ), ), - Divider(indent: 8, endIndent: 8), + Divider(indent: 8, endIndent: 8, thickness: 1), NavigationItem( icon: OMIcons.home, text: HpiL11n.get(context, 'dashboard'), From 2bea7757336d836f7acf8a7e76e2d1524d0b3e18 Mon Sep 17 00:00:00 2001 From: Clemens Tiedt Date: Tue, 15 Oct 2019 19:47:24 +0200 Subject: [PATCH 2/3] style: minor changes --- lib/app/widgets/dashboard_page.dart | 17 +++++++---------- lib/app/widgets/main_scaffold.dart | 5 +---- 2 files changed, 8 insertions(+), 14 deletions(-) diff --git a/lib/app/widgets/dashboard_page.dart b/lib/app/widgets/dashboard_page.dart index a6ef0ae..28889a9 100644 --- a/lib/app/widgets/dashboard_page.dart +++ b/lib/app/widgets/dashboard_page.dart @@ -36,19 +36,16 @@ class DashboardPage extends StatelessWidget { EdgeInsets.fromLTRB(16, MediaQuery.of(context).padding.top, 16, 32), children: [ FlatButton( - child: Padding( + child: Container( padding: const EdgeInsets.symmetric(vertical: 8.0), - child: Align( - alignment: Alignment.topRight, - child: ConstrainedBox( - constraints: BoxConstraints(maxWidth: 200, maxHeight: 100), - child: Image.asset('assets/logo/logo_text.png'), - ), + alignment: Alignment.topRight, + child: LimitedBox( + maxWidth: 200, + maxHeight: 100, + child: Image.asset('assets/logo/logo_text.png'), ), ), - onPressed: () { - tryLaunch('https://hpi.de'); - }, + onPressed: () => tryLaunch('https://hpi.de'), ), OpenHpiFragment(), NewsFragment(), diff --git a/lib/app/widgets/main_scaffold.dart b/lib/app/widgets/main_scaffold.dart index 0fcc9f3..a8f49d4 100644 --- a/lib/app/widgets/main_scaffold.dart +++ b/lib/app/widgets/main_scaffold.dart @@ -1,5 +1,4 @@ import 'package:flutter/material.dart' hide Route; -import 'package:flutter/material.dart' as prefix0; import 'package:hpi_flutter/app/services/navigation.dart'; import 'package:hpi_flutter/core/hpi_icons.dart'; import 'package:hpi_flutter/core/localizations.dart'; @@ -63,9 +62,7 @@ class MainScaffold extends StatelessWidget { padding: const EdgeInsets.all(8), child: Image.asset('assets/logo/logo_text.png', height: 50)), - onPressed: () { - tryLaunch('https://hpi.de'); - }, + onPressed: () => tryLaunch('https://hpi.de'), ), Spacer(), IconButton( From 61d8978f63286861cf07c71c126ac0eea8bea85f Mon Sep 17 00:00:00 2001 From: Clemens Tiedt Date: Tue, 29 Oct 2019 21:05:57 +0100 Subject: [PATCH 3/3] ui: replace flatbutton logos with gesture detectors --- lib/app/widgets/dashboard_page.dart | 12 ++++++------ lib/app/widgets/main_scaffold.dart | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/app/widgets/dashboard_page.dart b/lib/app/widgets/dashboard_page.dart index 28889a9..af02344 100644 --- a/lib/app/widgets/dashboard_page.dart +++ b/lib/app/widgets/dashboard_page.dart @@ -35,17 +35,17 @@ class DashboardPage extends StatelessWidget { padding: EdgeInsets.fromLTRB(16, MediaQuery.of(context).padding.top, 16, 32), children: [ - FlatButton( + GestureDetector( child: Container( padding: const EdgeInsets.symmetric(vertical: 8.0), alignment: Alignment.topRight, - child: LimitedBox( - maxWidth: 200, - maxHeight: 100, - child: Image.asset('assets/logo/logo_text.png'), + child: Image.asset( + 'assets/logo/logo_text.png', + width: 200, + height: 100, ), ), - onPressed: () => tryLaunch('https://hpi.de'), + onTap: () => tryLaunch('https://hpi.de'), ), OpenHpiFragment(), NewsFragment(), diff --git a/lib/app/widgets/main_scaffold.dart b/lib/app/widgets/main_scaffold.dart index a8f49d4..135cfba 100644 --- a/lib/app/widgets/main_scaffold.dart +++ b/lib/app/widgets/main_scaffold.dart @@ -57,12 +57,12 @@ class MainScaffold extends StatelessWidget { padding: const EdgeInsets.fromLTRB(0, 8, 8, 0), child: Row( children: [ - FlatButton( + GestureDetector( child: Padding( padding: const EdgeInsets.all(8), child: Image.asset('assets/logo/logo_text.png', height: 50)), - onPressed: () => tryLaunch('https://hpi.de'), + onTap: () => tryLaunch('https://hpi.de'), ), Spacer(), IconButton(