Juan/hym_ui
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

android/ios-adaption feature, markdown, and augment #6

Merged
Juan merged 64 commits from android-adaption into main 2025-08-31 23:05:21 -04:00
Conversation 1 Commits 64 Files changed 71 +233 -224
2 changed files with 233 additions and 224 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 5d4bc01a59 - Show all commits

450
lib/home_page.dart
View file

@ -170,245 +170,251 @@ class _HomeScreenState extends State<HomeScreen> with TickerProviderStateMixin {
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
return Padding( return Scaffold(
padding: const EdgeInsets.fromLTRB(0, 20, 0 , 20), backgroundColor: Theme.of(context).colorScheme.onPrimary,
child: Scaffold( body: Padding(
key: _scaffoldKey, padding: const EdgeInsets.fromLTRB(0, 20, 0 , 20),
drawer: FolderDrawer( child: Scaffold(
apiService: apiService, key: _scaffoldKey,
onFolderTap: (folder) { drawer: FolderDrawer(
_emailPageKey.currentState?.updateSelectedFolder(folder); apiService: apiService,
}, onFolderTap: (folder) {
), _emailPageKey.currentState?.updateSelectedFolder(folder);
body: Padding( },
padding: const EdgeInsets.fromLTRB(0, 20, 0, 0), ),
child: Stack( body: Scaffold(
children: [ backgroundColor: Theme.of(context).colorScheme.onPrimary,
Row( body: Padding(
padding: const EdgeInsets.fromLTRB(0, 20, 0, 0),
child: Stack(
children: [ children: [
// Sidebar Row(
if (_isSidebarOpen) children: [
Container( // Sidebar
width: 70, if (_isSidebarOpen)
color: Color.fromARGB(17, 96, 122, 135), Container(
child: Column( width: 70,
crossAxisAlignment: CrossAxisAlignment.start, color: Color.fromARGB(17, 96, 122, 135),
children: [ child: Column(
ListTile( crossAxisAlignment: CrossAxisAlignment.start,
leading: Icon(Icons.home), children: [
onTap: () { ListTile(
// Navigate to Home leading: Icon(Icons.home),
}, onTap: () {
), // Navigate to Home
ListTile(
leading: Icon(Icons.settings),
onTap: () {
// Navigate to Settings
},
),
ListTile(
leading: Icon(Icons.email),
onTap: () {
_scaffoldKey.currentState?.openDrawer();
},
),
Spacer(),
Padding(
padding: const EdgeInsets.all(8.0),
child: Align(
alignment: Alignment.bottomLeft,
child: IconButton(
icon: Icon(Icons.close, color: Colors.white),
onPressed: () {
setState(() {
_isSidebarOpen = false;
});
}, },
), ),
), ListTile(
), leading: Icon(Icons.settings),
], onTap: () {
), // Navigate to Settings
), },
// Main content ),
Expanded( ListTile(
child: Column( leading: Icon(Icons.email),
children: [ onTap: () {
Container( _scaffoldKey.currentState?.openDrawer();
padding: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 4.0), },
color: Color.fromARGB(42, 36, 102, 132), ),
child: Row( Spacer(),
mainAxisAlignment: MainAxisAlignment.center, Padding(
children: [ padding: const EdgeInsets.all(8.0),
Flexible( child: Align(
child: ConstrainedBox( alignment: Alignment.bottomLeft,
constraints: BoxConstraints( child: IconButton(
maxWidth: 800, icon: Icon(Icons.close, color: Colors.white),
onPressed: () {
setState(() {
_isSidebarOpen = false;
});
},
), ),
child: SizedBox( ),
height: 40, ),
child: TextField( ],
decoration: InputDecoration( ),
hintText: 'Search...', ),
border: OutlineInputBorder(), // Main content
prefixIcon: Icon(Icons.search), Expanded(
child: Column(
children: [
Container(
padding: EdgeInsets.fromLTRB(8.0, 8.0, 8.0, 4.0),
color: Color.fromARGB(42, 36, 102, 132),
child: Row(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Flexible(
child: ConstrainedBox(
constraints: BoxConstraints(
maxWidth: 800,
),
child: SizedBox(
height: 40,
child: TextField(
decoration: InputDecoration(
hintText: 'Search...',
border: OutlineInputBorder(),
prefixIcon: Icon(Icons.search),
),
onSubmitted: (value) {
if (value.isNotEmpty) {
_performSearch(value, _selectedOption);
}
//this is the input box i mentioned
// if (value == '') {
// setState(() {
// querySearches = false;
// });
// }
// Future<List<String>> results = apiService
// .sonicSearch('INBOX', 20, 0, value);
// // print(value);
// print(results);
// setState(() {
// querySearches = true;
// });
},
),
), ),
onSubmitted: (value) {
if (value.isNotEmpty) {
_performSearch(value, _selectedOption);
}
//this is the input box i mentioned
// if (value == '') {
// setState(() {
// querySearches = false;
// });
// }
// Future<List<String>> results = apiService
// .sonicSearch('INBOX', 20, 0, value);
// // print(value);
// print(results);
// setState(() {
// querySearches = true;
// });
},
), ),
), ),
), SizedBox(
width: 8,
),
Container(
height: 40,
child: ElevatedButton(
onPressed: _showOptionsSearchDialog,
child: Icon(Icons.manage_search),
),
)
],
), ),
SizedBox( ),
width: 8, Container(
padding: EdgeInsets.all(0.0),
color: Color.fromARGB(42, 36, 102, 132),
child: Row(
children: [
Container(
height: 2,
)
],
), ),
Container( ),
height: 40, Container(
child: ElevatedButton( color: Color.fromARGB(255, 131, 110, 143),
onPressed: _showOptionsSearchDialog, child: TabBar(
child: Icon(Icons.manage_search), controller: _tabController,
), isScrollable: true,
) tabs: _tabs
], .asMap()
), .entries
), .map((entry) => Tab(
Container( child: Row(
padding: EdgeInsets.all(0.0), children: [
color: Color.fromARGB(42, 36, 102, 132), Text(entry.value),
child: Row( if (entry.value != 'Emails')
children: [ GestureDetector(
Container( onTap: () => _removeTab(entry.key),
height: 2, child: Icon(Icons.close, size: 16),
) ),
], ],
), ),
), ))
Container( .toList(),
color: Color.fromARGB(255, 131, 110, 143), labelColor: Colors.white,
child: TabBar( indicatorColor: Colors.white,
controller: _tabController,
isScrollable: true,
tabs: _tabs
.asMap()
.entries
.map((entry) => Tab(
child: Row(
children: [
Text(entry.value),
if (entry.value != 'Emails')
GestureDetector(
onTap: () => _removeTab(entry.key),
child: Icon(Icons.close, size: 16),
),
],
),
))
.toList(),
labelColor: Colors.white,
indicatorColor: Colors.white,
),
),
Container(
// alignment: Alignment.topLeft,
padding: EdgeInsets.all(8.0),
color: Colors.white,
child: Row(
children: [
ElevatedButton(
onPressed: () {
_emailPageKey.currentState!.isBackDisabled ? null: _emailPageKey.currentState
?.updatePagenation('back');
},
child: Icon(Icons.navigate_before),
), ),
Builder( ),
builder: (context) { Container(
final emailState = _emailPageKey.currentState; // alignment: Alignment.topLeft,
if (emailState == null) { padding: EdgeInsets.all(8.0),
// Schedule a rebuild once the state is available color: Colors.white,
Future.microtask(() => setState(() {})); child: Row(
return Text('Loading...'); children: [
} ElevatedButton(
onPressed: () {
_emailPageKey.currentState!.isBackDisabled ? null: _emailPageKey.currentState
?.updatePagenation('back');
},
child: Icon(Icons.navigate_before),
),
Builder(
builder: (context) {
final emailState = _emailPageKey.currentState;
if (emailState == null) {
// Schedule a rebuild once the state is available
Future.microtask(() => setState(() {}));
return Text('Loading...');
}
return ValueListenableBuilder<int>( return ValueListenableBuilder<int>(
valueListenable: emailState.currentPageNotifier, valueListenable: emailState.currentPageNotifier,
builder: (context, value, _) => Text('$value'), builder: (context, value, _) => Text('$value'),
); );
}, },
),
ElevatedButton(
onPressed: () {
_emailPageKey.currentState
?.updatePagenation('next');
},
child: Icon(Icons.navigate_next),
),
],
), ),
ElevatedButton( ),
onPressed: () { Expanded(
_emailPageKey.currentState child: TabBarView(
?.updatePagenation('next'); controller: _tabController,
}, children: _tabs.map((tab) {
child: Icon(Icons.navigate_next), return _tabWidgets[tab] ??
Center(child: Text("No content found"));
// return Center(
// child: EmailPage(
// key: _emailPageKey,
// ));
}).toList(),
), ),
], ),
),
),
Expanded(
child: TabBarView(
controller: _tabController,
children: _tabs.map((tab) {
return _tabWidgets[tab] ??
Center(child: Text("No content found"));
// return Center(
// child: EmailPage(
// key: _emailPageKey,
// ));
}).toList(),
),
),
// if (_tabs.isEmpty) // if (_tabs.isEmpty)
// Expanded( // Expanded(
// child: EmailPage(key: _emailPageKey), // child: EmailPage(key: _emailPageKey),
// ), // ),
// if (_tabs.isNotEmpty) // if (_tabs.isNotEmpty)
// Expanded( // Expanded(
// // child: Text('supposed to be mails'), // // child: Text('supposed to be mails'),
// child: TabBarView( // child: TabBarView(
// controller: _tabController, // controller: _tabController,
// children: _tabs // children: _tabs
// .map((tab) => Center(child: Text('Results for $tab'))) // .map((tab) => Center(child: Text('Results for $tab')))
// .toList(), // .toList(),
// ), // ),
// ), // ),
], ],
), ),
),
],
), ),
if (!_isSidebarOpen)
Positioned(
bottom: 16,
left: 16,
child: FloatingActionButton(
child: Icon(Icons.menu),
onPressed: () {
setState(() {
_isSidebarOpen = true;
});
},
),
),
], ],
), ),
if (!_isSidebarOpen) ),
Positioned(
bottom: 16,
left: 16,
child: FloatingActionButton(
child: Icon(Icons.menu),
onPressed: () {
setState(() {
_isSidebarOpen = true;
});
},
),
),
],
), ),
), ),
), ),

5
lib/main.dart
View file

@ -17,7 +17,10 @@ class HyM extends StatelessWidget {
Widget build(BuildContext context) { Widget build(BuildContext context) {
return MaterialApp( return MaterialApp(
debugShowCheckedModeBanner: false, debugShowCheckedModeBanner: false,
theme: ThemeData.light(), theme: ThemeData(
colorScheme: ColorScheme.light(),
useMaterial3: true,
),
title: 'HyM', title: 'HyM',
// home: HomeScreen(), // home: HomeScreen(),
initialRoute: "/", initialRoute: "/",