Only show website on messages if there is a url

cph-cachet · Jun 27, 2023 · 9468154 · 9468154
1 parent 2be7f5b
commit 9468154
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 36 deletions.
diff --git a/lib/ui/pages/message_details_page.dart b/lib/ui/pages/message_details_page.dart
@@ -60,48 +60,46 @@ class MessageDetailsPage extends StatelessWidget {
                                     style: aboutCardContentStyle.copyWith(
                                         color: Theme.of(context).primaryColor))
                                 : const SizedBox.shrink(),
-                            if(message.message != null)
-                                Text(
-                                    locale.translate(message.message!),
-                                    style: aboutCardContentStyle,
-                                    textAlign: TextAlign.justify,
-                                  )
+                            if (message.message != null)
+                              Text(
+                                locale.translate(message.message!),
+                                style: aboutCardContentStyle,
+                                textAlign: TextAlign.justify,
+                              )
                           ],
                         ),
                       ),
                     ),
                   ],
                 ),
               ),
-              Padding(
-                padding: const EdgeInsets.only(bottom: 30),
-                child: message.url != null
-                    ? Padding(
-                        padding: const EdgeInsets.all(8.0),
-                        child: InkWell(
-                          onTap: () async {
-                            try {
-                              await launchUrl(Uri.parse(message.url!));
-                            } catch (error) {
-                              warning(
-                                  "Could not launch message URL - '${message.url!}'");
-                            }
-                          },
-                          child: Row(
-                            mainAxisAlignment: MainAxisAlignment.center,
-                            children: [
-                              Icon(Icons.public_outlined,
-                                  color: Theme.of(context).primaryColor),
-                              Text(
-                                  locale.translate('pages.about.study.website'),
-                                  style: aboutCardSubtitleStyle.copyWith(
-                                      color: Theme.of(context).primaryColor)),
-                            ],
-                          ),
-                        ),
-                      )
-                    : const SizedBox.shrink(),
-              ),
+              if (message.url != null && message.url!.isNotEmpty)
+                Padding(
+                  padding: const EdgeInsets.only(bottom: 30),
+                  child: Padding(
+                    padding: const EdgeInsets.all(8.0),
+                    child: InkWell(
+                      onTap: () async {
+                        try {
+                          await launchUrl(Uri.parse(message.url!));
+                        } catch (error) {
+                          warning(
+                              "Could not launch message URL - '${message.url!}'");
+                        }
+                      },
+                      child: Row(
+                        mainAxisAlignment: MainAxisAlignment.center,
+                        children: [
+                          Icon(Icons.public_outlined,
+                              color: Theme.of(context).primaryColor),
+                          Text(locale.translate('pages.about.study.website'),
+                              style: aboutCardSubtitleStyle.copyWith(
+                                  color: Theme.of(context).primaryColor)),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
             ],
           ),
         ),

diff --git a/lib/ui/widgets/details_banner.dart b/lib/ui/widgets/details_banner.dart
@@ -58,7 +58,7 @@ class DetailsBanner extends StatelessWidget {
                 ),
                 isCarpBanner
                     ? Row(
-                        mainAxisAlignment: MainAxisAlignment.end,
+                        mainAxisAlignment: MainAxisAlignment.start,
                         crossAxisAlignment: CrossAxisAlignment.end,
                         children: [
                           Icon(Icons.touch_app,