Skip to content

UI Consistency Improvements - Issue #92 #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
grunch merged 14 commits into from
Jul 2, 2025
Merged

UI Consistency Improvements - Issue #92 #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ebc5808
inital change for drawer
AndreaDiazCorreia Jun 6, 2025
a9d7c34
Merge pull request #4 from AndreaDiazCorreia/main
AndreaDiazCorreia Jun 14, 2025
be4f905
feat: implement custom drawer overlay with slide animation and state …
AndreaDiazCorreia Jun 17, 2025
112bcc9
Update lib/shared/widgets/mostro_app_bar.dart
AndreaDiazCorreia Jun 17, 2025
29aaf12
feat: add back button handling to close drawer before exiting app
AndreaDiazCorreia Jun 17, 2025
ea53dda
remove: delete unused MostroAppDrawer widget component
AndreaDiazCorreia Jun 17, 2025
e10a362
feat: add horizontal swipe gestures for order type switching and draw…
AndreaDiazCorreia Jun 24, 2025
41426c6
refactor: reorganize home screen layout and simplify bottom navigatio…
AndreaDiazCorreia Jun 25, 2025
b323118
Merge branch 'feat/issue-92' into main
AndreaDiazCorreia Jun 25, 2025
eeae3fd
Merge pull request #8 from AndreaDiazCorreia/main
AndreaDiazCorreia Jun 25, 2025
d0c6272
feat: wrap trades screen with CustomDrawerOverlay and remove standalo…
AndreaDiazCorreia Jun 25, 2025
0571683
refactor: improve accessibility and remove unused code in trades scre…
AndreaDiazCorreia Jun 25, 2025
ea91c38
refactor: remove comments and improve code formatting in home and tra…
AndreaDiazCorreia Jun 25, 2025
0103e66
fix: add bottom safe area to navigation bar for proper padding
AndreaDiazCorreia Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 22 additions & 21 deletions lib/features/chat/screens/chat_rooms_list.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import 'package:mostro_mobile/shared/providers/legible_handle_provider.dart';
import 'package:mostro_mobile/shared/providers/session_notifier_provider.dart';
import 'package:mostro_mobile/shared/widgets/bottom_nav_bar.dart';
import 'package:mostro_mobile/shared/widgets/mostro_app_bar.dart';
import 'package:mostro_mobile/shared/widgets/mostro_app_drawer.dart';
import 'package:mostro_mobile/shared/widgets/custom_drawer_overlay.dart';

class ChatRoomsScreen extends ConsumerWidget {
const ChatRoomsScreen({super.key});
Expand All @@ -22,27 +22,28 @@ class ChatRoomsScreen extends ConsumerWidget {
return Scaffold(
backgroundColor: AppTheme.dark1,
appBar: const MostroAppBar(),
drawer: const MostroAppDrawer(),
body: Container(
margin: const EdgeInsets.fromLTRB(16, 16, 16, 16),
decoration: BoxDecoration(
color: const Color(0xFF303544),
borderRadius: BorderRadius.circular(20),
),
child: Column(
children: [
Padding(
padding: const EdgeInsets.all(16.0),
child: Text(
'CHAT',
style: TextStyle(color: AppTheme.mostroGreen),
body: CustomDrawerOverlay(
child: Container(
margin: const EdgeInsets.fromLTRB(16, 16, 16, 16),
decoration: BoxDecoration(
color: const Color(0xFF303544),
borderRadius: BorderRadius.circular(20),
),
child: Column(
children: [
Padding(
padding: const EdgeInsets.all(16.0),
child: Text(
'CHAT',
style: TextStyle(color: AppTheme.mostroGreen),
),
),
),
Expanded(
child: _buildBody(chatListState),
),
const BottomNavBar(),
],
Expanded(
child: _buildBody(chatListState),
),
const BottomNavBar(),
],
),
),
),
);
Expand Down
136 changes: 81 additions & 55 deletions lib/features/home/screens/home_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import 'package:mostro_mobile/shared/widgets/add_order_button.dart';
import 'package:mostro_mobile/shared/widgets/bottom_nav_bar.dart';
import 'package:mostro_mobile/shared/widgets/mostro_app_bar.dart';
import 'package:mostro_mobile/shared/widgets/order_filter.dart';
import 'package:mostro_mobile/shared/widgets/mostro_app_drawer.dart';
import 'package:mostro_mobile/shared/widgets/custom_drawer_overlay.dart';

class HomeScreen extends ConsumerWidget {
const HomeScreen({super.key});
Expand All @@ -21,69 +21,95 @@ class HomeScreen extends ConsumerWidget {
return Scaffold(
backgroundColor: AppTheme.backgroundDark,
appBar: MostroAppBar(),
drawer: const MostroAppDrawer(),
body: Stack(
children: [
RefreshIndicator(
onRefresh: () async {
return await ref.refresh(filteredOrdersProvider);
},
child: Column(
body: CustomDrawerOverlay(
child: Stack(
children: [
// Main content column with bottom navigation
Column(
children: [
_buildTabs(ref),
_buildFilterButton(context, ref),
// Content area that expands to fill available space
Expanded(
child: Container(
color: const Color(0xFF1D212C),
child: filteredOrders.isEmpty
? const Center(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(
Icons.search_off,
color: Colors.white30,
size: 48,
),
SizedBox(height: 16),
Text(
'No orders available',
style: TextStyle(
color: Colors.white60,
fontSize: 16,
),
),
Text(
'Try changing filter settings or check back later',
style: TextStyle(
color: Colors.white38,
fontSize: 14,
),
textAlign: TextAlign.center,
),
],
child: RefreshIndicator(
onRefresh: () async {
return await ref.refresh(filteredOrdersProvider);
},
child: GestureDetector(
onHorizontalDragEnd: (details) {
if (details.primaryVelocity != null &&
details.primaryVelocity! < 0) {
ref.read(homeOrderTypeProvider.notifier).state =
OrderType.buy;
} else if (details.primaryVelocity != null &&
details.primaryVelocity! > 0) {
ref.read(homeOrderTypeProvider.notifier).state =
OrderType.sell;
}
},
child: Column(
children: [
_buildTabs(ref),
_buildFilterButton(context, ref),
Expanded(
child: Container(
color: const Color(0xFF1D212C),
child: filteredOrders.isEmpty
? const Center(
child: Column(
mainAxisAlignment:
MainAxisAlignment.center,
children: [
Icon(
Icons.search_off,
color: Colors.white30,
size: 48,
),
SizedBox(height: 16),
Text(
'No orders available',
style: TextStyle(
color: Colors.white60,
fontSize: 16,
),
),
Text(
'Try changing filter settings or check back later',
style: TextStyle(
color: Colors.white38,
fontSize: 14,
),
textAlign: TextAlign.center,
),
],
),
)
: ListView.builder(
itemCount: filteredOrders.length,
padding: const EdgeInsets.only(
bottom: 100, top: 6),
itemBuilder: (context, index) {
final order = filteredOrders[index];
return OrderListItem(order: order);
},
),
),
)
: ListView.builder(
itemCount: filteredOrders.length,
padding: const EdgeInsets.only(bottom: 155, top: 6),
itemBuilder: (context, index) {
final order = filteredOrders[index];
return OrderListItem(order: order);
},
),
],
),
),
),
),
// Bottom navigation bar fixed at the bottom
const BottomNavBar(),
],
),
),
Positioned(
bottom: 80 + MediaQuery.of(context).viewPadding.bottom + 16,
right: 16,
child: const AddOrderButton(),
),
],
// Floating action button positioned above bottom nav bar
Positioned(
bottom: 80 + MediaQuery.of(context).viewPadding.bottom + 16,
right: 16,
child: const AddOrderButton(),
),
],
),
),
);
}
Expand Down
Loading