diff --git a/app/lib/pages/conversations/conversations_page.dart b/app/lib/pages/conversations/conversations_page.dart index e7a55ab5c3..b3627ec0a6 100644 --- a/app/lib/pages/conversations/conversations_page.dart +++ b/app/lib/pages/conversations/conversations_page.dart @@ -50,8 +50,8 @@ class _ConversationsPageState extends State 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) diff --git a/app/lib/pages/conversations/widgets/local_sync.dart b/app/lib/pages/conversations/widgets/local_sync.dart index 8adbb4677d..ba83db2582 100644 --- a/app/lib/pages/conversations/widgets/local_sync.dart +++ b/app/lib/pages/conversations/widgets/local_sync.dart @@ -95,38 +95,39 @@ class _LocalSyncWidgetState extends State { // 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(); diff --git a/app/lib/pages/home/page.dart b/app/lib/pages/home/page.dart index b474be98f7..c3517b4403 100644 --- a/app/lib/pages/home/page.dart +++ b/app/lib/pages/home/page.dart @@ -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 { @@ -438,6 +439,23 @@ class _HomePageState extends State with WidgetsBindingObserver, Ticker crossAxisAlignment: CrossAxisAlignment.center, children: [ const BatteryInfoWidget(), + Consumer(builder: (context, provider, child) { + if (provider.selectedIndex == 0) { + return (context.read().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( builder: (context, provider, child) { if (provider.selectedIndex == 1) { @@ -445,10 +463,7 @@ class _HomePageState extends State with WidgetsBindingObserver, Ticker 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( diff --git a/app/lib/pages/home/widgets/battery_info_widget.dart b/app/lib/pages/home/widgets/battery_info_widget.dart index 7da365b104..3fe80d734a 100644 --- a/app/lib/pages/home/widgets/battery_info_widget.dart +++ b/app/lib/pages/home/widgets/battery_info_widget.dart @@ -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, @@ -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), @@ -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: [ diff --git a/app/lib/pages/home/widgets/speech_language_sheet.dart b/app/lib/pages/home/widgets/speech_language_sheet.dart index 4319e40f3e..e7822db0e0 100644 --- a/app/lib/pages/home/widgets/speech_language_sheet.dart +++ b/app/lib/pages/home/widgets/speech_language_sheet.dart @@ -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), ], ), ),