menu dialog & pdf screen, landscape ui changed.

lib/ui/dialogs/app_menu_dialog.dart

@@ -23,48 +23,19 @@ class AppMenuDialog extends StatelessWidget {
   Widget build(BuildContext context) {
     bool isPortrait = MediaQuery.of(context).orientation == Orientation.portrait;
 
-    return BackdropFilter(
-      filter: ImageFilter.blur(sigmaX: 4, sigmaY: 4),
-      child: Dialog(
-        insetPadding: EdgeInsets.symmetric(horizontal: 60.0, vertical: 24.0),
-        shape: RoundedRectangleBorder(
-          borderRadius: BorderRadius.circular(20),
-        ),
-        elevation: 0,
-        backgroundColor: Colors.transparent,
-        child: Container(
-          width: MediaQuery.of(context).size.width * 245 / 375,
-          decoration: BoxDecoration(
-            color: Colors.white.withOpacity(.91),
-            borderRadius: BorderRadius.circular(20),
-          ),
-          child: SingleChildScrollView(
-            padding: EdgeInsets.all(12),
-            physics: BouncingScrollPhysics(),
-            child: Column(
+    Widget _operationButtons = Row(
       mainAxisSize: MainAxisSize.min,
       children: [
-                isPortrait ? 58.height : 24.height,
-                menuItem("الرئيسية", "assets/icons/new/home.svg", 0),
-                Container(width: 50, height: 1, color: ColorConsts.greyB5Color).paddingOnly(top: 16, bottom: 16),
-                menuItem("عن الموسوعة", "assets/icons/new/intro.svg", 1),
-                Container(width: 50, height: 1, color: ColorConsts.greyB5Color).paddingOnly(top: 16, bottom: 16),
-                menuItem("اللجنة الإشرافية", "assets/icons/new/members.svg", 4),
-                Container(width: 50, height: 1, color: ColorConsts.greyB5Color).paddingOnly(top: 16, bottom: 16),
-                menuItem("قراءة القرآن الكريم", "assets/icons/new/quran.svg", 2),
-                Row(
-                  mainAxisSize: MainAxisSize.min,
-                  children: [
-                    menuOptions("assets/icons/new/bookmark.svg").onPress(() {
+        menuOptions("assets/icons/new/bookmark.svg", isPortrait).onPress(() {
           Navigator.pop(context);
           Navigator.pushNamed(context, BookmarkScreen.routeName);
         }),
         14.width,
-                    menuOptions("assets/icons/new/zoom_in.svg").onPress(onFontIncrease),
+        menuOptions("assets/icons/new/zoom_in.svg", isPortrait).onPress(onFontIncrease),
         14.width,
-                    menuOptions("assets/icons/new/zoom_out.svg").onPress(onFontDecrease),
+        menuOptions("assets/icons/new/zoom_out.svg", isPortrait).onPress(onFontDecrease),
         14.width,
-                    menuOptions("assets/icons/new/user_acount.svg").onPress(() {
+        menuOptions("assets/icons/new/user_acount.svg", isPortrait).onPress(() {
           Navigator.pop(context);
           if (AppState().isUserLogin) {
             Navigator.pushNamed(context, UserProfileScreen.routeName);
@@ -72,8 +43,9 @@ class AppMenuDialog extends StatelessWidget {
             Navigator.pushNamed(context, LoginScreen.routeName);
         }),
       ],
-                ).paddingOnly(top: 32, bottom: 32),
-                Container(
+    );
+
+    Widget _pdfButton = Container(
       height: 26,
       padding: EdgeInsets.only(right: 16, left: 12),
       decoration: BoxDecoration(
@@ -84,40 +56,93 @@ class AppMenuDialog extends StatelessWidget {
         mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
           Icon(Icons.play_arrow_outlined, size: 20, color: Colors.white),
-                      "تصفح وتحميل الموسوعة".toText(13),
+          "تصفح وتحميل الموسوعة".toText(isPortrait ? 13 : 16),
         ],
       ),
     ).onPress(() {
       goToIndex(5);
-                })
+    });
+
+    return BackdropFilter(
+      filter: ImageFilter.blur(sigmaX: 4, sigmaY: 4),
+      child: Dialog(
+        insetPadding: EdgeInsets.symmetric(horizontal: 60.0, vertical: 24.0),
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(20),
+        ),
+        elevation: 0,
+        backgroundColor: Colors.transparent,
+        child: Container(
+          width: MediaQuery.of(context).size.width * 245 / 375,
+          decoration: BoxDecoration(
+            color: Colors.white.withOpacity(.91),
+            borderRadius: BorderRadius.circular(20),
+          ),
+          child: isPortrait
+              ? SingleChildScrollView(
+                  padding: EdgeInsets.all(12),
+                  physics: BouncingScrollPhysics(),
+                  child: Column(
+                    mainAxisSize: MainAxisSize.min,
+                    children: [
+                      isPortrait ? 58.height : 24.height,
+                      menuItem("الرئيسية", "assets/icons/new/home.svg", 0, isPortrait),
+                      Container(width: 50, height: 1, color: ColorConsts.greyB5Color).paddingOnly(top: 16, bottom: 16),
+                      menuItem("عن الموسوعة", "assets/icons/new/intro.svg", 1, isPortrait),
+                      Container(width: 50, height: 1, color: ColorConsts.greyB5Color).paddingOnly(top: 16, bottom: 16),
+                      menuItem("اللجنة الإشرافية", "assets/icons/new/members.svg", 4, isPortrait),
+                      Container(width: 50, height: 1, color: ColorConsts.greyB5Color).paddingOnly(top: 16, bottom: 16),
+                      menuItem("قراءة القرآن الكريم", "assets/icons/new/quran.svg", 2, isPortrait),
+                      _operationButtons.paddingOnly(top: 32, bottom: 32),
+                      _pdfButton
                     ],
                   ),
+                )
+              : Column(
+                  mainAxisSize: MainAxisSize.min,
+                  children: [
+                    _operationButtons.paddingOnly(top: 20, bottom: 32),
+                    Row(
+                      mainAxisSize: MainAxisSize.min,
+                      children: [
+                        menuItem("الرئيسية", "assets/icons/new/home.svg", 0, isPortrait),
+                        Container(width: 1, height: 50, color: ColorConsts.greyB5Color).paddingOnly(left: 20, right: 20),
+                        menuItem("عن الموسوعة", "assets/icons/new/intro.svg", 1, isPortrait),
+                        Container(width: 1, height: 50, color: ColorConsts.greyB5Color).paddingOnly(left: 20, right: 20),
+                        menuItem("اللجنة الإشرافية", "assets/icons/new/members.svg", 4, isPortrait),
+                        Container(width: 1, height: 50, color: ColorConsts.greyB5Color).paddingOnly(left: 20, right: 20),
+                        menuItem("قراءة القرآن الكريم", "assets/icons/new/quran.svg", 2, isPortrait),
+                      ],
                     ),
+                    32.height,
+                    _pdfButton
+                  ],
+                ).paddingAll(12),
         ),
       ),
     );
   }
 
-  Widget menuOptions(String icon) {
+  Widget menuOptions(String icon, bool isPortrait) {
     return SvgPicture.asset(
       icon,
-      width: 25,
-      height: 25,
+      width: isPortrait ? 25 : 30,
+      height: isPortrait ? 25 : 30,
       color: ColorConsts.greyBAColor,
     );
   }
 
-  Widget menuItem(String title, String icon, int index) {
+  Widget menuItem(String title, String icon, int index, bool isPortrait) {
     return Column(
       children: [
         SvgPicture.asset(
           icon,
-          width: 25,
-          height: 25,
+          width: isPortrait ? 25 : 30,
+          height: isPortrait ? 25 : 30,
           color: ColorConsts.darkText,
         ),
-        6.height,
-        title.toText(13, color: ColorConsts.darkText)
+        isPortrait ? 6.height : 12.height,
+        title.toText(isPortrait ? 13 : 16, color: ColorConsts.darkText)
       ],
     ).onPress(() => goToIndex(index));
   }

lib/ui/screens/pdf_viewer_screen.dart

@@ -93,22 +93,16 @@ class _PdfListScreenState extends State<PdfListScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return SizedBox(
-      height: double.infinity,
-      child: SingleChildScrollView(
-        physics: const AlwaysScrollableScrollPhysics(),
-        padding: EdgeInsets.only(bottom: 140),
-        child: Column(
-          children: [
-            CommonHeader("التصفح والتحميل", "assets/icons/new/pdf_bg.jpg", Color(0xffAE8646)),
-            contentList == null
-                ? SizedBox()
-                : contentList.isEmpty
+    bool isPortrait = MediaQuery.of(context).orientation == Orientation.portrait;
+
+    Widget _header = SizedBox(height: isPortrait ? null : double.infinity, width: double.infinity, child: CommonHeader("التصفح والتحميل", "assets/icons/new/pdf_bg.jpg", Color(0xffAE8646)));
+
+    Widget _dataListView = contentList?.isEmpty ?? true
         ? NoDataUI()
         : ListView.separated(
-                        physics: const NeverScrollableScrollPhysics(),
-                        shrinkWrap: true,
-                        padding: EdgeInsets.only(left: 35, right: 35, top: 35, bottom: 0),
+            physics: isPortrait ? const NeverScrollableScrollPhysics() : const AlwaysScrollableScrollPhysics(),
+            shrinkWrap: isPortrait,
+            padding: EdgeInsets.only(left: isPortrait ? 35 : 0, right: isPortrait ? 35 : 24, top: 35, bottom: 0),
             itemCount: contentList.length,
             separatorBuilder: (context, index) {
               return Divider(color: Color(0xffC7C7C7), height: 1, thickness: 1).paddingOnly(top: 14, bottom: 14);
@@ -174,16 +168,35 @@ class _PdfListScreenState extends State<PdfListScreen> {
                 ),
               );
             },
-                      ),
-            if ((haqooqAlMosasa?.length ?? 0) > 0)
-              Column(
+          );
+
+    Widget _aboutView = Column(
+      mainAxisSize: MainAxisSize.min,
       children: [
-                  "حقوق الموسوعة".toText(13, color: ColorConsts.greyLightColor),
+        "حقوق الموسوعة".toText(isPortrait ? 13 : 16, color: ColorConsts.greyLightColor),
         for (ContentInfoDataModel text in haqooqAlMosasa) text.content.toText(13, color: ColorConsts.greyLightColor, textAlign: TextAlign.center)
       ],
-              ).paddingOnly(left: 35, right: 35, top: 35),
+    );
+    return SizedBox(
+      height: double.infinity,
+      child: isPortrait
+          ? SingleChildScrollView(
+              physics: const AlwaysScrollableScrollPhysics(),
+              padding: EdgeInsets.only(bottom: 140),
+              child: Column(
+                children: [
+                  _header,
+                  contentList == null ? SizedBox() : _dataListView,
+                  if ((haqooqAlMosasa?.length ?? 0) > 0) _aboutView.paddingOnly(left: 35, right: 35, top: 35),
                 ],
               ),
+            )
+          : Row(
+              children: [
+                Expanded(child: ((haqooqAlMosasa?.length ?? 0) > 0) ? _aboutView.paddingOnly(left: 35, right: isPortrait ? 35 : 24, top: isPortrait ? 35 : 24) : SizedBox(), flex: 3),
+                Expanded(child: contentList == null ? SizedBox() : _dataListView, flex: 3),
+                Expanded(child: _header, flex: 4),
+              ],
             ),
     );
   }