From 6ea136ce3b2ae2299509897f5110a23126b5ba6f Mon Sep 17 00:00:00 2001
From: Nutcake <Nusskuchen95@hotmail.de>
Date: Wed, 3 May 2023 18:16:40 +0200
Subject: [PATCH] Improve login and settings visuals

---
 lib/main.dart                                       | 2 +-
 lib/models/message.dart                             | 1 -
 lib/models/settings.dart                            | 1 -
 lib/widgets/{home_screen.dart => friends_list.dart} | 0
 lib/widgets/login_screen.dart                       | 7 +++++--
 lib/widgets/settings_page.dart                      | 7 +++++--
 test/widget_test.dart                               | 2 +-
 7 files changed, 12 insertions(+), 8 deletions(-)
 rename lib/widgets/{home_screen.dart => friends_list.dart} (100%)

diff --git a/lib/main.dart b/lib/main.dart
index fbdc2df..2c3abfd 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,6 @@
 import 'dart:developer';
 
-import 'package:contacts_plus_plus/widgets/home_screen.dart';
+import 'package:contacts_plus_plus/widgets/friends_list.dart';
 import 'package:contacts_plus_plus/widgets/login_screen.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_phoenix/flutter_phoenix.dart';
diff --git a/lib/models/message.dart b/lib/models/message.dart
index beb8a2e..4587341 100644
--- a/lib/models/message.dart
+++ b/lib/models/message.dart
@@ -4,7 +4,6 @@ import 'dart:developer';
 import 'package:contacts_plus_plus/api_client.dart';
 import 'package:contacts_plus_plus/apis/message_api.dart';
 import 'package:contacts_plus_plus/auxiliary.dart';
-import 'package:contacts_plus_plus/models/session.dart';
 import 'package:uuid/uuid.dart';
 
 enum MessageType {
diff --git a/lib/models/settings.dart b/lib/models/settings.dart
index 454d66f..d56e1f8 100644
--- a/lib/models/settings.dart
+++ b/lib/models/settings.dart
@@ -2,5 +2,4 @@
 class Settings {
   // No settings right now.
 
-
 }
\ No newline at end of file
diff --git a/lib/widgets/home_screen.dart b/lib/widgets/friends_list.dart
similarity index 100%
rename from lib/widgets/home_screen.dart
rename to lib/widgets/friends_list.dart
diff --git a/lib/widgets/login_screen.dart b/lib/widgets/login_screen.dart
index b808cc1..d2e70bc 100644
--- a/lib/widgets/login_screen.dart
+++ b/lib/widgets/login_screen.dart
@@ -81,6 +81,9 @@ class _LoginScreenState extends State<LoginScreen> {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      appBar: AppBar(
+        title: const Text("Contacts++"),
+      ),
       body: FutureBuilder(
         future: _cachedLoginFuture,
         builder: (context, snapshot) {
@@ -126,7 +129,7 @@ class _LoginScreenState extends State<LoginScreen> {
                 ),
               ),
               if (_isLoading)
-                const Center(child: CircularProgressIndicator())
+                const LinearProgressIndicator()
               else
                 TextButton.icon(
                   onPressed: submit,
@@ -144,7 +147,7 @@ class _LoginScreenState extends State<LoginScreen> {
             ],
           );
           }
-          return const Center(child: CircularProgressIndicator(),);
+          return const LinearProgressIndicator();
         }
       ),
     );
diff --git a/lib/widgets/settings_page.dart b/lib/widgets/settings_page.dart
index 50d9b8b..782468f 100644
--- a/lib/widgets/settings_page.dart
+++ b/lib/widgets/settings_page.dart
@@ -1,7 +1,5 @@
-
 import 'package:contacts_plus_plus/api_client.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter_phoenix/flutter_phoenix.dart';
 
 class SettingsPage extends StatelessWidget {
   const SettingsPage({super.key});
@@ -21,6 +19,11 @@ class SettingsPage extends StatelessWidget {
       body: ListView(
         children: [
           ListTile(
+            shape: Border(
+              bottom: BorderSide(color: Theme.of(context).colorScheme.secondaryContainer, width: 0.5),
+              top: BorderSide(color: Theme.of(context).colorScheme.secondaryContainer, width: 0.5)
+            ),
+            trailing: const Icon(Icons.logout),
             title: const Text("Sign out"),
             onTap: () {
               showDialog(
diff --git a/test/widget_test.dart b/test/widget_test.dart
index 87adcf2..174c813 100644
--- a/test/widget_test.dart
+++ b/test/widget_test.dart
@@ -13,7 +13,7 @@ import 'package:contacts_plus_plus/main.dart';
 void main() {
   testWidgets('Counter increments smoke test', (WidgetTester tester) async {
     // Build our app and trigger a frame.
-    await tester.pumpWidget(ContactsPlusPlus());
+    await tester.pumpWidget(const ContactsPlusPlus());
 
     // Verify that our counter starts at 0.
     expect(find.text('0'), findsOneWidget);