Merge branch 'feature_uff' into 'master'

feature_uff See merge request domib97/notes_app2!5
domib97 · May 16, 2024 · 9f48435 · 9f48435
2 parents 09a3622 + 106a766
commit 9f48435
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 19 deletions.
diff --git a/lib/inbox.dart b/lib/inbox.dart
diff --git a/lib/inbox_page.dart b/lib/inbox_page.dart
@@ -0,0 +1,62 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_animate/flutter_animate.dart';
+
+void main() {
+  runApp(MyApp());
+}
+
+class MyApp extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return MaterialApp(
+      title: 'Inbox',
+      theme: ThemeData(
+        primarySwatch: Colors.green,
+      ),
+      home: InboxPage(),
+    );
+  }
+}
+
+class InboxPage extends StatefulWidget {
+  @override
+  _InboxPageState createState() => _InboxPageState();
+  const InboxPage({super.key});
+}
+
+class _InboxPageState extends State<InboxPage> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text('Inbox'),
+        centerTitle: true,
+      ),
+      body: DefaultTabController(
+        length: 3,
+        child: Column(
+          children: <Widget>[
+            const TabBar(
+              indicatorColor: Colors.green,
+              labelColor: Colors.green,
+              tabs: [
+                Tab(text: 'A'),
+                Tab(text: 'B'),
+                Tab(text: 'C'),
+              ],
+            ),
+            Expanded(
+              child: TabBarView(
+                children: [
+                  Center(child: const Text('Content A', style: TextStyle(fontSize: 24)).animate().fade().scale().tint(color: Colors.pink)),
+                  Center(child: const Text('Content B', style: TextStyle(fontSize: 24)).animate().fade().scale().tint(color: Colors.cyanAccent)),
+                  Center(child: const Text('Content C', style: TextStyle(fontSize: 24)).animate().fade().scale().tint(color: Colors.greenAccent)),
+                ],
+              ),
+            ),
+          ],
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/main.dart b/lib/main.dart
@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 import 'note_page.dart';
 import 'chat_page.dart';
-import 'inbox.dart';
+import 'inbox_page.dart';
 import 'settings_page.dart';
 
 void main() {
@@ -21,7 +21,7 @@ class _MyAppState extends State<MyApp> {
   static final List<Widget> _widgetOptions = [
     const NotePage(),
     const ChatScreen(),
-    const NotificationsPage(),
+    const InboxPage(),
     const SettingsPage(),
   ];
 

diff --git a/lib/settings_page.dart b/lib/settings_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:font_awesome_flutter/font_awesome_flutter.dart';
 
 class SettingsPage extends StatefulWidget {
   @override
@@ -10,18 +11,21 @@ class _SettingsPageState extends State<SettingsPage> {
   bool _darkMode = false;
   bool _notificationsEnabled = true;
 
+
   @override
   Widget build(BuildContext context) {
     return Scaffold(
       appBar: AppBar(
         title: Text('Settings'),
+        centerTitle: true,
       ),
       body: ListView(
         children: <Widget>[
           ListTile(
             title: Text('Dark Mode'),
             trailing: Switch(
               value: _darkMode,
+              activeColor: Colors.green,
               onChanged: (value) {
                 setState(() {
                   _darkMode = value;
@@ -33,6 +37,7 @@ class _SettingsPageState extends State<SettingsPage> {
             title: Text('Notifications'),
             trailing: Switch(
               value: _notificationsEnabled,
+              activeColor: Colors.green,
               onChanged: (value) {
                 setState(() {
                   _notificationsEnabled = value;
@@ -43,15 +48,15 @@ class _SettingsPageState extends State<SettingsPage> {
           ListTile(
             title: Text('Language'),
             subtitle: Text('English'),
-            trailing: Icon(Icons.arrow_forward_ios),
+            trailing: const FaIcon(FontAwesomeIcons.angleRight),
             onTap: () {
             // Navigate to language selection page
             },
           ),
           ListTile(
             title: Text('About'),
             subtitle: Text('Version 1.0'),
-            trailing: Icon(Icons.info),
+            trailing: const FaIcon(FontAwesomeIcons.circleInfo),
             onTap: () {
             // Show about dialog
             },