chore: Update UI

krille-chan · Nov 15, 2022 · 6487dcf · 6487dcf
1 parent c945a14
commit 6487dcf
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 9 deletions.
diff --git a/lib/model/fluffy_pix.dart b/lib/model/fluffy_pix.dart
@@ -121,8 +121,6 @@ class FluffyPix {
       headers['Authorization'] = 'Bearer $accessToken';
     }
 
-    // print(url.toString());
-
     Response resp;
     var jsonResp = <String, dynamic>{};
     switch (type) {

diff --git a/lib/model/fluffy_pix_push_extension.dart b/lib/model/fluffy_pix_push_extension.dart
@@ -126,8 +126,6 @@ extension FluffyPixPushExtension on FluffyPix {
   }
 
   _handleForegroundRemoteMessage(RemoteMessage message) {
-    print('Got remote message');
-    print(message.data);
     unreadNotifications = null;
     updateNotificationCount();
   }

diff --git a/lib/pages/login.dart b/lib/pages/login.dart
@@ -53,6 +53,7 @@ class LoginPageController extends State<LoginPage> {
           .requestInstances(L10n.of(context)!.localeName, query);
     } finally {
       if (query.isNotEmpty &&
+          query.contains('.') &&
           !instances.any((instance) => instance.name == query)) {
         instances.add(
           PublicInstance(

diff --git a/lib/pages/views/notifications_view.dart b/lib/pages/views/notifications_view.dart
@@ -47,7 +47,7 @@ class NotificationsPageView extends StatelessWidget {
                     onLinkTap: (link) => linksCallback(link, context),
                     defaultTextStyle: TextStyle(fontWeight: FontWeight.normal),
                     linkStyle: TextStyle(
-                      color: Theme.of(context).primaryColor,
+                      color: Theme.of(context).colorScheme.primary,
                       decoration: TextDecoration.none,
                     ),
                   ),

diff --git a/lib/widgets/instance_list_item.dart b/lib/widgets/instance_list_item.dart
@@ -66,15 +66,23 @@ class _InstanceListItemState extends State<InstanceListItem> {
                 child: ListTile(
                   title: Text(
                     widget.instance.name,
-                    style: const TextStyle(
+                    style: TextStyle(
+                      color: Theme.of(context).colorScheme.onBackground,
                       fontWeight: FontWeight.bold,
                     ),
                   ),
                   subtitle: Text(
                     '${L10n.of(context)!.members}: ${widget.instance.users ?? L10n.of(context)!.unknown}\n$description',
                     maxLines: 3,
+                    style: TextStyle(
+                      color: Theme.of(context).colorScheme.onBackground,
+                    ),
                   ),
                   trailing: ElevatedButton(
+                    style: ElevatedButton.styleFrom(
+                      backgroundColor: Theme.of(context).primaryColor,
+                      foregroundColor: Theme.of(context).colorScheme.onPrimary,
+                    ),
                     onPressed: _loginLoading ? null : _loginAction,
                     child: _loginLoading
                         ? const CupertinoActivityIndicator()

diff --git a/lib/widgets/status/status.dart b/lib/widgets/status/status.dart
@@ -420,7 +420,7 @@ class _StatusWidgetState extends State<StatusWidget> {
                 color: Theme.of(context).textTheme.bodyText1?.color,
               ),
               linkStyle: TextStyle(
-                color: Theme.of(context).primaryColor,
+                color: Theme.of(context).colorScheme.primary,
                 decoration: TextDecoration.none,
               ),
             ),

diff --git a/lib/widgets/status/status_content.dart b/lib/widgets/status/status_content.dart
@@ -56,7 +56,6 @@ class _StatusContentState extends State<StatusContent> {
               Navigator.of(context).pushNamed('/status/${widget.status.id}'),
           child: content);
     }
-    print(contentStatus.content);
     return Column(
       mainAxisSize: MainAxisSize.min,
       children: [
@@ -73,7 +72,7 @@ class _StatusContentState extends State<StatusContent> {
                 fontSize: 15,
               ),
               linkStyle: TextStyle(
-                color: Theme.of(context).primaryColor,
+                color: Theme.of(context).colorScheme.primary,
                 decoration: TextDecoration.none,
               ),
             ),