fix some bug

lib/core/language/language_cubit.dart

@@ -13,9 +13,13 @@ enum LanguageState {
 }
 
 enum CurrentLanguage {
-  en,
-  fa,
-  ar,
+  en('en'),
+  fa('fa'),
+  ar('ar');
+
+  final String value;
+
+  const CurrentLanguage(this.value);
 }
 
 class LanguageCubit extends Cubit<BaseCubitType<LanguageState>> {
@@ -28,7 +32,7 @@ class LanguageCubit extends Cubit<BaseCubitType<LanguageState>> {
   Future<void> _initial() async {
     String? language = _repository.getCurrentLanguage();
     if (language == null || language == '') {
-      emit(BaseCubitType(eventName: LanguageState.notSet));
+      emit(BaseCubitType(eventName: LanguageState.notSet, data: CurrentLanguage.en));
       return;
     }
     switch (language) {
@@ -55,7 +59,20 @@ class LanguageCubit extends Cubit<BaseCubitType<LanguageState>> {
     return language;
   }
 
-  Future<void> changeLanguage() async {
-    emit(BaseCubitType(eventName: LanguageState.loaded));
+  Future<void> changeLanguage(String language) async {
+    switch (language) {
+      case 'fa':
+        await Translator.setNewLanguage(Languages.fa);
+        emit(BaseCubitType(eventName: LanguageState.loaded, data: CurrentLanguage.fa));
+        return;
+      case 'en':
+        await Translator.setNewLanguage(Languages.en);
+        emit(BaseCubitType(eventName: LanguageState.loaded, data: CurrentLanguage.en));
+        return;
+      case 'ar':
+        await Translator.setNewLanguage(Languages.ar);
+        emit(BaseCubitType(eventName: LanguageState.loaded, data: CurrentLanguage.ar));
+        return;
+    }
   }
 }

lib/core/select_language/cubit/select_language_cubit.dart

@@ -14,15 +14,15 @@ class SelectLanguageCubit extends Cubit<BaseCubitType<SelectLanguageState>> {
     switch (language) {
       case 'fa':
         await Translator.setNewLanguage(Languages.fa);
-        emit(BaseCubitType(eventName: SelectLanguageState.loaded, data: CurrentLanguage.fa));
+        emit(BaseCubitType(eventName: SelectLanguageState.loaded, data: language));
         return;
       case 'en':
         await Translator.setNewLanguage(Languages.en);
-        emit(BaseCubitType(eventName: SelectLanguageState.loaded, data: CurrentLanguage.en));
+        emit(BaseCubitType(eventName: SelectLanguageState.loaded, data: language));
         return;
       case 'ar':
         await Translator.setNewLanguage(Languages.ar);
-        emit(BaseCubitType(eventName: SelectLanguageState.loaded, data: CurrentLanguage.ar));
+        emit(BaseCubitType(eventName: SelectLanguageState.loaded, data: language));
         return;
     }
   }

lib/core/select_language/screen/select_language_screen.dart

@@ -35,7 +35,7 @@ class _SelectLanguageScreenState extends State<SelectLanguageScreen> {
                 break;
               case SelectLanguageState.loaded:
                 WidgetsBinding.instance.addPostFrameCallback((timeStamp) {
-                  BlocProvider.of<LanguageCubit>(context).changeLanguage();
+                  BlocProvider.of<LanguageCubit>(context).changeLanguage(state.data);
                   Navigator.push(
                     context,
                     MaterialPageRoute(

lib/core/utils/app_utils.dart

@@ -61,7 +61,27 @@ class Utils {
     return '${jalali.year}/${jalali.month}/${jalali.day}';
   }
 
-  ThemeData getAppTheme(BuildContext context) {
+  ThemeData getAppTheme(BuildContext context, String language) {
+    switch (language) {
+      case 'fa':
+        return ThemeData(
+          fontFamily: 'Vazir',
+          scaffoldBackgroundColor: const Color(0xffE7E7F5),
+          useMaterial3: true,
+        );
+      case 'en':
+        return ThemeData(
+          fontFamily: 'Cairo',
+          scaffoldBackgroundColor: const Color(0xffE7E7F5),
+          useMaterial3: true,
+        );
+      case 'ar':
+        return ThemeData(
+          fontFamily: 'Vazir',
+          scaffoldBackgroundColor: const Color(0xffE7E7F5),
+          useMaterial3: true,
+        );
+    }
     return ThemeData(
       fontFamily: 'Vazir',
       scaffoldBackgroundColor: const Color(0xffE7E7F5),

lib/core/widgets/more_options_widget.dart

@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+
+class MoreOptionsWidget extends StatelessWidget {
+  final String title;
+  final Function() onTap;
+
+  const MoreOptionsWidget({super.key, required this.title, required this.onTap});
+
+  @override
+  Widget build(BuildContext context) {
+    return GestureDetector(
+      onTap: onTap,
+      child: Text(
+        title,
+        style: const TextStyle(
+          color: Color(0xff222D4E),
+          fontSize: 16,
+          fontWeight: FontWeight.bold,
+        ),
+      ),
+    );
+  }
+}

lib/features/about_us/about_us_screen.dart

@@ -5,6 +5,7 @@ import 'package:sonnat/core/extensions/context_extension.dart';
 import 'package:sonnat/core/extensions/string_extension.dart';
 import 'package:sonnat/core/language/translator.dart';
 import 'package:sonnat/core/utils/app_constants.dart';
+import 'package:sonnat/core/utils/initializer.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class AboutUsScreen extends StatefulWidget {
@@ -49,8 +50,9 @@ class _AboutUsScreenState extends State<AboutUsScreen> {
                       onTap: () {
                         Navigator.pop(context);
                       },
-                      child: SvgPicture.asset(
-                        'ic_back'.svgPath,
+                      child: RotatedBox(
+                        quarterTurns: Initializer.instance.getTextDirection() == TextDirection.ltr ? 90 : 0,
+                        child: SvgPicture.asset('ic_back'.svgPath),
                       ),
                     ),
                   ),

lib/features/main/main_screen.dart

@@ -4,7 +4,11 @@ import 'package:flutter_svg/flutter_svg.dart';
 import 'package:sonnat/core/extensions/context_extension.dart';
 import 'package:sonnat/core/extensions/string_extension.dart';
 import 'package:sonnat/core/language/translator.dart';
+import 'package:sonnat/core/select_language/cubit/select_language_cubit.dart';
+import 'package:sonnat/core/select_language/screen/select_language_screen.dart';
 import 'package:sonnat/core/utils/app_constants.dart';
+import 'package:sonnat/core/widgets/more_options_widget.dart';
+import 'package:sonnat/features/about_us/about_us_screen.dart';
 import 'package:sonnat/features/main/widget/main_item_widget.dart';
 import 'package:sonnat/features/posts/cubit/posts_cubit.dart';
 import 'package:sonnat/features/posts/screen/posts_screen.dart';
@@ -40,6 +44,8 @@ class _MainScreenState extends State<MainScreen> {
       backgroundColor: const Color(0xff26237A),
       body: SafeArea(
         child: Column(
+          children: [
+            Stack(
               children: [
                 Container(
                   margin: EdgeInsets.only(
@@ -52,6 +58,19 @@ class _MainScreenState extends State<MainScreen> {
                     height: context.height * 200 / AppConstants.instance.appHeight,
                   ),
                 ),
+                PositionedDirectional(
+                  end: context.width * 35 / AppConstants.instance.appWidth,
+                  top: 16,
+                  child: Align(
+                    alignment: AlignmentDirectional.centerStart,
+                    child: GestureDetector(
+                      onTap: _showOptions,
+                      child: SvgPicture.asset('ic_more'.svgPath),
+                    ),
+                  ),
+                ),
+              ],
+            ),
             Text(
               Translator.translate('main_header_text'),
               style: const TextStyle(
@@ -169,4 +188,72 @@ class _MainScreenState extends State<MainScreen> {
       },
     ));
   }
+
+  void _showOptions() {
+    showModalBottomSheet(
+      context: context,
+      backgroundColor: Colors.transparent,
+      builder: (context) {
+        return Container(
+          height: 120,
+          width: context.width,
+          decoration: BoxDecoration(
+            color: Colors.white,
+            border: Border.all(color: Colors.white, width: 0.2),
+            borderRadius: const BorderRadius.only(
+              topLeft: Radius.circular(16),
+              topRight: Radius.circular(16),
+            ),
+          ),
+          padding: const EdgeInsets.only(
+            top: 16,
+            left: 4,
+            right: 4,
+          ),
+          child: Column(
+            children: [
+              MoreOptionsWidget(
+                title: Translator.translate('about_us'),
+                onTap: () {
+                  Navigator.pop(context);
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) {
+                        return const AboutUsScreen();
+                      },
+                    ),
+                  );
+                },
+              ),
+              const SizedBox(height: 8),
+              Container(
+                width: context.width,
+                height: 1,
+                color: const Color(0xffD3D8E9),
+              ),
+              const SizedBox(height: 8),
+              MoreOptionsWidget(
+                title: Translator.translate('select_language'),
+                onTap: () {
+                  Navigator.pop(context);
+                  Navigator.push(
+                    context,
+                    MaterialPageRoute(
+                      builder: (context) {
+                        return BlocProvider(
+                          child: const SelectLanguageScreen(),
+                          create: (context) => SelectLanguageCubit(),
+                        );
+                      },
+                    ),
+                  );
+                },
+              ),
+            ],
+          ),
+        );
+      },
+    );
+  }
 }

lib/features/posts/screen/posts_screen.dart

@@ -8,7 +8,9 @@ import 'package:sonnat/core/select_language/cubit/select_language_cubit.dart';
 import 'package:sonnat/core/select_language/screen/select_language_screen.dart';
 import 'package:sonnat/core/utils/app_constants.dart';
 import 'package:sonnat/core/utils/base_cubit_type.dart';
+import 'package:sonnat/core/utils/initializer.dart';
 import 'package:sonnat/core/widgets/loading_list_widget.dart';
+import 'package:sonnat/core/widgets/more_options_widget.dart';
 import 'package:sonnat/features/about_us/about_us_screen.dart';
 import 'package:sonnat/features/posts/cubit/posts_cubit.dart';
 import 'package:sonnat/features/posts/widgets/filter_item_widget.dart';
@@ -92,11 +94,25 @@ class _PostsScreenState extends State<PostsScreen> {
                 _loading = true;
                 break;
             }
-            return Column(
+            return CustomScrollView(
+              controller: _controller,
+              slivers: [
+                SliverAppBar(
+                  floating: true,
+                  elevation: 0,
+                  backgroundColor: const Color(0xffE7E7F5),
+                  automaticallyImplyLeading: false,
+                  forceElevated: false,
+                  shadowColor: Colors.transparent,
+                  bottom: PreferredSize(
+                    preferredSize: const Size.fromHeight(116),
+                    child: Column(
                       children: [
                         SizedBox(height: context.height * 26 / AppConstants.instance.appHeight),
                         Padding(
-                  padding: EdgeInsets.symmetric(horizontal: context.width * 26 / AppConstants.instance.appWidth),
+                          padding: EdgeInsets.symmetric(
+                            horizontal: context.width * 26 / AppConstants.instance.appWidth,
+                          ),
                           child: _searchMode
                               ? Row(
                                   children: [
@@ -162,8 +178,10 @@ class _PostsScreenState extends State<PostsScreen> {
                                         onTap: () {
                                           Navigator.pop(context);
                                         },
-                                child: SvgPicture.asset(
-                                  'ic_back'.svgPath,
+                                        child: RotatedBox(
+                                          quarterTurns:
+                                              Initializer.instance.getTextDirection() == TextDirection.ltr ? 90 : 0,
+                                          child: SvgPicture.asset('ic_back'.svgPath),
                                         ),
                                       ),
                                     ),
@@ -227,7 +245,9 @@ class _PostsScreenState extends State<PostsScreen> {
                         SizedBox(
                           height: context.height * 31 / AppConstants.instance.appHeight,
                           child: ListView.builder(
-                    padding: EdgeInsetsDirectional.only(start: context.width * 26 / AppConstants.instance.appWidth),
+                            padding: EdgeInsetsDirectional.only(
+                              start: context.width * 26 / AppConstants.instance.appWidth,
+                            ),
                             itemBuilder: (context, index) {
                               return GestureDetector(
                                 onTap: () {
@@ -244,12 +264,19 @@ class _PostsScreenState extends State<PostsScreen> {
                           ),
                         ),
                         SizedBox(height: context.height * 26 / AppConstants.instance.appHeight),
-                if (_loading)
-                  const Expanded(child: LoadingListWidget())
-                else
-                  Expanded(
-                    child: ListView.builder(
-                      controller: _controller,
+                      ],
+                    ),
+                  ),
+                ),
+                SliverList(
+                  delegate: SliverChildBuilderDelegate(
+                    (context, index) {
+                      if (_loading) {
+                        return const LoadingListWidget();
+                      }
+                      return ListView.builder(
+                        shrinkWrap: true,
+                        physics: const NeverScrollableScrollPhysics(),
                         itemBuilder: (context, index) {
                           if (_searchMode) {
                             return GestureDetector(
@@ -263,8 +290,11 @@ class _PostsScreenState extends State<PostsScreen> {
                           );
                         },
                         itemCount: _searchMode ? _cubit.searchedList.length : _cubit.postList.length,
+                      );
+                    },
+                    childCount: 1,
+                  ),
                 ),
-                  )
               ],
             );
           },
@@ -362,25 +392,3 @@ class FilterItem {
 
   const FilterItem({required this.selected, required this.title});
 }
-
-class MoreOptionsWidget extends StatelessWidget {
-  final String title;
-  final Function() onTap;
-
-  const MoreOptionsWidget({super.key, required this.title, required this.onTap});
-
-  @override
-  Widget build(BuildContext context) {
-    return GestureDetector(
-      onTap: onTap,
-      child: Text(
-        title,
-        style: const TextStyle(
-          color: Color(0xff222D4E),
-          fontSize: 16,
-          fontWeight: FontWeight.bold,
-        ),
-      ),
-    );
-  }
-}

lib/features/single_post/screen/single_post_screen.dart

@@ -101,16 +101,6 @@ class _SinglePostScreenState extends State<SinglePostScreen> {
                                   padding: const EdgeInsets.all(8),
                                   child: SvgPicture.asset('ic_share'.svgPath),
                                 ),
-                                const SizedBox(width: 16),
-                                Padding(
-                                  padding: const EdgeInsets.all(8),
-                                  child: SvgPicture.asset('ic_bookmark'.svgPath),
-                                ),
-                                const SizedBox(width: 16),
-                                Padding(
-                                  padding: const EdgeInsets.all(8),
-                                  child: SvgPicture.asset('ic_like'.svgPath),
-                                ),
                                 const Spacer(),
                                 Text(
                                   _cubit.commentList.length.toString(),

lib/features/single_post/widget/add_comment_widget.dart

@@ -4,6 +4,7 @@ import 'package:sonnat/core/extensions/context_extension.dart';
 import 'package:sonnat/core/extensions/string_extension.dart';
 import 'package:sonnat/core/language/translator.dart';
 import 'package:sonnat/core/utils/app_constants.dart';
+import 'package:sonnat/core/utils/initializer.dart';
 
 class AddCommentWidget extends StatefulWidget {
   final Function(String comment) sendComment;
@@ -57,7 +58,10 @@ class _AddCommentWidgetState extends State<AddCommentWidget> {
             },
             child: Padding(
               padding: const EdgeInsetsDirectional.only(end: 18, bottom: 8, top: 8),
+              child: RotatedBox(
                 child: SvgPicture.asset('ic_send'.svgPath),
+                quarterTurns: Initializer.instance.getTextDirection() == TextDirection.ltr ? 90 : 0,
+              ),
             ),
           ),
           focusedBorder: OutlineInputBorder(

lib/main.dart

@@ -45,6 +45,10 @@ class _MyHomePageState extends State<MyHomePage> {
   Widget build(BuildContext context) {
     return BlocBuilder<LanguageCubit, BaseCubitType<LanguageState>>(
       builder: (context, state) {
+        if (state.eventName == LanguageState.notSet || state.eventName == LanguageState.loaded) {
+          Initializer.instance.setAppDirection(
+            state.data == CurrentLanguage.fa || state.data == CurrentLanguage.ar ? 'rtl' : 'ltr',
+          );
           return MaterialApp(
             builder: (context, child) {
               Widget error = const Center(
@@ -89,7 +93,7 @@ class _MyHomePageState extends State<MyHomePage> {
                 ),
               );
             },
-          theme: Utils.instance.getAppTheme(context),
+            theme: Utils.instance.getAppTheme(context, state.data.value),
             debugShowCheckedModeBanner: false,
             supportedLocales: Translator.supportedLocales(),
             initialRoute: '/',
@@ -100,6 +104,8 @@ class _MyHomePageState extends State<MyHomePage> {
                   ),
             },
           );
+        }
+        return const SizedBox();
       },
     );
   }