update ui

ios/Flutter/.last_build_id

@@ -1 +1 @@
-dab672e712362fdbbfa98386624f95d6
+440505e9ea1eee7043d2cbfeb318f6bc

lib/presentation/custom_widgets/widget_search.dart

@@ -26,12 +26,12 @@ class _SearchWidgetState extends State<SearchWidget> {
   Widget getSearchBarUI() {
     _searchController.text = "";
     return Padding(
-      padding: const EdgeInsets.only(left: 8, right: 8, top: 4, bottom: 4),
+      padding: const EdgeInsets.only(left: 8, right: 8, top: 0, bottom: 4),
       child: Row(
         children: <Widget>[
           Expanded(
             child: Padding(
-              padding: const EdgeInsets.only(right: 8, top: 8, bottom: 0),
+              padding: const EdgeInsets.only(right: 8, top: 0, bottom: 0),
               child: Container(
                 child: Padding(
                   padding: const EdgeInsets.only(

lib/presentation/screens/account/sc_account.dart

@@ -63,12 +63,12 @@ class _AccountScreenState extends State<AccountScreen> {
   Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Colors.white,
-      appBar: AppBarWidget(
-        isBack: false,
-      ),
       body: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: <Widget>[
+          SizedBox(
+            height: 8,
+          ),
           Container(
               padding: EdgeInsets.all(8),
               color: Colors.white,

lib/presentation/screens/control_device/sc_control_device.dart

@@ -26,9 +26,6 @@ class _ControlDeviceScreenState extends State<ControlDeviceScreen> {
     _blocContext = context;
     return Scaffold(
         backgroundColor: Colors.white,
-        appBar: AppBarWidget(
-          isBack: false,
-        ),
         body: BlocProvider<DeviceBloc>(
             create: (context) =>
                 DeviceBloc(repository: Repository())..add(OpenScreen()),
@@ -39,6 +36,9 @@ class _ControlDeviceScreenState extends State<ControlDeviceScreen> {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
+        SizedBox(
+          height: 8,
+        ),
         Padding(
           padding: const EdgeInsets.all(8.0),
           child: Text(

lib/presentation/screens/notification/sc_notification.dart

@@ -61,9 +61,6 @@ class HoldInfinityWidget extends StatelessWidget {
     return Scaffold(
         key: _scaffoldKey,
         backgroundColor: Colors.white,
-        appBar: AppBarWidget(
-          isBack: false,
-        ),
         body: BlocBuilder<NotiBloc, NotiState>(
           cubit: notiBloc,
           builder: (context, state) {
@@ -120,11 +117,28 @@ class _InfinityViewState extends State<InfinityView> {
           return Center(child: Text(state.errorString));
         } else if (state is NotiSuccess) {
           if (state.items.isEmpty) {
-            return Center(child: Text("Không có thông báo"));
+            return Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                SizedBox(
+                  height: 8,
+                ),
+                Padding(
+                  padding: const EdgeInsets.all(8.0),
+                  child: Text('Thông báo',
+                      style:
+                          TextStyle(fontWeight: FontWeight.w500, fontSize: 22)),
+                ),
+                Expanded(
+                  child: Center(child: Text("Không có thông báo")),
+                ),
+              ],
+            );
           }
           currentItems = List<NotificationDTO>.from(state.items);
           currentPage = state.page;
           currentHasReachedMax = state.hasReachedMax;
+
           return Column(
             children: <Widget>[
               Container(
@@ -132,6 +146,9 @@ class _InfinityViewState extends State<InfinityView> {
                   color: Colors.white,
                   child: Row(
                     children: [
+                      SizedBox(
+                        height: 8,
+                      ),
                       Expanded(
                           child: Text(
                         'Thông báo',

lib/presentation/screens/plot/sc_plot.dart

@@ -119,6 +119,7 @@ class _PlotListScreenState extends State<PlotListScreen> {
     } else if (noti.contents == "PIC_UPDATE") {
       Get.to(PlotInformationScreen(
         cropId: noti.tbCropId,
+        isShowAppbar: true,
       ));
     } else {
       //Go home
@@ -146,12 +147,7 @@ class HoldInfinityWidget extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return Scaffold(
-        backgroundColor: Colors.white,
-        key: _scaffoldKey,
-        appBar: AppBarWidget(
-          isBack: false,
-        ),
-        body: InfinityView());
+        backgroundColor: Colors.white, key: _scaffoldKey, body: InfinityView());
   }
 }
 
@@ -183,6 +179,9 @@ class _InfinityViewState extends State<InfinityView> {
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: <Widget>[
+        SizedBox(
+          height: 8,
+        ),
         Container(
             padding: EdgeInsets.all(8),
             color: Colors.white,

lib/presentation/screens/plot/widget_search.dart

@@ -27,12 +27,12 @@ class _WidgetSearchState extends State<WidgetSearch> {
   Widget getSearchBarUI() {
     _searchController.text = "";
     return Padding(
-      padding: const EdgeInsets.only(left: 8, right: 8, top: 4, bottom: 4),
+      padding: const EdgeInsets.only(left: 8, right: 8, top: 0, bottom: 4),
       child: Row(
         children: <Widget>[
           Expanded(
             child: Padding(
-              padding: const EdgeInsets.only(right: 8, top: 8, bottom: 0),
+              padding: const EdgeInsets.only(right: 8, top: 0, bottom: 0),
               child: Container(
                 child: Padding(
                   padding: const EdgeInsets.only(

lib/presentation/screens/plot_detail/widget_tab.dart

@@ -70,7 +70,8 @@ class _HomeTabbarWidgetState extends State<HomeTabbarWidget>
                         style: TextStyle(
                             color: selectedTab.index == 0
                                 ? AppColors.DEFAULT
-                                : Colors.black),
+                                : Colors.black,
+                            fontSize: 12),
                       ),
                     ),
                     Container(
@@ -79,7 +80,8 @@ class _HomeTabbarWidgetState extends State<HomeTabbarWidget>
                           style: TextStyle(
                               color: selectedTab.index == 1
                                   ? AppColors.DEFAULT
-                                  : Colors.black)),
+                                  : Colors.black,
+                              fontSize: 12)),
                     ),
                     Container(
                       padding: EdgeInsets.only(top: 8, bottom: 8),
@@ -87,7 +89,8 @@ class _HomeTabbarWidgetState extends State<HomeTabbarWidget>
                           style: TextStyle(
                               color: selectedTab.index == 2
                                   ? AppColors.DEFAULT
-                                  : Colors.black)),
+                                  : Colors.black,
+                              fontSize: 12)),
                     ),
                     Container(
                       padding: EdgeInsets.only(top: 8, bottom: 8),
@@ -95,7 +98,8 @@ class _HomeTabbarWidgetState extends State<HomeTabbarWidget>
                           style: TextStyle(
                               color: selectedTab.index == 3
                                   ? AppColors.DEFAULT
-                                  : Colors.black)),
+                                  : Colors.black,
+                              fontSize: 12)),
                     )
                   ],
                 );

lib/presentation/screens/tabbar/tabbar.dart

@@ -109,7 +109,7 @@ class _TabbarScreenState extends State<TabbarScreen> {
                                                       itemsTabbar[index].index)
                                                   ? AppColors.DEFAULT
                                                   : Colors.grey,
-                                              fontSize: 11),
+                                              fontSize: 10),
                                         ),
                                       )
                                     ],