component updates

lib/widgets/bookmark_button.dart

@@ -20,6 +20,12 @@ class BookmarkButton extends StatefulWidget {
 class _BookmarkButtonState extends State<BookmarkButton> {
   bool _value = false;
 
+  @override
+  void didUpdateWidget(covariant BookmarkButton oldWidget) {
+    _value = widget.value;
+    super.didUpdateWidget(oldWidget);
+  }
+
   @override
   void initState() {
     _value = widget.value;

lib/widgets/didvan/app_bar.dart

@@ -24,6 +24,7 @@ class DidvanAppBar extends StatelessWidget {
             child: Align(
               alignment: Alignment.centerRight,
               child: Column(
+                crossAxisAlignment: CrossAxisAlignment.start,
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   if (appBarData.title != null)

lib/widgets/didvan/page_view.dart

@@ -1,47 +1,99 @@
 import 'package:carousel_slider/carousel_slider.dart';
 import 'package:didvan/widgets/didvan/card.dart';
+import 'package:didvan/widgets/didvan/text.dart';
+import 'package:didvan/widgets/skeleton_image.dart';
 import 'package:flutter/material.dart';
 
-class DidvanPageView extends StatelessWidget {
+class DidvanPageView extends StatefulWidget {
-  final List<Widget> pages;
+  final List items;
+  final int initialIndex;
   final ScrollController? scrollController;
-  final int initialPage;
   final void Function(int index) onPageChanged;
   const DidvanPageView({
     Key? key,
-    required this.pages,
+    required this.initialIndex,
+    required this.items,
     this.scrollController,
     required this.onPageChanged,
-    this.initialPage = 2,
   }) : super(key: key);
 
+  @override
+  State<DidvanPageView> createState() => _DidvanPageViewState();
+}
+
+class _DidvanPageViewState extends State<DidvanPageView> {
   @override
   Widget build(BuildContext context) {
     final double deviceTopPadding = MediaQuery.of(context).padding.top;
-    return CarouselSlider.builder(
+    return Directionality(
-      itemCount: pages.length,
+      textDirection: TextDirection.ltr,
-      options: CarouselOptions(
+      child: CarouselSlider.builder(
-        onPageChanged: (index, reason) => onPageChanged(index),
+        itemCount: widget.items.length,
-        height: double.infinity,
+        options: CarouselOptions(
-        initialPage: 2,
+          onPageChanged: (index, reason) => widget.onPageChanged(index),
-        viewportFraction: 0.94,
+          height: double.infinity,
-        enableInfiniteScroll: false,
+          initialPage: widget.initialIndex,
-      ),
+          viewportFraction: 0.94,
-      itemBuilder: (context, index, realIndex) => SizedBox(
+          enableInfiniteScroll: false,
-        height: MediaQuery.of(context).size.height,
+        ),
-        child: SingleChildScrollView(
+        itemBuilder: (context, index, realIndex) => SizedBox(
-          controller: index == 2 ? scrollController : null,
+          height: MediaQuery.of(context).size.height,
-          physics: const BouncingScrollPhysics(),
+          child: SingleChildScrollView(
-          padding: EdgeInsets.only(
+            controller: index == 1 ? widget.scrollController : null,
-            left: 4,
+            physics: const BouncingScrollPhysics(),
-            right: 4,
+            padding: EdgeInsets.only(
-            top: 16 + deviceTopPadding,
+              left: 4,
-            bottom: 92,
+              right: 4,
-          ),
+              top: 16 + deviceTopPadding,
-          child: DidvanCard(
+              bottom: 92,
-            padding: EdgeInsets.zero,
+            ),
-            enableBorder: false,
+            child: DidvanCard(
-            child: pages[index],
+              padding: EdgeInsets.zero,
+              enableBorder: false,
+              child: Builder(
+                builder: (context) {
+                  final item = widget.items[index];
+                  if (item == null) {
+                    return const SizedBox();
+                  }
+                  return Column(
+                    crossAxisAlignment: CrossAxisAlignment.start,
+                    children: [
+                      SkeletonImage(
+                        imageUrl: item.image,
+                        aspectRatio: 16 / 9,
+                      ),
+                      const SizedBox(height: 20),
+                      for (var i = 0; i < item.contents.length; i++)
+                        Padding(
+                          padding: const EdgeInsets.symmetric(
+                            horizontal: 16,
+                            vertical: 4,
+                          ),
+                          child: Builder(
+                            builder: (context) {
+                              final content = item.contents[i];
+                              if (content.text != null) {
+                                return DidvanText(
+                                  item.contents[i].text!,
+                                );
+                              }
+                              if (content.image != null) {
+                                return SkeletonImage(
+                                  imageUrl: content.image!,
+                                  aspectRatio: 16 / 9,
+                                );
+                              }
+                              return const SizedBox();
+                            },
+                          ),
+                        ),
+                      const SizedBox(height: 20),
+                    ],
+                  );
+                },
+              ),
+            ),
           ),
         ),
       ),

lib/widgets/didvan/switch.dart

@@ -1,4 +1,4 @@
-import 'package:didvan/pages/home/profile/widgets/menu_item.dart';
+import 'package:didvan/pages/home/settings/widgets/menu_item.dart';
 import 'package:flutter/cupertino.dart';
 import 'package:flutter/material.dart';
 

lib/widgets/floating_navigation_bar.dart

@@ -4,7 +4,7 @@ import 'package:didvan/constants/app_icons.dart';
 import 'package:didvan/models/news_details_data.dart';
 import 'package:didvan/models/radar_details_data.dart';
 import 'package:didvan/models/view/action_sheet_data.dart';
-import 'package:didvan/pages/home/profile/widgets/menu_item.dart';
+import 'package:didvan/pages/home/settings/widgets/menu_item.dart';
 import 'package:didvan/routes/routes.dart';
 import 'package:didvan/utils/action_sheet.dart';
 import 'package:didvan/widgets/bookmark_button.dart';
@@ -38,15 +38,25 @@ class _FloatingNavigationBarState extends State<FloatingNavigationBar> {
 
   get _item => widget.radar ?? widget.news;
 
+  @override
+  void didUpdateWidget(covariant FloatingNavigationBar oldWidget) {
+    if (widget.radar != null && oldWidget.radar!.id != widget.radar!.id ||
+        widget.news != null && oldWidget.news!.id != widget.news!.id) {
+      _isScrolled = false;
+    }
+    super.didUpdateWidget(oldWidget);
+  }
+
   @override
   void initState() {
     widget.scrollController.addListener(() {
       final position = widget.scrollController.position.pixels;
-      if (position > 300 && !_isScrolled) {
+      final offset = MediaQuery.of(context).size.width / 16 * 9 + 40;
+      if (position > offset && !_isScrolled) {
         setState(() {
           _isScrolled = true;
         });
-      } else if (position < 300 && _isScrolled) {
+      } else if (position < offset && _isScrolled) {
         setState(() {
           _isScrolled = false;
         });
@@ -68,9 +78,11 @@ class _FloatingNavigationBarState extends State<FloatingNavigationBar> {
       decoration: BoxDecoration(
         color: Theme.of(context).colorScheme.navigation,
         borderRadius: BorderRadius.circular(24),
-        border: Border.all(
+        border: DesignConfig.isDark
-          color: Theme.of(context).colorScheme.cardBorder,
+            ? Border.all(
-        ),
+                color: Theme.of(context).colorScheme.cardBorder,
+              )
+            : null,
       ),
       child: Theme(
         data: Theme.of(context).copyWith(
@@ -80,21 +92,23 @@ class _FloatingNavigationBarState extends State<FloatingNavigationBar> {
         ),
         child: Row(
           children: [
-            DidvanIconButton(
+            AnimatedRotation(
-              onPressed: () {
+              duration: DesignConfig.lowAnimationDuration,
-                if (_isScrolled) {
+              turns: _isScrolled ? -0.25 : 0,
-                  widget.scrollController.animateTo(
+              child: DidvanIconButton(
-                    0,
+                onPressed: () {
-                    duration: DesignConfig.lowAnimationDuration,
+                  if (_isScrolled) {
-                    curve: Curves.easeIn,
+                    widget.scrollController.animateTo(
-                  );
+                      0,
-                  return;
+                      duration: DesignConfig.lowAnimationDuration,
-                }
+                      curve: Curves.easeIn,
-                Navigator.of(context).pop();
+                    );
-              },
+                    return;
-              icon: _isScrolled
+                  }
-                  ? DidvanIcons.arrow_up_regular
+                  Navigator.of(context).pop();
-                  : DidvanIcons.back_regular,
+                },
+                icon: DidvanIcons.back_regular,
+              ),
             ),
             const Spacer(),
             if (_isRadar)
@@ -103,13 +117,6 @@ class _FloatingNavigationBarState extends State<FloatingNavigationBar> {
                 onMark: widget.onMark,
                 onUnmark: widget.onUnmark,
               ),
-            // if (_isRadar)
-            //   IconButton(
-            //     onPressed: () {},
-            //     icon: const Icon(
-            //       DidvanIcons.evaluation_regular,
-            //     ),
-            //   ),
             SizedBox(
               width: 48,
               child: Row(
@@ -125,7 +132,11 @@ class _FloatingNavigationBarState extends State<FloatingNavigationBar> {
                     gestureSize: 32,
                     onPressed: () => Navigator.of(context).pushNamed(
                       Routes.comments,
-                      arguments: {'id': _item.id, 'isRadar': _isRadar},
+                      arguments: {
+                        'id': _item.id,
+                        'isRadar': _isRadar,
+                        'title': _item.title
+                      },
                     ),
                     icon: DidvanIcons.chats_regular,
                   ),