diff --git a/.gitignore b/.gitignore deleted file mode 100644 index dfbc658..0000000 --- a/.gitignore +++ /dev/null @@ -1,80 +0,0 @@ -# Miscellaneous -*.class -*.log -*.pyc -*.swp -.DS_Store -.atom/ -.buildlog/ -.history -.svn/ - -# IntelliJ related -*.iml -*.ipr -*.iws -.idea/ - -# The .vscode folder contains launch configuration and tasks you configure in -# VS Code which you may wish to be included in version control, so this line -# is commented out by default. -#.vscode/ - -# Flutter/Dart/Pub related -**/doc/api/ -**/ios/Flutter/.last_build_id -.dart_tool/ -.flutter-plugins -.flutter-plugins-dependencies -.packages -.pub-cache/ -.pub/ -/build/ -.lock - -# Android related -**/android/**/gradle-wrapper.jar -**/android/.gradle -**/android/captures/ -**/android/gradlew -**/android/gradlew.bat -**/android/local.properties -**/android/**/GeneratedPluginRegistrant.java - -# iOS/XCode related -**/ios/**/*.mode1v3 -**/ios/**/*.mode2v3 -**/ios/**/*.moved-aside -**/ios/**/*.pbxuser -**/ios/**/*.perspectivev3 -**/ios/**/*sync/ -**/ios/**/.sconsign.dblite -**/ios/**/.tags* -**/ios/**/.vagrant/ -**/ios/**/DerivedData/ -**/ios/**/Icon? -**/ios/**/Pods/ -**/ios/**/.symlinks/ -**/ios/**/profile -**/ios/**/xcuserdata -**/ios/.generated/ -**/ios/Flutter/App.framework -**/ios/Flutter/Flutter.framework -**/ios/Flutter/Flutter.podspec -**/ios/Flutter/Generated.xcconfig -**/ios/Flutter/ephemeral -**/ios/Flutter/app.flx -**/ios/Flutter/app.zip -**/ios/Flutter/flutter_assets/ -**/ios/Flutter/flutter_export_environment.sh -**/ios/ServiceDefinitions.json -**/ios/Runner/GeneratedPluginRegistrant.* - -# Web related -lib/generated_plugin_registrant.dart - -# Symbolication related -app.*.symbols - -# Obfuscation related -app.*.map.json diff --git a/assets/icons/About.svg b/assets/icons/About.svg index b15fe2d..4c7307a 100644 --- a/assets/icons/About.svg +++ b/assets/icons/About.svg @@ -1,14 +1,7 @@ - - - - + diff --git a/assets/icons/Accessibility.svg b/assets/icons/Accessibility.svg index 54a601c..9a986b8 100644 --- a/assets/icons/Accessibility.svg +++ b/assets/icons/Accessibility.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/Bookmark.svg b/assets/icons/Bookmark.svg index 8a09e83..99080eb 100644 --- a/assets/icons/Bookmark.svg +++ b/assets/icons/Bookmark.svg @@ -1,14 +1,7 @@ - - - - + diff --git a/assets/icons/Browse.svg b/assets/icons/Browse.svg index b3850fe..2bdc25f 100644 --- a/assets/icons/Browse.svg +++ b/assets/icons/Browse.svg @@ -1,20 +1,13 @@ - - - - - - - - - + + + + + + diff --git a/assets/icons/Contact.svg b/assets/icons/Contact.svg index d460a87..6c69603 100644 --- a/assets/icons/Contact.svg +++ b/assets/icons/Contact.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/Copyrights.svg b/assets/icons/Copyrights.svg index 061d260..7c6c8b0 100644 --- a/assets/icons/Copyrights.svg +++ b/assets/icons/Copyrights.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/Download.svg b/assets/icons/Download.svg index 921b85b..52a6d63 100644 --- a/assets/icons/Download.svg +++ b/assets/icons/Download.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/Encyclopedia.svg b/assets/icons/Encyclopedia.svg index e3450eb..89a7a6c 100644 --- a/assets/icons/Encyclopedia.svg +++ b/assets/icons/Encyclopedia.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/Facebook.svg b/assets/icons/Facebook.svg index 44ef2e5..7191b43 100644 --- a/assets/icons/Facebook.svg +++ b/assets/icons/Facebook.svg @@ -1,20 +1,9 @@ - - - - - + + diff --git a/assets/icons/GO_Forward.svg b/assets/icons/GO_Forward.svg index 29477ca..31276ac 100644 --- a/assets/icons/GO_Forward.svg +++ b/assets/icons/GO_Forward.svg @@ -1,15 +1,8 @@ - - - - + diff --git a/assets/icons/Home.svg b/assets/icons/Home.svg index 6632de6..1c391a5 100644 --- a/assets/icons/Home.svg +++ b/assets/icons/Home.svg @@ -1,15 +1,8 @@ - - - - + diff --git a/assets/icons/Instgram.svg b/assets/icons/Instgram.svg index 2ae03ce..546c249 100644 --- a/assets/icons/Instgram.svg +++ b/assets/icons/Instgram.svg @@ -1,14 +1,5 @@ - @@ -20,11 +11,11 @@ - + - - - + + + diff --git a/assets/icons/LinkedIn.svg b/assets/icons/LinkedIn.svg index 1e445cf..6636502 100644 --- a/assets/icons/LinkedIn.svg +++ b/assets/icons/LinkedIn.svg @@ -1,25 +1,14 @@ - - - - + - - + + - + diff --git a/assets/icons/Members.svg b/assets/icons/Members.svg index a14f971..dea3d7b 100644 --- a/assets/icons/Members.svg +++ b/assets/icons/Members.svg @@ -1,18 +1,11 @@ - - - - - - - + + + + diff --git a/assets/icons/Notification.svg b/assets/icons/Notification.svg index 60fee60..f19a56d 100644 --- a/assets/icons/Notification.svg +++ b/assets/icons/Notification.svg @@ -1,15 +1,6 @@ - - + @@ -17,8 +8,8 @@ - - + + diff --git a/assets/icons/Password.svg b/assets/icons/Password.svg index f9322f3..a405402 100644 --- a/assets/icons/Password.svg +++ b/assets/icons/Password.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/Pause.svg b/assets/icons/Pause.svg index b55f2ea..501a688 100644 --- a/assets/icons/Pause.svg +++ b/assets/icons/Pause.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/Pinterest.svg b/assets/icons/Pinterest.svg index cb67ffc..2104d31 100644 --- a/assets/icons/Pinterest.svg +++ b/assets/icons/Pinterest.svg @@ -1,20 +1,9 @@ - - - - - + + diff --git a/assets/icons/Record.svg b/assets/icons/Record.svg index a5ff57d..24a2adb 100644 --- a/assets/icons/Record.svg +++ b/assets/icons/Record.svg @@ -1,33 +1,14 @@ - - - - - - + + + - - + + diff --git a/assets/icons/Return.svg b/assets/icons/Return.svg index 4d4ac7e..ef8f884 100644 --- a/assets/icons/Return.svg +++ b/assets/icons/Return.svg @@ -1,15 +1,8 @@ - - - - + diff --git a/assets/icons/Search.svg b/assets/icons/Search.svg index ebb5ce1..e355599 100644 --- a/assets/icons/Search.svg +++ b/assets/icons/Search.svg @@ -1,17 +1,10 @@ - - - - - + + diff --git a/assets/icons/Stop.svg b/assets/icons/Stop.svg index e03f9ac..ac4b501 100644 --- a/assets/icons/Stop.svg +++ b/assets/icons/Stop.svg @@ -1,14 +1,7 @@ - - - - + diff --git a/assets/icons/Twitter.svg b/assets/icons/Twitter.svg index 8742394..252f3d8 100644 --- a/assets/icons/Twitter.svg +++ b/assets/icons/Twitter.svg @@ -1,20 +1,9 @@ - - - - - + + diff --git a/assets/icons/User.svg b/assets/icons/User.svg index 1c9aee0..0766b78 100644 --- a/assets/icons/User.svg +++ b/assets/icons/User.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/User_logged.svg b/assets/icons/User_logged.svg index 5f6e47f..85adac8 100644 --- a/assets/icons/User_logged.svg +++ b/assets/icons/User_logged.svg @@ -1,18 +1,11 @@ - - - - - - - + + + + diff --git a/assets/icons/Whatsapp.svg b/assets/icons/Whatsapp.svg index 33f521e..4ba3424 100644 --- a/assets/icons/Whatsapp.svg +++ b/assets/icons/Whatsapp.svg @@ -1,23 +1,11 @@ - - - - + - - + + diff --git a/assets/icons/add_comment.svg b/assets/icons/add_comment.svg index 2aa4068..a0e0674 100644 --- a/assets/icons/add_comment.svg +++ b/assets/icons/add_comment.svg @@ -1,19 +1,6 @@ - - + @@ -21,9 +8,9 @@ - + - قيلعت ةفاضأ + قيلعت ةفاضأ diff --git a/assets/icons/audio_level.svg b/assets/icons/audio_level.svg index fdada5a..bfd3477 100644 --- a/assets/icons/audio_level.svg +++ b/assets/icons/audio_level.svg @@ -1,17 +1,10 @@ - - - - - - + + + diff --git a/assets/icons/audio_level_1.svg b/assets/icons/audio_level_1.svg index 046e590..6080c05 100644 --- a/assets/icons/audio_level_1.svg +++ b/assets/icons/audio_level_1.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/bookmark_aya.svg b/assets/icons/bookmark_aya.svg index 45df3b5..ae56914 100644 --- a/assets/icons/bookmark_aya.svg +++ b/assets/icons/bookmark_aya.svg @@ -1,14 +1,7 @@ - - - - + diff --git a/assets/icons/dark_mode.svg b/assets/icons/dark_mode.svg index f1a0e41..821d76f 100644 --- a/assets/icons/dark_mode.svg +++ b/assets/icons/dark_mode.svg @@ -1,14 +1,7 @@ - - - - + diff --git a/assets/icons/download_aya.svg b/assets/icons/download_aya.svg index b1b08f2..697df83 100644 --- a/assets/icons/download_aya.svg +++ b/assets/icons/download_aya.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/download_recording.svg b/assets/icons/download_recording.svg index 6f56ced..b792acc 100644 --- a/assets/icons/download_recording.svg +++ b/assets/icons/download_recording.svg @@ -1,19 +1,6 @@ - - + @@ -21,9 +8,9 @@ - + - ليجستلا ليزنت + ليجستلا ليزنت diff --git a/assets/icons/drop_menu.svg b/assets/icons/drop_menu.svg index a90cc6e..701b7aa 100644 --- a/assets/icons/drop_menu.svg +++ b/assets/icons/drop_menu.svg @@ -1,14 +1,7 @@ - - - - + diff --git a/assets/icons/increase_size.svg b/assets/icons/increase_size.svg index 1fac338..e5489b7 100644 --- a/assets/icons/increase_size.svg +++ b/assets/icons/increase_size.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/next_aya.svg b/assets/icons/next_aya.svg index 661941f..9e75c49 100644 --- a/assets/icons/next_aya.svg +++ b/assets/icons/next_aya.svg @@ -1,16 +1,8 @@ - - - - + diff --git a/assets/icons/play_aya.svg b/assets/icons/play_aya.svg index d0ba96a..2c8b56e 100644 --- a/assets/icons/play_aya.svg +++ b/assets/icons/play_aya.svg @@ -1,14 +1,7 @@ - - - - + diff --git a/assets/icons/previous_aya.svg b/assets/icons/previous_aya.svg index a992dc9..85d9d5e 100644 --- a/assets/icons/previous_aya.svg +++ b/assets/icons/previous_aya.svg @@ -1,16 +1,8 @@ - - - - + diff --git a/assets/icons/read_quran.svg b/assets/icons/read_quran.svg index 1adf263..45801e5 100644 --- a/assets/icons/read_quran.svg +++ b/assets/icons/read_quran.svg @@ -1,16 +1,7 @@ - - - - + diff --git a/assets/icons/reduce_size.svg b/assets/icons/reduce_size.svg index 918ef40..0b8f403 100644 --- a/assets/icons/reduce_size.svg +++ b/assets/icons/reduce_size.svg @@ -1,16 +1,9 @@ - - - - - + + diff --git a/assets/icons/share_aya.svg b/assets/icons/share_aya.svg index 6251f69..545816f 100644 --- a/assets/icons/share_aya.svg +++ b/assets/icons/share_aya.svg @@ -1,16 +1,8 @@ - - - - + diff --git a/assets/logos/tangheem_logo.svg b/assets/logos/tangheem_logo.svg index afd1b94..3f4d8c3 100644 --- a/assets/logos/tangheem_logo.svg +++ b/assets/logos/tangheem_logo.svg @@ -1,34 +1,18 @@ - - - - + - - - - - Tangheem + + + + + Tangheem - - - - - + + + + + diff --git a/assets/logos/tangheem_logo_dark_mode.svg b/assets/logos/tangheem_logo_dark_mode.svg index 8801190..f19c9ab 100644 --- a/assets/logos/tangheem_logo_dark_mode.svg +++ b/assets/logos/tangheem_logo_dark_mode.svg @@ -1,34 +1,18 @@ - - - - - - - - Tangheem + + + + + Tangheem - - - - - + + + + + diff --git a/lib/main.dart b/lib/main.dart index ad2c635..87ab1ad 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:tangheem/ui/home_screen.dart'; @@ -16,11 +18,8 @@ class Application extends StatelessWidget { @override Widget build(BuildContext context) { return MaterialApp( - title: 'Flutter Demo', + title: 'Tangheem', theme: lightTheme(), - //locale: Locale("ar"), - // supportedLocales: [Locale("ar")], - //locale: Locale("ar"), debugShowCheckedModeBanner: false, initialRoute: HomeScreen.routeName, onGenerateRoute: (settings) { @@ -42,8 +41,10 @@ class Application extends StatelessWidget { } PageRoute goToNavigation(var className) { - print("classNameType:${className.runtimeType}"); - return CupertinoPageRoute(builder: (context) => className); + if (Platform.isIOS) { + return CupertinoPageRoute(builder: (context) => className); + } + return MaterialPageRoute(builder: (context) => className); } ThemeData lightTheme() { diff --git a/lib/ui/home_screen.dart b/lib/ui/home_screen.dart index f0d85fd..292f7d5 100644 --- a/lib/ui/home_screen.dart +++ b/lib/ui/home_screen.dart @@ -9,7 +9,7 @@ import 'package:tangheem/ui/tangheem_screen.dart'; import 'package:tangheem/widgets/common_dropdown_button.dart'; class HomeScreen extends StatefulWidget { - static const String routeName = "/home"; + static const String routeName = "/"; HomeScreen({Key key}) : super(key: key); @@ -97,7 +97,7 @@ class _HomeScreenState extends State { padding: EdgeInsets.only(right: 6), child: SvgPicture.asset( "assets/icons/search.svg", - color: Const.secondaryOrange, + //color: Const.secondaryOrange, ), ), suffixIcon: InkWell( diff --git a/lib/ui/surah_screen.dart b/lib/ui/surah_screen.dart index cf0f556..9748c2a 100644 --- a/lib/ui/surah_screen.dart +++ b/lib/ui/surah_screen.dart @@ -66,10 +66,7 @@ class _SurahScreenState extends State { padding: EdgeInsets.only(top: 16, bottom: 4, right: 16, left: 16), decoration: BoxDecoration( color: Colors.white, - borderRadius: BorderRadius.only( - topLeft: Radius.circular(8), - topRight: Radius.circular(8), - ), + borderRadius: BorderRadius.circular(8), ), child: Column( children: [ @@ -137,7 +134,7 @@ class _SurahScreenState extends State { crossAxisAlignment: CrossAxisAlignment.center, mainAxisSize: MainAxisSize.min, children: [ - SvgPicture.asset(icon, height: 16, width: 16, color: Const.secondaryOrange), + SvgPicture.asset(icon, height: 16, width: 16, color: Colors.orange), SizedBox(width: 4), Text( text, @@ -160,7 +157,7 @@ class _SurahScreenState extends State { style: TextStyle(color: Const.textGrey), ), SizedBox(width: 4), - SvgPicture.asset(icon, height: 16, width: 16, color: Const.secondaryOrange), + SvgPicture.asset(icon, height: 16, width: 16, color: Colors.orange), ], ), ); diff --git a/lib/ui/tangheem_screen.dart b/lib/ui/tangheem_screen.dart index 339014f..0cf7db6 100644 --- a/lib/ui/tangheem_screen.dart +++ b/lib/ui/tangheem_screen.dart @@ -65,10 +65,7 @@ class _TangheemScreenState extends State { padding: EdgeInsets.only(top: 8, bottom: 8, right: 4, left: 4), decoration: BoxDecoration( color: Colors.white, - borderRadius: BorderRadius.only( - topLeft: Radius.circular(8), - topRight: Radius.circular(8), - ), + borderRadius: BorderRadius.circular(8), ), child: Column( children: [ @@ -143,12 +140,15 @@ class _TangheemScreenState extends State { ), ), SizedBox(height: 4), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - nextOptionButton("assets/icons/go_forward.svg", "الآيات السابقة", () {}), - previousOptionButton("assets/icons/go_forward.svg", "الآيات التالية", () {}), - ], + Padding( + padding: EdgeInsets.only(left: 4, right: 4), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + nextOptionButton("assets/icons/go_forward.svg", "الآيات السابقة", () {}), + previousOptionButton("assets/icons/go_forward.svg", "الآيات التالية", () {}), + ], + ), ), ], ), @@ -167,7 +167,7 @@ class _TangheemScreenState extends State { crossAxisAlignment: CrossAxisAlignment.center, mainAxisSize: MainAxisSize.min, children: [ - SvgPicture.asset(icon, height: 16, width: 16, color: Const.secondaryOrange), + SvgPicture.asset(icon, height: 16, width: 16,color: Colors.orange), SizedBox(width: 4), Text( text, @@ -190,7 +190,7 @@ class _TangheemScreenState extends State { style: TextStyle(color: Const.textGrey), ), SizedBox(width: 4), - SvgPicture.asset(icon, height: 16, width: 16, color: Const.secondaryOrange), + SvgPicture.asset(icon, height: 16, width: 16,color: Colors.orange), ], ), ); diff --git a/lib/widgets/aya_player_widget.dart b/lib/widgets/aya_player_widget.dart index 663f1f2..df83386 100644 --- a/lib/widgets/aya_player_widget.dart +++ b/lib/widgets/aya_player_widget.dart @@ -32,10 +32,7 @@ class _AyaPlayerWidgetState extends State { margin: EdgeInsets.only(top: 8, bottom: 8), decoration: BoxDecoration( color: Colors.white, - borderRadius: BorderRadius.only( - topLeft: Radius.circular(8), - topRight: Radius.circular(8), - ), + borderRadius: BorderRadius.circular(8), ), padding: EdgeInsets.all(8), child: Column( @@ -46,7 +43,7 @@ class _AyaPlayerWidgetState extends State { angle: 180 * math.pi / 180, child: SvgPicture.asset( "assets/icons/drop_menu.svg", - color: Const.secondaryOrange, + // color: Const.secondaryOrange, width: 16, ), ), @@ -70,7 +67,7 @@ class _AyaPlayerWidgetState extends State { crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - "سورة البقسورة البقسورة البقرة", + "سورة البقسورة", maxLines: 1, overflow: TextOverflow.ellipsis, style: TextStyle(fontWeight: FontWeight.bold, fontSize: 14, color: Const.primaryBlack, height: 1), @@ -102,6 +99,7 @@ class _AyaPlayerWidgetState extends State { }), SizedBox(width: 4), commonIconButton("assets/icons/previous_aya.svg", () {}), + SizedBox(width: 16), Expanded( child: SliderTheme( data: SliderTheme.of(context).copyWith( @@ -136,6 +134,6 @@ class _AyaPlayerWidgetState extends State { } Widget commonIconButton(String icon, VoidCallback onPressed) { - return IconButton(constraints: BoxConstraints(), padding: EdgeInsets.only(right: 2), icon: SvgPicture.asset(icon, height: 16, width: 16, color: Const.textGrey), onPressed: onPressed); + return IconButton(constraints: BoxConstraints(), padding: EdgeInsets.only(right: 2), icon: SvgPicture.asset(icon, height: 16, width: 16), onPressed: onPressed); } } diff --git a/lib/widgets/common_appbar_widget.dart b/lib/widgets/common_appbar_widget.dart index 2b45258..02d07c2 100644 --- a/lib/widgets/common_appbar_widget.dart +++ b/lib/widgets/common_appbar_widget.dart @@ -39,7 +39,7 @@ class _CommonAppbarWidgetState extends State { Container( color: Colors.white, height: 100, - padding: EdgeInsets.only(top: 8, bottom: 8), + padding: EdgeInsets.only(top: 8, bottom: 8,right: 16), child: Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, crossAxisAlignment: CrossAxisAlignment.center, @@ -231,7 +231,7 @@ class _CommonAppbarWidgetState extends State { Widget commonIconButton(String icon, VoidCallback onPressed, {double size}) { return Expanded( - child: IconButton(padding: EdgeInsets.zero, icon: SvgPicture.asset(icon, height: size ?? 25, width: size ?? 30, color: Const.textGrey), onPressed: onPressed), + child: IconButton(padding: EdgeInsets.zero, icon: SvgPicture.asset(icon, height: size ?? 25, width: size ?? 30), onPressed: onPressed), ); }