Skip to content

UX fixes #1606

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
beastoin merged 6 commits into from
Dec 29, 2024
Merged

UX fixes #1606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
394e4ef
do not show device name after connected
mdmohsin7 Dec 29, 2024
358602d
show sync icon at top
mdmohsin7 Dec 29, 2024
8e70b18
misc
mdmohsin7 Dec 29, 2024
f4c1e77
replace outlines
mdmohsin7 Dec 29, 2024
a743770
minor fix
mdmohsin7 Dec 29, 2024
5b36cd3
minor size changes
mdmohsin7 Dec 29, 2024
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
2 changes: 1 addition & 1 deletion app/lib/pages/conversations/conversations_page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ class _ConversationsPageState extends State<ConversationsPage> with AutomaticKee
const SliverToBoxAdapter(child: SizedBox(height: 26)),
const SliverToBoxAdapter(child: SpeechProfileCardWidget()),
const SliverToBoxAdapter(child: UpdateFirmwareCardWidget()),
const SliverToBoxAdapter(child: ConversationCaptureWidget()),
const SliverToBoxAdapter(child: LocalSyncWidget()),
const SliverToBoxAdapter(child: ConversationCaptureWidget()),
const SliverToBoxAdapter(child: SearchWidget()),
getProcessingConversationsWidget(convoProvider.processingConversations),
if (convoProvider.groupedConversations.isEmpty && !convoProvider.isLoadingConversations)
Expand Down
65 changes: 33 additions & 32 deletions app/lib/pages/conversations/widgets/local_sync.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,38 +95,39 @@ class _LocalSyncWidgetState extends State<LocalSyncWidget> {

// ready to sync
if (_status == LocalSyncStatus.flush) {
return GestureDetector(
onTap: () {
routeToPage(context, const SyncPage());
},
child: Container(
decoration: BoxDecoration(
color: Colors.grey.shade900,
borderRadius: const BorderRadius.all(Radius.circular(12)),
),
padding: const EdgeInsets.all(16),
margin: const EdgeInsets.fromLTRB(16, 16, 16, 0),
child: Row(
mainAxisAlignment: MainAxisAlignment.spaceBetween,
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const Row(
children: [
Text(
'Stay in Sync',
style: TextStyle(color: Colors.white, fontSize: 16),
textAlign: TextAlign.center,
),
],
),
Text(
'${secondsToHumanReadable(_missSeconds.toString())} available',
style: Theme.of(context).textTheme.bodyMedium!.copyWith(decoration: TextDecoration.underline),
),
],
),
),
);
return SizedBox.shrink();
// return GestureDetector(
// onTap: () {
// routeToPage(context, const SyncPage());
// },
// child: Container(
// decoration: BoxDecoration(
// color: Colors.grey.shade900,
// borderRadius: const BorderRadius.all(Radius.circular(12)),
// ),
// padding: const EdgeInsets.all(16),
// margin: const EdgeInsets.fromLTRB(16, 16, 16, 0),
// child: Row(
// mainAxisAlignment: MainAxisAlignment.spaceBetween,
// crossAxisAlignment: CrossAxisAlignment.center,
// children: [
// const Row(
// children: [
// Text(
// 'Stay in Sync',
// style: TextStyle(color: Colors.white, fontSize: 16),
// textAlign: TextAlign.center,
// ),
// ],
// ),
// Text(
// '${secondsToHumanReadable(_missSeconds.toString())} available',
// style: Theme.of(context).textTheme.bodyMedium!.copyWith(decoration: TextDecoration.underline),
// ),
// ],
// ),
// ),
// );
}

return const SizedBox.shrink();
Expand Down
23 changes: 19 additions & 4 deletions app/lib/pages/home/page.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import 'package:permission_handler/permission_handler.dart';
import 'package:provider/provider.dart';
import 'package:upgrader/upgrader.dart';

import '../conversations/sync_page.dart';
import 'widgets/battery_info_widget.dart';

class HomePageWrapper extends StatefulWidget {
Expand Down Expand Up @@ -438,17 +439,31 @@ class _HomePageState extends State<HomePage> with WidgetsBindingObserver, Ticker
crossAxisAlignment: CrossAxisAlignment.center,
children: [
const BatteryInfoWidget(),
Consumer<HomeProvider>(builder: (context, provider, child) {
if (provider.selectedIndex == 0) {
return (context.read<ConversationProvider>().missingWalsInSeconds >= 120
? GestureDetector(
onTap: () {
routeToPage(context, const SyncPage());
},
child: Container(
padding: const EdgeInsets.only(left: 12),
child: const Icon(Icons.download, color: Colors.white, size: 24),
),
)
: const SizedBox.shrink());
} else {
return const SizedBox.shrink();
}
}),
Consumer<HomeProvider>(
builder: (context, provider, child) {
if (provider.selectedIndex == 1) {
return ChatAppsDropdownWidget(
controller: _controller,
);
} else if (provider.selectedIndex == 2) {
return Padding(
padding: EdgeInsets.only(left: MediaQuery.sizeOf(context).width * 0.12),
child: const Text('Apps', style: TextStyle(color: Colors.white, fontSize: 18)),
);
return const Text('Apps', style: TextStyle(color: Colors.white, fontSize: 18));
} else {
return Flexible(
child: Row(
Expand Down
16 changes: 2 additions & 14 deletions app/lib/pages/home/widgets/battery_info_widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,8 @@ class BatteryInfoWidget extends StatelessWidget {
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 14, vertical: 10),
decoration: BoxDecoration(
color: Colors.transparent,
color: Colors.grey.shade900,
borderRadius: BorderRadius.circular(10),
border: Border.all(
color: Colors.grey,
width: 1,
),
),
child: Row(
mainAxisSize: MainAxisSize.min,
Expand All @@ -59,13 +55,6 @@ class BatteryInfoWidget extends StatelessWidget {
),
),
const SizedBox(width: 8.0),
isMemoriesPage
? Text(
deviceProvider.connectedDevice?.name ?? SharedPreferencesUtil().deviceName,
style: const TextStyle(color: Colors.white, fontSize: 14),
)
: const SizedBox.shrink(),
isMemoriesPage ? const SizedBox(width: 8) : const SizedBox.shrink(),
Text(
deviceProvider.batteryLevel > 0 ? '${deviceProvider.batteryLevel.toString()}%' : "",
style: const TextStyle(color: Colors.white, fontSize: 12, fontWeight: FontWeight.bold),
Expand All @@ -86,9 +75,8 @@ class BatteryInfoWidget extends StatelessWidget {
child: Container(
padding: const EdgeInsets.symmetric(horizontal: 12, vertical: 7),
decoration: BoxDecoration(
color: Colors.transparent,
color: Colors.grey.shade900,
borderRadius: BorderRadius.circular(10),
border: Border.all(color: Colors.grey, width: 1),
),
child: Row(
children: [
Expand Down
25 changes: 13 additions & 12 deletions app/lib/pages/home/widgets/speech_language_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,30 +99,31 @@ class SpeechLanguageSheet extends StatelessWidget {
);
},
child: Container(
width: MediaQuery.of(context).size.width * 0.19,
height: MediaQuery.of(context).size.height * 0.041,
width: MediaQuery.of(context).size.width * 0.18,
height: MediaQuery.of(context).size.height * 0.0375,
decoration: BoxDecoration(
border: Border.all(
color: Colors.grey,
width: 1,
),
borderRadius: BorderRadius.circular(10),
color: Colors.grey.shade900,
),
padding: const EdgeInsets.only(left: 12, right: 4),
padding: const EdgeInsets.only(left: 8, right: 2),
child: Row(
children: [
const Icon(
Icons.language,
color: Colors.white,
size: 20,
),
const Spacer(
flex: 1,
flex: 2,
),
Text(
SharedPreferencesUtil().recordingsLanguage,
style: const TextStyle(color: Colors.white, fontWeight: FontWeight.w500, fontSize: 16),
SharedPreferencesUtil().recordingsLanguage.toUpperCase(),
style: const TextStyle(color: Colors.white, fontWeight: FontWeight.w500, fontSize: 14),
textAlign: TextAlign.center,
),
const Spacer(
flex: 2,
flex: 3,
),
const Icon(Icons.arrow_drop_down, color: Colors.white),
],
),
),
Expand Down