From 329632fbcb7bd8eef2cd94e7eb569ac427f8b8fa Mon Sep 17 00:00:00 2001 From: jaivsh Date: Sun, 6 Aug 2023 23:32:14 +0530 Subject: [PATCH 1/2] ok --- lib/main.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/main.dart b/lib/main.dart index be52d4ca95..82054cfd80 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -130,7 +130,7 @@ class _MyAppState extends State { GlobalWidgetsLocalizations.delegate, GlobalCupertinoLocalizations.delegate, ], - locale: Locale('en'), + locale: Locale('hi'), supportedLocales: [ Locale('en'), // English Locale('hi'), // Hindi From fd44fb166ec036813b50659bc4592ea308c8295b Mon Sep 17 00:00:00 2001 From: jaivsh Date: Wed, 9 Aug 2023 16:59:53 +0530 Subject: [PATCH 2/2] Changed UI of search bar in home screen --- lib/screens/home_screen.dart | 13 ++++++++----- lib/widgets/build_classes.dart | 19 +------------------ 2 files changed, 9 insertions(+), 23 deletions(-) diff --git a/lib/screens/home_screen.dart b/lib/screens/home_screen.dart index e60a80ffd8..41240116f9 100644 --- a/lib/screens/home_screen.dart +++ b/lib/screens/home_screen.dart @@ -208,6 +208,8 @@ class DataSearch extends SearchDelegate { @override ThemeData appBarTheme(BuildContext context) { return Theme.of(context).copyWith( + scaffoldBackgroundColor: Theme.of(context).colorScheme.background.withOpacity(0.8), + appBarTheme: AppBarTheme( backgroundColor: Colors.black, titleTextStyle: TextStyle(color: kTextColor), @@ -254,13 +256,14 @@ class DataSearch extends SearchDelegate { .toList(); if (query.isEmpty) { return Center( - child: Text('Search for the notes here'), + child: Text('Search for the notes here', style: TextStyle(color: Colors.white),), ); } return SingleChildScrollView( + child: Padding( padding: EdgeInsets.all(8.0), - child: Column( + child: Container(child: Column( children: [ Column( children: [ @@ -268,7 +271,7 @@ class DataSearch extends SearchDelegate { Text( "Recent Alerts", style: TextStyle( - color: Colors.black, + color: Colors.white, fontSize: 20.0, fontWeight: FontWeight.bold, ), @@ -447,7 +450,7 @@ class DataSearch extends SearchDelegate { Text( "Recent Homework", style: TextStyle( - color: Colors.black, + color: Colors.white, fontSize: 20.0, fontWeight: FontWeight.bold, ), @@ -533,7 +536,7 @@ class DataSearch extends SearchDelegate { ], ), ), - ); + )); } _getColor(BuildContext context, double percent) { diff --git a/lib/widgets/build_classes.dart b/lib/widgets/build_classes.dart index 9314266277..fe3d347b2c 100644 --- a/lib/widgets/build_classes.dart +++ b/lib/widgets/build_classes.dart @@ -152,24 +152,7 @@ class _BuildClassesState extends State { ), ),), - TableCalendar( - onFormatChanged: (format) {}, - firstDay: DateTime.utc(2002), - lastDay: DateTime.utc(2024), - focusedDay: _focusedDay, - selectedDayPredicate: (day) => isSameDay(_selectedDay, day), - eventLoader: _getEventsForDay, - onDaySelected: _onDaySelected, - - calendarStyle: CalendarStyle( - disabledTextStyle: TextStyle(color: Colors.white), - weekNumberTextStyle: TextStyle(color: Theme.of(context).primaryColor), - markerDecoration: BoxDecoration( - shape: BoxShape.circle, - color: Colors.amber, - ), - ), - ), + classesList != null && classesList.isNotEmpty ? Padding(