iPhone tweaks

invoiceninja · Aug 12, 2021 · 60f5e17 · 60f5e17
1 parent 6ce6410
commit 60f5e17
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/lib/ui/app/lists/activity_list_tile.dart b/lib/ui/app/lists/activity_list_tile.dart
@@ -113,15 +113,15 @@ class ActivityListTile extends StatelessWidget {
       trailing: enableNavigation ? Icon(Icons.navigate_next) : null,
       subtitle: Row(
         children: <Widget>[
-          Text(formatDate(
-              convertTimestampToDateString(activity.updatedAt), context,
-              showTime: true)),
-          (activity.ip ?? '').isNotEmpty
-              ? Text(' • ' + activity.ip)
-              : SizedBox(),
-          (activity.notes ?? '').isNotEmpty
-              ? Text(' • ' + localization.lookup(activity.notes).trim())
-              : SizedBox(),
+          Flexible(
+            child: Text(((activity.notes ?? '').isNotEmpty
+                    ? localization.lookup(activity.notes).trim() + '\n'
+                    : '') +
+                formatDate(
+                    convertTimestampToDateString(activity.updatedAt), context,
+                    showTime: true) +
+                ((activity.ip ?? '').isNotEmpty ? ' • ' + activity.ip : '')),
+          ),
         ],
       ),
     );

diff --git a/lib/ui/settings/account_management.dart b/lib/ui/settings/account_management.dart
@@ -313,7 +313,7 @@ class _AccountOverview extends StatelessWidget {
                 Expanded(
                   child: AppButton(
                     label: localization.purchaseLicense.toUpperCase(),
-                    iconData: Icons.cloud_download,
+                    iconData: isMobile(context) ? null : Icons.cloud_download,
                     onPressed: () async {
                       if (await canLaunch(kWhiteLabelUrl)) {
                         launch(kWhiteLabelUrl);
@@ -325,7 +325,7 @@ class _AccountOverview extends StatelessWidget {
                 Expanded(
                   child: AppButton(
                     label: localization.applyLicense.toUpperCase(),
-                    iconData: Icons.cloud_done,
+                    iconData: isMobile(context) ? null : Icons.cloud_done,
                     onPressed: state.isWhiteLabeled
                         ? null
                         : () {
@@ -384,7 +384,9 @@ class _AccountOverview extends StatelessWidget {
                 Expanded(
                   child: AppButton(
                     label: localization.apiTokens.toUpperCase(),
-                    iconData: getEntityIcon(EntityType.token),
+                    iconData: isMobile(context)
+                        ? null
+                        : getEntityIcon(EntityType.token),
                     onPressed: () {
                       store.dispatch(ViewSettings(
                         section: kSettingsTokens,
@@ -396,7 +398,9 @@ class _AccountOverview extends StatelessWidget {
                 Expanded(
                   child: AppButton(
                     label: localization.apiWebhooks.toUpperCase(),
-                    iconData: getEntityIcon(EntityType.webhook),
+                    iconData: isMobile(context)
+                        ? null
+                        : getEntityIcon(EntityType.webhook),
                     onPressed: () {
                       store.dispatch(ViewSettings(
                         section: kSettingsWebhooks,
@@ -411,15 +415,15 @@ class _AccountOverview extends StatelessWidget {
               Expanded(
                 child: AppButton(
                   label: localization.apiDocs.toUpperCase(),
-                  iconData: MdiIcons.bookshelf,
+                  iconData: isMobile(context) ? null : MdiIcons.bookshelf,
                   onPressed: () => launch(kApiDocsURL),
                 ),
               ),
               SizedBox(width: kGutterWidth),
               Expanded(
                 child: AppButton(
                   label: 'Zapier',
-                  iconData: MdiIcons.cloud,
+                  iconData: isMobile(context) ? null : MdiIcons.cloud,
                   onPressed: () => launch(kZapierURL),
                 ),
               ),
@@ -436,7 +440,7 @@ class _AccountOverview extends StatelessWidget {
                 child: AppButton(
                   label: localization.purgeData.toUpperCase(),
                   color: Colors.red,
-                  iconData: Icons.delete,
+                  iconData: isMobile(context) ? null : Icons.delete,
                   onPressed: () {
                     confirmCallback(
                         context: context,
@@ -462,7 +466,7 @@ class _AccountOverview extends StatelessWidget {
                       ? localization.cancelAccount.toUpperCase()
                       : localization.deleteCompany.toUpperCase(),
                   color: Colors.red,
-                  iconData: Icons.delete,
+                  iconData: isMobile(context) ? null : Icons.delete,
                   onPressed: () {
                     String message = companies.length == 1
                         ? localization.cancelAccountMessage