optimizations-ui-backend

ARYPROGRAMMER · Oct 5, 2024 · 65f1e7c · 65f1e7c
1 parent e36abe1
commit 65f1e7c
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 80 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -38,16 +38,16 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           artifacts: "build/app/outputs/apk/release/*"
-          tag: v2.0.5.1
+          tag: v2.0.6
           token: ${{ secrets.TOKEN }}
-          name: "stable-v2.0.5"
+          name: "stable-v2.0.6"
           body: |
-            ## What's New in v2.0.5.1
+            ## What's New in v2.0.6
             
+            - **Fixed Performance and Responsiveness Issues and Improved UI.
             - **New Feature**: Fast Login with Oauth2 independent of Firebase.
             - **Bug Fixes**: Resolved major bugs pertaining to login & signup leaks & getting ready for syncfusion.
             - **Performance Improvements**: Optimized the load response times.
             - **UI Enhancements**: Updated the home UI and added more animations.
             
-            ### Known Issues
-            - Some devices may still experience song player issues, will be solved in future releases .           
+            ### Known Issues are Resolved.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 ![Mindful-App](https://socialify.git.ci/ARYPROGRAMMER/Mindful-App/image?description=1&descriptionEditable=Mindful%20is%20a%20mental%20wellness%20app%20designed%20to%20support%20users%20in%20managing%20stress%20and%20anxiety&font=Source%20Code%20Pro&language=1&name=1&owner=1&pattern=Diagonal%20Stripes&stargazers=1&theme=Dark)
 
 [![Build Status](https://github.com/travisjeffery/timecop/workflows/CI/badge.svg)](https://github.com/ARYPROGRAMMER/Mindful-App/actions)
-![version](https://img.shields.io/badge/version-2.0.5.1-blue)
+![version](https://img.shields.io/badge/version-2.0.6-green)
 
 <p align="center">
     <img src="https://img.shields.io/badge/firebase-ffca28?style=for-the-badge&logo=firebase&logoColor=black"/>
@@ -12,12 +12,17 @@
 
 **APP STATUS** : ALL CORE FUNCTIONALITIES WORKING (Deployed NodeJs & Postgresql on Render)
 
-## What's New in v2.0.5.1 (**Images in readme.md Not Updated**)
+## What's New in v2.0.6 (Images in **README.md** are **not** updated)
+
+            - **Fixed Performance and Responsiveness Issues and Improved UI.
             - **New Feature**: Fast Login with Oauth2 independent of Firebase.
             - **Bug Fixes**: Resolved major bugs pertaining to login & signup leaks & getting ready for syncfusion.
             - **Performance Improvements**: Optimized the load response times.
             - **UI Enhancements**: Updated the home UI and added more animations.
 
+                ### Known Issues are Resolved.
+
+
 [DEMO LINK](https://vimeo.com/1013864504)
 
 [Blog Post](https://dev.to/aryprogrammer/building-mindful-a-mental-wellness-app-with-nodejs-ai-and-clean-architecture-3n9d)

diff --git a/lib/core/theme.dart b/lib/core/theme.dart
@@ -26,7 +26,7 @@ class DefaultColors {
 class AppTheme {
   static ThemeData get lightTheme {
     return ThemeData(
-      primaryColor: const Color(0xFFAEAFF7),
+      primaryColor: Colors.white,
       focusColor: const Color(0xFF371B34),
       textTheme: TextTheme(
         bodySmall: GoogleFonts.alegreyaSans(

diff --git a/lib/features/auth/presentation/auth/pages/signin.dart b/lib/features/auth/presentation/auth/pages/signin.dart
@@ -23,7 +23,7 @@ class SignIn extends StatelessWidget {
       final myboxx = Hive.box('lastlogin');
       if (user == null) {
         ScaffoldMessenger.of(context)
-            .showSnackBar(const SnackBar(content: Text("Faliure")));
+            .showSnackBar(const SnackBar(content: Text("Cancelled by User")));
       } else {
         myboxx.put('google', 'true');
         Navigator.pushAndRemoveUntil(
@@ -50,15 +50,12 @@ class SignIn extends StatelessWidget {
         scrollDirection: Axis.vertical,
         child: Padding(
           padding: const EdgeInsets.symmetric(
-            vertical: 40,
+            vertical: 20,
             horizontal: 40,
           ),
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.center,
             children: [
-              const SizedBox(
-                height: 10,
-              ),
               const Text(
                 "Get In Your Mood",
                 style: TextStyle(
@@ -68,7 +65,7 @@ class SignIn extends StatelessWidget {
                     fontWeight: FontWeight.bold),
               ),
               const SizedBox(
-                height: 80,
+                height: 50,
               ),
               _registerText(),
               const SizedBox(

diff --git a/lib/features/meditation/presentation/pages/meditation_page.dart b/lib/features/meditation/presentation/pages/meditation_page.dart
@@ -25,9 +25,12 @@ class MeditationPage extends StatelessWidget {
     GoogleSignInAccount? user2 = GoogleSignInApi.details();
 
     return Scaffold(
-      backgroundColor: DefaultColors.white,
+      backgroundColor: Colors.white,
       appBar: AppBar(
-        elevation: 0,
+        backgroundColor: DefaultColors.white,
+        centerTitle: false,
+        elevation: 10,
+        shadowColor: Colors.black,
         leading: Image.asset(
           'assets/menu_burger.png',
         ),
@@ -47,7 +50,7 @@ class MeditationPage extends StatelessWidget {
       ),
       body: Container(
         color: Colors.white,
-        padding: const EdgeInsets.all(12),
+        padding: const EdgeInsets.only(top: 12, left: 12, right: 12),
         child: SingleChildScrollView(
           child: Column(
             crossAxisAlignment: CrossAxisAlignment.start,
@@ -104,7 +107,7 @@ class MeditationPage extends StatelessWidget {
                 ],
               ),
               const SizedBox(
-                height: 32,
+                height: 30,
               ),
               Text(
                 "How are you feeling today ?",

diff --git a/lib/features/meditation/presentation/pages/settingscreen.dart b/lib/features/meditation/presentation/pages/settingscreen.dart
@@ -1,6 +1,7 @@
 import 'package:firebase_auth/firebase_auth.dart';
 import 'package:flutter/material.dart';
 import 'package:hive/hive.dart';
+import 'package:mental_health/core/theme.dart';
 import 'package:mental_health/features/auth/domain/entities/auth/googleapisignin.dart';
 import 'package:mental_health/features/meditation/presentation/pages/generalSettings/fieldUpdates.dart';
 import 'package:mental_health/presentation/onboarding/onboarding.dart';
@@ -11,6 +12,43 @@ class SettingScreen extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
+      appBar: AppBar(
+        backgroundColor: DefaultColors.white,
+        elevation: 10,
+        shadowColor: Colors.black,
+        leading: Container(
+          decoration: const BoxDecoration(
+            image: DecorationImage(
+              image: AssetImage('assets/essentials/back.png'),
+            ),
+          ),
+        ),
+        title: Row(
+          mainAxisAlignment: MainAxisAlignment.start,
+          children: [
+            const Text(
+              'Settings',
+              style: TextStyle(
+                color: Colors.black,
+                fontSize: 20,
+                fontFamily: 'Inter',
+                fontWeight: FontWeight.w400,
+                height: 0,
+              ),
+            ),
+            Container(
+              width: 53,
+              height: 48,
+              decoration: const BoxDecoration(
+                image: DecorationImage(
+                  image: AssetImage('assets/essentials/set.png'),
+                  fit: BoxFit.contain,
+                ),
+              ),
+            ),
+          ],
+        ),
+      ),
       body: SingleChildScrollView(
         scrollDirection: Axis.vertical,
         child: Container(
@@ -20,34 +58,6 @@ class SettingScreen extends StatelessWidget {
           decoration: const BoxDecoration(color: Colors.white),
           child: Stack(
             children: [
-              Positioned(
-                left: 142,
-                top: 35,
-                child: Container(
-                  width: 53,
-                  height: 48,
-                  decoration: const BoxDecoration(
-                    image: DecorationImage(
-                      image: AssetImage('assets/essentials/set.png'),
-                      fit: BoxFit.contain,
-                    ),
-                  ),
-                ),
-              ),
-              Positioned(
-                left: 27,
-                top: 45,
-                child: Container(
-                  width: 29,
-                  height: 29,
-                  decoration: const BoxDecoration(
-                    image: DecorationImage(
-                      image: AssetImage('assets/essentials/back.png'),
-                      fit: BoxFit.contain,
-                    ),
-                  ),
-                ),
-              ),
               Positioned(
                 left: 54,
                 top: 230,
@@ -227,24 +237,6 @@ class SettingScreen extends StatelessWidget {
                   ),
                 ),
               ),
-              const Positioned(
-                left: 190,
-                top: 45,
-                child: SizedBox(
-                  width: 82,
-                  height: 27,
-                  child: Text(
-                    'Settings',
-                    style: TextStyle(
-                      color: Colors.black,
-                      fontSize: 20,
-                      fontFamily: 'Inter',
-                      fontWeight: FontWeight.w400,
-                      height: 0,
-                    ),
-                  ),
-                ),
-              ),
               Positioned(
                 left: 89,
                 top: 234,

diff --git a/lib/presentation/bottomNavBar/widgets/bottomNavBar.dart b/lib/presentation/bottomNavBar/widgets/bottomNavBar.dart
@@ -11,12 +11,20 @@ class Bottomnavbar extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return BottomNavigationBar(
-      items: items,
-      currentIndex: currentIndex,
-      onTap: (index) {
-        context.read<NavBloc>().add(NavigateTo(index: index));
-      },
+    return Container(
+      height: 110,
+      color: Colors.transparent,
+      padding: const EdgeInsets.only(top: 16, bottom: 20, right: 20, left: 20),
+      child: ClipRRect(
+        borderRadius: BorderRadius.circular(40),
+        child: BottomNavigationBar(
+          items: items,
+          currentIndex: currentIndex,
+          onTap: (index) {
+            context.read<NavBloc>().add(NavigateTo(index: index));
+          },
+        ),
+      ),
     );
   }
 }
diff --git a/lib/presentation/homePage/home_page.dart b/lib/presentation/homePage/home_page.dart
@@ -17,21 +17,26 @@ class HomePage extends StatelessWidget {
     Playlistscreen(),
     const SettingScreen(),
   ];
+  static Map<String, String> mappings = {
+    'assets/menu_home.png': 'Home',
+    'assets/ais.png': 'FER',
+    'assets/menu_songs.png': 'Music',
+    'assets/settings.png': 'Settings'
+  };
 
   BottomNavigationBarItem createItem(
       {required String assetName,
       required bool isActive,
       bool settings = false,
       required BuildContext context}) {
     return BottomNavigationBarItem(
+        backgroundColor: Colors.black.withOpacity(0.7),
         icon: Image.asset(
           assetName,
-          color: isActive
-              ? Theme.of(context).focusColor
-              : Theme.of(context).primaryColor,
-          height: settings ? 30 : 45,
+          color: isActive ? Colors.blue : Colors.white,
+          height: settings ? 25 : 40,
         ),
-        label: '');
+        label: mappings[assetName]);
   }
 
   @override
@@ -45,6 +50,7 @@ class HomePage extends StatelessWidget {
           return pages[0];
         },
       ),
+      extendBody: true,
       bottomNavigationBar:
           BlocBuilder<NavBloc, NavState>(builder: (context, state) {
         int currentIndex = 0;
@@ -57,10 +63,10 @@ class HomePage extends StatelessWidget {
               isActive: currentIndex == 0,
               context: context),
           createItem(
-            assetName: 'assets/ais.png',
-            isActive: currentIndex == 1,
-            context: context,
-          ),
+              assetName: 'assets/ais.png',
+              isActive: currentIndex == 1,
+              context: context,
+              settings: true),
           createItem(
               assetName: 'assets/menu_songs.png',
               isActive: currentIndex == 2,

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 2.0.5
+version: 2.0.6
 
 environment:
   sdk: ^3.5.3