From 9f8cf6022fd7bb1c51e6798f0248e1fd33c42fdd Mon Sep 17 00:00:00 2001
From: Sikander Saleem <sikandersaleem.cloudsolutions@gmail.com>
Date: Thu, 6 Jul 2023 11:33:27 +0300
Subject: [PATCH] fixes & ios microphone fix

---
 ios/Podfile                         |  3 ---
 lib/ui/screens/tangheem_screen.dart | 28 ++++++++++++++++++++++------
 lib/widgets/new/CommonHeader.dart   |  4 ++--
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/ios/Podfile b/ios/Podfile
index 60c5fe9..829218d 100644
--- a/ios/Podfile
+++ b/ios/Podfile
@@ -58,9 +58,6 @@ post_install do |installer|
               ## dart: PermissionGroup.camera
               'PERMISSION_CAMERA=0',
 
-              ## dart: PermissionGroup.microphone
-              'PERMISSION_MICROPHONE=0',
-
               ## dart: PermissionGroup.speech
               'PERMISSION_SPEECH_RECOGNIZER=0',
 
diff --git a/lib/ui/screens/tangheem_screen.dart b/lib/ui/screens/tangheem_screen.dart
index 2715fc7..41abd59 100644
--- a/lib/ui/screens/tangheem_screen.dart
+++ b/lib/ui/screens/tangheem_screen.dart
@@ -138,9 +138,9 @@ class _TangheemScreenState extends State<TangheemScreen> {
     );
 
     Widget _dataListView = _dataList?.isEmpty ?? true
-        ? NoDataUI().paddingOnly(top: 215)
+        ? NoDataUI().paddingOnly(top: isPortrait ? 215 : 50)
         : ListView.separated(
-            // controller: _controller,
+            controller: isPortrait ? null : _controller,
             //  physics: BouncingScrollPhysics(),
             physics: isPortrait ? NeverScrollableScrollPhysics() : null,
             shrinkWrap: isPortrait,
@@ -193,14 +193,30 @@ class _TangheemScreenState extends State<TangheemScreen> {
                             children: [
                               SvgPicture.asset("assets/icons/new/surah_right.svg", height: 13, width: 11, color: ColorConsts.brownB7Color),
                               6.width,
-                              (_dataList[index].surahNameAr + ":").toText(12, color: ColorConsts.brownB7Color),
+                              (_dataList[index].surahNameAr).toText(12, color: ColorConsts.brownB7Color),
                               6.width,
                               SvgPicture.asset("assets/icons/new/surah_left.svg", height: 13, width: 11, color: ColorConsts.brownB7Color),
                             ],
                           ),
-                          Text(
-                            "الآية ${_dataList[index].ayatNumberInSurahs}",
-                            style: TextStyle(fontSize: 12, color: ColorConsts.brownB7Color),
+                          Row(  mainAxisSize: MainAxisSize.min,
+                            children: [
+                              Container(
+                                padding: EdgeInsets.symmetric(vertical: 0, horizontal: 8),
+                                decoration: BoxDecoration(
+                                  borderRadius: BorderRadius.circular(15),
+                                  border: Border.all(color: ColorConsts.greyB5Color, width: .5),
+                                ),
+                                child: Text(
+                                  _dataList[index].tangheemTypeName ?? "",
+                                  style: TextStyle(fontSize: 10, color: ColorConsts.brownB7Color),
+                                ),
+                              ),
+                              8.width,
+                              Text(
+                                "الآية ${_dataList[index].ayatNumberInSurahs}",
+                                style: TextStyle(fontSize: 12, color: ColorConsts.brownB7Color),
+                              ),
+                            ],
                           ),
                         ],
                       ),
diff --git a/lib/widgets/new/CommonHeader.dart b/lib/widgets/new/CommonHeader.dart
index f84446a..bb5c95a 100644
--- a/lib/widgets/new/CommonHeader.dart
+++ b/lib/widgets/new/CommonHeader.dart
@@ -57,8 +57,8 @@ class CommonHeader extends StatelessWidget {
                   mainAxisAlignment: isPortrait ? MainAxisAlignment.end : MainAxisAlignment.center,
                   children: [
                     title.toText(30),
-                    message.toText(16, textAlign: TextAlign.center).paddingOnly(top: 16, left: 50, right: 50),
-                    16.height,
+                    message.toText(16, textAlign: TextAlign.center, height: 20).paddingOnly(top: 16, left: 50, right: 50),
+                    8.height,
                     Row(
                       mainAxisAlignment: MainAxisAlignment.center,
                       mainAxisSize: MainAxisSize.min,