chore(demo-app): multiple ui improvements

hpi-dhc · Jul 4, 2022 · 52f351b · 52f351b
1 parent 9749544
commit 52f351b
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 32 deletions.
diff --git a/miscellaneous/demo-app/lib/common/pages/medications/medication.dart b/miscellaneous/demo-app/lib/common/pages/medications/medication.dart
@@ -258,10 +258,7 @@ class ClinicalAnnotationCard extends StatelessWidget {
       child: Container(
         decoration: BoxDecoration(
           borderRadius: BorderRadius.all(Radius.circular(8)),
-          gradient: LinearGradient(colors: [
-            PharmeTheme.primaryColor.withOpacity(0.8),
-            PharmeTheme.secondaryColor.withOpacity(0.8),
-          ]),
+          color: PharmeTheme.primaryColor.withOpacity(0.8),
         ),
         child: Padding(
           padding: const EdgeInsets.all(8),

diff --git a/miscellaneous/demo-app/lib/faq/pages/faq.dart b/miscellaneous/demo-app/lib/faq/pages/faq.dart
@@ -22,8 +22,7 @@ class FaqPage extends StatelessWidget {
 
   Widget _buildHeaderCard(BuildContext context) {
     return Container(
-      height: 150,
-      padding: EdgeInsets.all(8),
+      padding: EdgeInsets.all(32),
       decoration: BoxDecoration(
         gradient: LinearGradient(
           colors: [
@@ -36,10 +35,10 @@ class FaqPage extends StatelessWidget {
       child: Row(
         children: [
           Padding(
-            padding: EdgeInsets.symmetric(horizontal: 8),
+            padding: EdgeInsets.only(right: 16),
             child: SvgPicture.asset(
               'assets/images/pgx_faq.svg',
-              width: 120,
+              height: 80,
             ),
           ),
           Expanded(

diff --git a/miscellaneous/demo-app/lib/login/pages/login.dart b/miscellaneous/demo-app/lib/login/pages/login.dart
@@ -40,7 +40,10 @@ class _LoginPageState extends State<LoginPage> {
     return Column(
       mainAxisAlignment: MainAxisAlignment.spaceBetween,
       children: [
-        Image.asset('assets/images/logo-horizontal.png'),
+        Image.asset(
+          'assets/images/logo-horizontal.png',
+          width: MediaQuery.of(context).size.width * 0.6,
+        ),
         Column(
           children: [
             Icon(

diff --git a/miscellaneous/demo-app/lib/reports/pages/reports.dart b/miscellaneous/demo-app/lib/reports/pages/reports.dart
@@ -43,7 +43,7 @@ class ReportsPage extends StatelessWidget {
 
   Widget _buildHeaderCard(BuildContext context) {
     return Container(
-      padding: EdgeInsets.all(16),
+      padding: EdgeInsets.all(32),
       decoration: BoxDecoration(
         gradient: LinearGradient(
           colors: [
@@ -56,10 +56,10 @@ class ReportsPage extends StatelessWidget {
       child: Row(
         children: [
           Padding(
-            padding: EdgeInsets.only(right: 16),
+            padding: EdgeInsets.only(right: 32),
             child: SvgPicture.asset(
               'assets/images/reports_icon.svg',
-              width: 70,
+              height: 110,
             ),
           ),
           Expanded(
@@ -69,14 +69,14 @@ class ReportsPage extends StatelessWidget {
               children: [
                 Text(
                   context.l10n.reports_page_disclaimer_title,
-                  style: PharmeTheme.textTheme.titleMedium!
-                      .copyWith(color: Colors.white, fontSize: 16),
+                  style: PharmeTheme.textTheme.titleLarge!
+                      .copyWith(color: Colors.white),
                 ),
-                SizedBox(height: 4),
+                SizedBox(height: 8),
                 Text(
                   context.l10n.reports_page_disclaimer_text,
                   style: PharmeTheme.textTheme.bodyMedium!
-                      .copyWith(color: Colors.white, fontSize: 13),
+                      .copyWith(color: Colors.white),
                 ),
               ],
             ),

diff --git a/miscellaneous/demo-app/lib/search/pages/search.dart b/miscellaneous/demo-app/lib/search/pages/search.dart
@@ -30,26 +30,38 @@ class SearchPage extends HookWidget {
                     ],
                   ),
                 ),
-                child: Column(
-                  mainAxisAlignment: MainAxisAlignment.center,
-                  children: [
-                    Image.asset(
+              ),
+              Positioned(
+                child: Align(
+                  alignment: Alignment.center,
+                  child: Padding(
+                    padding: EdgeInsets.only(bottom: 200),
+                    child: Image.asset(
                       'assets/images/logo-vertical.png',
-                      width: MediaQuery.of(context).size.width * 0.8,
+                      width: MediaQuery.of(context).size.width * 0.5,
                     ),
-                    Text(
-                      context.l10n.search_page_typeInMedication,
-                      style: PharmeTheme.textTheme.bodyLarge!.copyWith(
+                  ),
+                ),
+              ),
+              Positioned(
+                child: SizedBox.expand(
+                  child: Column(
+                    mainAxisAlignment: MainAxisAlignment.end,
+                    children: [
+                      Text(
+                        context.l10n.search_page_typeInMedication,
+                        style: PharmeTheme.textTheme.bodyLarge!.copyWith(
+                          color: Colors.white,
+                        ),
+                      ),
+                      Icon(
+                        Icons.arrow_downward,
+                        size: 30,
                         color: Colors.white,
                       ),
-                    ),
-                    Icon(
-                      Icons.arrow_downward,
-                      size: 30,
-                      color: Colors.white,
-                    ),
-                    SizedBox(height: 120),
-                  ],
+                      SizedBox(height: 150),
+                    ],
+                  ),
                 ),
               ),
               SlidingUpPanelWidget(