diff --git a/bhagavad_gita/android/build.gradle b/bhagavad_gita/android/build.gradle index 0d1f106..ace5536 100644 --- a/bhagavad_gita/android/build.gradle +++ b/bhagavad_gita/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.6.10' + ext.kotlin_version = '1.8.22' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' + classpath 'com.android.tools.build:gradle:7.1.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.google.gms:google-services:4.3.10' } @@ -25,6 +25,6 @@ subprojects { project.evaluationDependsOn(':app') } -task clean(type: Delete) { +tasks.register("clean", Delete) { delete rootProject.buildDir } diff --git a/bhagavad_gita/android/gradle/wrapper/gradle-wrapper.properties b/bhagavad_gita/android/gradle/wrapper/gradle-wrapper.properties index bc6a58a..cfe88f6 100644 --- a/bhagavad_gita/android/gradle/wrapper/gradle-wrapper.properties +++ b/bhagavad_gita/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-all.zip diff --git a/bhagavad_gita/lib/main.dart b/bhagavad_gita/lib/main.dart index 3f0777a..787ccec 100644 --- a/bhagavad_gita/lib/main.dart +++ b/bhagavad_gita/lib/main.dart @@ -1,5 +1,3 @@ -// ignore_for_file: deprecated_member_use - import 'dart:io'; import 'package:bhagavad_gita/Constant/app_colors.dart'; @@ -16,13 +14,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:firebase_core/firebase_core.dart'; -import 'package:flutter/foundation.dart'; + +// import 'package:flutter/foundation.dart'; import 'package:flutter_local_notifications/flutter_local_notifications.dart'; ///// firbase push notification in Background -Future onBackgroundMessage(RemoteMessage message) async { - -} +Future onBackgroundMessage(RemoteMessage message) async {} ///// Android notification channel const AndroidNotificationChannel channel = AndroidNotificationChannel( @@ -31,23 +28,20 @@ const AndroidNotificationChannel channel = AndroidNotificationChannel( importance: Importance.high, ); - IOSNotificationDetails _iosNotificationDetails = IOSNotificationDetails( +IOSNotificationDetails _iosNotificationDetails = IOSNotificationDetails( presentAlert: false, presentBadge: false, presentSound: true, - subtitle: "", - threadIdentifier: "" - ); - + subtitle: "", + threadIdentifier: ""); enableIOSNotifications() async { - await FirebaseMessaging.instance - .setForegroundNotificationPresentationOptions( - alert: true, // Required to display a heads up notification - badge: true, - sound: true, - ); - } + await FirebaseMessaging.instance.setForegroundNotificationPresentationOptions( + alert: true, // Required to display a heads up notification + badge: true, + sound: true, + ); +} final FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin = FlutterLocalNotificationsPlugin(); @@ -57,11 +51,10 @@ Future main() async { //// firebase initialized await Firebase.initializeApp(); - if(Platform.isIOS){ + if (Platform.isIOS) { await enableIOSNotifications(); } - - + //// firebase subscribeTopic await FirebaseMessaging.instance.subscribeToTopic('Bhagavad-gita-app'); FirebaseMessaging.onBackgroundMessage(onBackgroundMessage); @@ -70,7 +63,7 @@ Future main() async { AndroidFlutterLocalNotificationsPlugin>() ?.createNotificationChannel(channel); - await flutterLocalNotificationsPlugin + await flutterLocalNotificationsPlugin .resolvePlatformSpecificImplementation< IOSFlutterLocalNotificationsPlugin>() ?.requestPermissions( @@ -111,16 +104,16 @@ class _MyAppState extends State { }); void requestIOSPermissions( - FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin) { - flutterLocalNotificationsPlugin - .resolvePlatformSpecificImplementation< - IOSFlutterLocalNotificationsPlugin>() - ?.requestPermissions( - alert: true, - badge: true, - sound: true, - ); -} + FlutterLocalNotificationsPlugin flutterLocalNotificationsPlugin) { + flutterLocalNotificationsPlugin + .resolvePlatformSpecificImplementation< + IOSFlutterLocalNotificationsPlugin>() + ?.requestPermissions( + alert: true, + badge: true, + sound: true, + ); + } } @override @@ -128,7 +121,8 @@ class _MyAppState extends State { super.initState(); //// firebase forground notification -final AndroidInitializationSettings initializationSettingsAndroid = AndroidInitializationSettings('@mipmap/ic_notification'); + final AndroidInitializationSettings initializationSettingsAndroid = + AndroidInitializationSettings('@mipmap/ic_notification'); var iOSSettings = IOSInitializationSettings( requestSoundPermission: false, requestBadgePermission: false, @@ -136,10 +130,11 @@ final AndroidInitializationSettings initializationSettingsAndroid = AndroidIniti ); final InitializationSettings initializationSettings = - InitializationSettings(android: initializationSettingsAndroid, iOS: iOSSettings); + InitializationSettings( + android: initializationSettingsAndroid, iOS: iOSSettings); flutterLocalNotificationsPlugin.initialize(initializationSettings, onSelectNotification: (message) async { - print("message-----$message"); + print("message-----$message"); }); FirebaseMessaging.onMessage.listen((RemoteMessage message) { RemoteNotification? notification = message.notification; @@ -187,32 +182,42 @@ final AndroidInitializationSettings initializationSettingsAndroid = AndroidIniti return supportedLocales.first; }, theme: ThemeData( - accentColor: orangeColor, + hintColor: orangeColor, fontFamily: 'Inter', textTheme: TextTheme( - headline1: TextStyle( + displayLarge: TextStyle( color: appBarTitleColor, fontSize: 26, fontWeight: FontWeight.w700), - headline2: TextStyle( + displayMedium: TextStyle( color: appBarTitleColor, fontSize: 14, fontWeight: FontWeight.w600), - subtitle1: TextStyle( + titleMedium: TextStyle( color: appBarTitleColor, fontSize: 16, fontWeight: FontWeight.w400), ), + // appBarTheme: AppBarTheme( + // color: Colors.white, + // elevation: 0, + // titleTextStyle: TextStyle(color: appBarTitleColor), + // textTheme: TextTheme( + // headline1: TextStyle( + // color: appBarTitleColor, + // fontSize: 26, + // fontWeight: FontWeight.w700, + // fontFamily: 'Inter'), + // ), + // ), appBarTheme: AppBarTheme( - color: Colors.white, elevation: 0, - titleTextStyle: TextStyle(color: appBarTitleColor), - textTheme: TextTheme( - headline1: TextStyle( - color: appBarTitleColor, - fontSize: 26, - fontWeight: FontWeight.w700, - fontFamily: 'Inter'), + backgroundColor: Colors.white, + titleTextStyle: TextStyle( + color: appBarTitleColor, + fontFamily: 'Inter', + fontSize: 26, + fontWeight: FontWeight.w700, ), ), primaryColor: primaryColor, diff --git a/bhagavad_gita/lib/screens/bottom_navigation_menu/bottom_navigation_screen.dart b/bhagavad_gita/lib/screens/bottom_navigation_menu/bottom_navigation_screen.dart index 44a6075..17a36ee 100644 --- a/bhagavad_gita/lib/screens/bottom_navigation_menu/bottom_navigation_screen.dart +++ b/bhagavad_gita/lib/screens/bottom_navigation_menu/bottom_navigation_screen.dart @@ -4,7 +4,7 @@ import 'package:bhagavad_gita/localization/demo_localization.dart'; import 'package:bhagavad_gita/models/color_selection_model.dart'; import 'package:bhagavad_gita/services/navigator_service.dart'; import 'package:bhagavad_gita/widgets/line_space_widget.dart'; -import 'package:flutter/cupertino.dart'; +// import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import '../../locator.dart'; @@ -75,7 +75,7 @@ class _BottomNavigationMenuState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith(height: 1.5, color: greyScalBodyColor), ), SizedBox(width: 175), @@ -85,7 +85,7 @@ class _BottomNavigationMenuState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith(height: 1.5, color: greyScalBodyColor), ), ], @@ -173,7 +173,7 @@ class _BottomNavigationMenuState extends State { fontFamilyName, style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith( fontSize: 18, color: titleLableColor), ), @@ -196,7 +196,7 @@ class _BottomNavigationMenuState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith(height: 1.5, color: greyScalBodyColor), ), SizedBox(height: 10), @@ -262,7 +262,7 @@ class _BottomNavigationMenuState extends State { DemoLocalization.of(context)! .getTranslatedValue('colorMode') .toString(), - style: Theme.of(context).textTheme.headline2, + style: Theme.of(context).textTheme.displayMedium, ), SizedBox(height: 10), Row( diff --git a/bhagavad_gita/lib/screens/bottom_navigation_menu/font_family_screen.dart b/bhagavad_gita/lib/screens/bottom_navigation_menu/font_family_screen.dart index 048a76f..fe7eaff 100644 --- a/bhagavad_gita/lib/screens/bottom_navigation_menu/font_family_screen.dart +++ b/bhagavad_gita/lib/screens/bottom_navigation_menu/font_family_screen.dart @@ -3,7 +3,7 @@ import 'package:bhagavad_gita/Constant/app_size_config.dart'; import 'package:bhagavad_gita/localization/demo_localization.dart'; import 'package:bhagavad_gita/services/navigator_service.dart'; import 'package:bhagavad_gita/services/shared_preferences.dart'; -import 'package:flutter/cupertino.dart'; +// import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import '../../locator.dart'; @@ -73,7 +73,7 @@ class _InterClickState extends State { DemoLocalization.of(context)! .getTranslatedValue('fontFamily') .toString(), - style: Theme.of(context).textTheme.headline2!.copyWith( + style: Theme.of(context).textTheme.displayMedium!.copyWith( color: Colors.black, fontSize: 14, height: 1.5, diff --git a/bhagavad_gita/lib/screens/chapter_detail/chapter_detail_screen.dart b/bhagavad_gita/lib/screens/chapter_detail/chapter_detail_screen.dart index 7b1ab6d..13f5d8b 100644 --- a/bhagavad_gita/lib/screens/chapter_detail/chapter_detail_screen.dart +++ b/bhagavad_gita/lib/screens/chapter_detail/chapter_detail_screen.dart @@ -150,7 +150,7 @@ class _ChapterDetailScreenState extends State { }, child: Text( StringConstant.strAa, - style: Theme.of(context).textTheme.headline1!.copyWith( + style: Theme.of(context).textTheme.displayLarge!.copyWith( fontSize: 18, color: formatingColor.naviagationIconColor, fontWeight: FontWeight.w100, @@ -222,28 +222,40 @@ class _ChapterDetailScreenState extends State { "${DemoLocalization.of(context)!.getTranslatedValue('chapter').toString()} ${chapterDetailData.gitaChapterById!.chapterNumber ?? 1}", style: Theme.of(context) .textTheme - .headline1! + .displayLarge! .copyWith( height: lineSpacing, color: Color(0xffd97706), - fontSize: (Localizations.localeOf(context).languageCode == 'hi') ? - fontSize + 2 : fontSize, + fontSize: + (Localizations.localeOf(context) + .languageCode == + 'hi') + ? fontSize + 2 + : fontSize, fontFamily: fontFamily, ), ), ), SizedBox(height: kPadding), Text( - (Localizations.localeOf(context).languageCode == 'hi') ? (chapterDetailData - .gitaChapterById!.name ?? "") : chapterDetailData - .gitaChapterById!.nameTranslated ?? "", + (Localizations.localeOf(context).languageCode == + 'hi') + ? (chapterDetailData + .gitaChapterById!.name ?? + "") + : chapterDetailData + .gitaChapterById!.nameTranslated ?? + "", style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( height: lineSpacing, - fontSize: (Localizations.localeOf(context).languageCode == 'hi') ? - fontSize + 4 : fontSize + 2, + fontSize: (Localizations.localeOf(context) + .languageCode == + 'hi') + ? fontSize + 4 + : fontSize + 2, fontFamily: fontFamily, color: formatingColor.naviagationIconColor, @@ -251,17 +263,25 @@ class _ChapterDetailScreenState extends State { ), SizedBox(height: kDefaultPadding * 2), Text( - (Localizations.localeOf(context).languageCode == 'hi') ? (chapterDetailData - .gitaChapterById!.chapterSummaryHindi ?? "") : chapterDetailData - .gitaChapterById!.chapterSummary ?? "", + (Localizations.localeOf(context).languageCode == + 'hi') + ? (chapterDetailData.gitaChapterById! + .chapterSummaryHindi ?? + "") + : chapterDetailData + .gitaChapterById!.chapterSummary ?? + "", maxLines: isShowMoreChapterDetail ? 500 : 4, overflow: TextOverflow.ellipsis, style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith( - fontSize: (Localizations.localeOf(context).languageCode == 'hi') ? - fontSize + 2 : fontSize, + fontSize: (Localizations.localeOf(context) + .languageCode == + 'hi') + ? fontSize + 2 + : fontSize, height: lineSpacing, fontFamily: fontFamily, color: @@ -287,7 +307,7 @@ class _ChapterDetailScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( fontSize: fontSize - 2, height: lineSpacing, @@ -310,8 +330,11 @@ class _ChapterDetailScreenState extends State { .gitaVersesByChapterId!.nodes![index], formatingColor: formatingColor, lineSpacing: lineSpacing, - fontSize: (Localizations.localeOf(context).languageCode == 'hi') ? - fontSize + 2 : fontSize, + fontSize: (Localizations.localeOf(context) + .languageCode == + 'hi') + ? fontSize + 2 + : fontSize, fontFamily: fontFamily, refreshEditing: () { refreshChapterDetailPage(); diff --git a/bhagavad_gita/lib/screens/chapter_detail/chapter_tableview.dart b/bhagavad_gita/lib/screens/chapter_detail/chapter_tableview.dart index 0725955..af26db9 100644 --- a/bhagavad_gita/lib/screens/chapter_detail/chapter_tableview.dart +++ b/bhagavad_gita/lib/screens/chapter_detail/chapter_tableview.dart @@ -9,7 +9,7 @@ import 'package:bhagavad_gita/models/chapter_model.dart'; import 'package:bhagavad_gita/screens/home_screen.dart/read_more_page.dart'; import 'package:bhagavad_gita/services/navigator_service.dart'; import 'package:bhagavad_gita/widgets/tableof_content_Chapter_widget.dart'; -import 'package:flutter/cupertino.dart'; +// import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:graphql_flutter/graphql_flutter.dart'; @@ -76,7 +76,7 @@ class _ChapterTableViewScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith(fontSize: 18), ), ], @@ -292,7 +292,7 @@ class _TableOfContectVerseGridWidgetState child: Center( child: Text( '${verse[index].verseNumber ?? 0}', - style: Theme.of(context).textTheme.headline2!.copyWith( + style: Theme.of(context).textTheme.displayMedium!.copyWith( fontSize: 16, color: selectedIndex == index ? orangeColor diff --git a/bhagavad_gita/lib/screens/home_screen.dart/about_gita_page.dart b/bhagavad_gita/lib/screens/home_screen.dart/about_gita_page.dart index c7c0676..2581694 100644 --- a/bhagavad_gita/lib/screens/home_screen.dart/about_gita_page.dart +++ b/bhagavad_gita/lib/screens/home_screen.dart/about_gita_page.dart @@ -1,4 +1,4 @@ -import 'dart:io' show Platform; +// import 'dart:io' show Platform; import 'package:bhagavad_gita/Constant/app_colors.dart'; import 'package:bhagavad_gita/Constant/app_size_config.dart'; import 'package:bhagavad_gita/localization/demo_localization.dart'; @@ -13,7 +13,7 @@ class AboutGitaScreen extends StatefulWidget { class _AboutGitaScreenState extends State with AutomaticKeepAliveClientMixin { - final InAppReview inAppReview = InAppReview.instance; + final InAppReview inAppReview = InAppReview.instance; // final Uri _url = Uri.parse( // 'https://bhagavadgita.io/privacy-policy/'); @@ -64,7 +64,7 @@ class _AboutGitaScreenState extends State .toString(), style: Theme.of(context) .textTheme - .headline1! + .displayLarge! .copyWith(fontSize: 30, color: whiteColor), ), // Text( @@ -114,7 +114,7 @@ class _AboutGitaScreenState extends State textAlign: TextAlign.center, style: Theme.of(context) .textTheme - .headline1! + .displayLarge! .copyWith( fontSize: (Localizations.localeOf(context) .languageCode == @@ -146,7 +146,7 @@ class _AboutGitaScreenState extends State .toString(), style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith( fontSize: (Localizations.localeOf(context) .languageCode == @@ -171,7 +171,7 @@ class _AboutGitaScreenState extends State .toString(), style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith( fontSize: (Localizations.localeOf(context) .languageCode == @@ -190,19 +190,24 @@ class _AboutGitaScreenState extends State DemoLocalization.of(context)! .getTranslatedValue('gitaStoryDetail') .toString(), - style: Theme.of(context).textTheme.subtitle1!.copyWith( - fontSize: - (Localizations.localeOf(context).languageCode == + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith( + fontSize: (Localizations.localeOf(context) + .languageCode == 'hi') ? 20 : 18, - color: blackColor)), + color: blackColor)), SizedBox(height: kDefaultPadding * 1.5), Row( mainAxisAlignment: MainAxisAlignment.center, children: [ SvgPicture.asset( - "assets/icons/icon_left_rtansection.svg",height: height*0.020,), + "assets/icons/icon_left_rtansection.svg", + height: height * 0.020, + ), SizedBox(width: kDefaultPadding), Text( DemoLocalization.of(context)! @@ -210,7 +215,7 @@ class _AboutGitaScreenState extends State .toString(), style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith( fontSize: (Localizations.localeOf(context) .languageCode == @@ -221,7 +226,9 @@ class _AboutGitaScreenState extends State ), SizedBox(width: kDefaultPadding), SvgPicture.asset( - "assets/icons/icon_right_translation.svg",height: height*0.020,) + "assets/icons/icon_right_translation.svg", + height: height * 0.020, + ) ], ), SizedBox(height: kDefaultPadding), @@ -229,7 +236,7 @@ class _AboutGitaScreenState extends State DemoLocalization.of(context)! .getTranslatedValue('conclusionDetail') .toString(), - style: Theme.of(context).textTheme.subtitle1!.copyWith( + style: Theme.of(context).textTheme.titleMedium!.copyWith( fontSize: (Localizations.localeOf(context).languageCode == 'hi') @@ -246,12 +253,11 @@ class _AboutGitaScreenState extends State ), ), floatingActionButton: FloatingActionButton.small( - onPressed: () async{ - final avaialable =await inAppReview.isAvailable(); + onPressed: () async { + final avaialable = await inAppReview.isAvailable(); debugPrint("Avial==> $avaialable"); - await inAppReview.openStoreListing( - appStoreId: "com.gitainitiative.bhagavadgita" - ); + await inAppReview.openStoreListing( + appStoreId: "com.gitainitiative.bhagavadgita"); }, child: Icon( Icons.star, diff --git a/bhagavad_gita/lib/screens/home_screen.dart/home_screen.dart b/bhagavad_gita/lib/screens/home_screen.dart/home_screen.dart index 624ad3a..8029cf8 100644 --- a/bhagavad_gita/lib/screens/home_screen.dart/home_screen.dart +++ b/bhagavad_gita/lib/screens/home_screen.dart/home_screen.dart @@ -63,12 +63,12 @@ class _HomeScreenState extends State LocalNotification.instance.setNeedToShowLastRead(tempLastRead); } }); - setState(() { - LocalNotification.instance.needToShowLastRead.addListener(() { - lastReadVerse = LocalNotification.instance.needToShowLastRead.value; + setState(() { + LocalNotification.instance.needToShowLastRead.addListener(() { + lastReadVerse = LocalNotification.instance.needToShowLastRead.value; }); }); - + print("selected language : $langauge"); } @@ -88,7 +88,11 @@ class _HomeScreenState extends State DemoLocalization.of(context)! .getTranslatedValue('bhagvad_gita') .toString(), - style: AppBarTheme.of(context).textTheme!.headline1, + style: TextStyle( + color: appBarTitleColor, + fontSize: 26, + fontWeight: FontWeight.w700, + fontFamily: 'Inter'), ), ), Spacer(), @@ -133,10 +137,11 @@ class _HomeScreenState extends State ? Center( child: Text( 'connect to internet', - style: AppBarTheme.of(context).textTheme!.headline1, + // style: AppBarTheme.of(context).textTheme!.headline1, ), ) : SingleChildScrollView( + physics: BouncingScrollPhysics(), child: Column( children: [ /* Container( diff --git a/bhagavad_gita/lib/screens/home_screen.dart/quotes_page.dart b/bhagavad_gita/lib/screens/home_screen.dart/quotes_page.dart index 1337261..ff4ab70 100644 --- a/bhagavad_gita/lib/screens/home_screen.dart/quotes_page.dart +++ b/bhagavad_gita/lib/screens/home_screen.dart/quotes_page.dart @@ -14,18 +14,18 @@ class _QuotesScreenState extends State with AutomaticKeepAliveClientMixin { String quote = ""; final PageController controller = PageController(); - int index=0; + int index = 0; @override void initState() { super.initState(); - quotesListHindi.shuffle(); - quotesList.shuffle(); - Future.delayed(Duration.zero,(){ + quotesListHindi.shuffle(); + quotesList.shuffle(); + Future.delayed(Duration.zero, () { getFirstQuote(); - }); + }); } - /* @override + /* @override void didChangeDependencies() { super.didChangeDependencies(); @@ -42,10 +42,10 @@ class _QuotesScreenState extends State }); } */ - getFirstQuote(){ - var result = (Localizations.localeOf(context).languageCode == 'hi') ? - quotesListHindi[index] : - quotesList[index]; + getFirstQuote() { + var result = (Localizations.localeOf(context).languageCode == 'hi') + ? quotesListHindi[index] + : quotesList[index]; setState(() { quote = result; }); @@ -53,19 +53,19 @@ class _QuotesScreenState extends State getQuote() { index++; - var result = (Localizations.localeOf(context).languageCode == 'hi') ? - quotesListHindi[index] : - quotesList[index]; + var result = (Localizations.localeOf(context).languageCode == 'hi') + ? quotesListHindi[index] + : quotesList[index]; setState(() { quote = result; }); } - reverseQuote() { + reverseQuote() { index--; - var result = (Localizations.localeOf(context).languageCode == 'hi') ? - quotesListHindi[index] : - quotesList[index]; + var result = (Localizations.localeOf(context).languageCode == 'hi') + ? quotesListHindi[index] + : quotesList[index]; setState(() { quote = result; }); @@ -134,10 +134,12 @@ class _QuotesScreenState extends State child: Text( quote, textAlign: TextAlign.left, - style: Theme.of(context).textTheme.subtitle1!.copyWith( + style: Theme.of(context).textTheme.titleMedium!.copyWith( color: whiteColor, - fontSize: (Localizations.localeOf(context).languageCode == 'hi') ? - 21 : 18, + fontSize: + (Localizations.localeOf(context).languageCode == 'hi') + ? 21 + : 18, fontWeight: FontWeight.w500, height: 1.7), ), @@ -147,7 +149,7 @@ class _QuotesScreenState extends State bottom: kDefaultPadding, left: kDefaultPadding, child: Visibility( - visible: index>0, + visible: index > 0, child: Container( height: 48, width: 48, @@ -167,8 +169,8 @@ class _QuotesScreenState extends State clipBehavior: Clip.hardEdge, child: InkWell( onTap: () { - if (index>0) { - reverseQuote(); + if (index > 0) { + reverseQuote(); } }, child: Center( @@ -222,4 +224,4 @@ class _QuotesScreenState extends State @override bool get wantKeepAlive => true; -} \ No newline at end of file +} diff --git a/bhagavad_gita/lib/screens/home_screen.dart/read_more_page.dart b/bhagavad_gita/lib/screens/home_screen.dart/read_more_page.dart index d8ec2b0..da243f6 100644 --- a/bhagavad_gita/lib/screens/home_screen.dart/read_more_page.dart +++ b/bhagavad_gita/lib/screens/home_screen.dart/read_more_page.dart @@ -52,43 +52,43 @@ class _ContinueReadingState extends State { String fontFamily = 'Inter'; double fontSize = 18; FormatingColor formatingColor = whiteFormatingColor; - Color audioBottoSheetColor=Colors.white; - Color textColor= Colors.black; + Color audioBottoSheetColor = Colors.white; + Color textColor = Colors.black; late VerseCustomissation verseCustomissation; bool showTraliteration = true; bool showTranslation = true; bool showCommentry = true; late ScrollController _hideButtomController; - final audioPlayer =AudioPlayer(); - int chapterNumber=0; - int verseNumber=0; - bool isPlay =false; - Duration audioDuration=Duration.zero; - Duration audioPlayedDuration=Duration.zero; + final audioPlayer = AudioPlayer(); + int chapterNumber = 0; + int verseNumber = 0; + bool isPlay = false; + Duration audioDuration = Duration.zero; + Duration audioPlayedDuration = Duration.zero; AnimationController? animationController; @override void initState() { super.initState(); - audioPlayer.onPlayerStateChanged.listen((state){ + audioPlayer.onPlayerStateChanged.listen((state) { setState(() { - isPlay=state==PlayerState.playing; - }); + isPlay = state == PlayerState.playing; }); + }); audioPlayer.onDurationChanged.listen((newDuration) { if (mounted) { setState(() { - audioDuration=newDuration; - }); + audioDuration = newDuration; + }); } }); audioPlayer.onPositionChanged.listen((event) { if (mounted) { setState(() { - audioPlayedDuration=event; - }); + audioPlayedDuration = event; + }); } }); @@ -99,22 +99,23 @@ class _ContinueReadingState extends State { _isVisible = true; _hideButtomController = new ScrollController(); _hideButtomController.addListener(() { - if (_hideButtomController.position.userScrollDirection == - ScrollDirection.reverse) { - if (_isVisible) - setState(() { - _isVisible = false; - print("**** $_isVisible up"); - }); - } - if (_hideButtomController.position.userScrollDirection == - ScrollDirection.forward) { - if (!_isVisible) - setState(() { - _isVisible = true; - print("**** $_isVisible down"); - }); - } + // if (_hideButtomController.position.userScrollDirection ==ScrollDirection.reverse) { + // if (_isVisible) + // setState(() { + // _isVisible = false; + // print("**** $_isVisible up"); + // }); + // } + // if (_hideButtomController.position.userScrollDirection ==ScrollDirection.forward) { + // if (!_isVisible) + // setState(() { + // _isVisible = true; + // print("**** $_isVisible down"); + // }); + // } + setState(() { + _isVisible = _hideButtomController.position.userScrollDirection == ScrollDirection.forward || _hideButtomController.position.pixels == _hideButtomController.position.minScrollExtent || _hideButtomController.position.pixels==_hideButtomController.position.maxScrollExtent; + }); }); }); @@ -130,7 +131,7 @@ class _ContinueReadingState extends State { formatingColor = orangeFormatingColor; } else if (value.colorId == "3") { formatingColor = blackFormatingColor; - audioBottoSheetColor=Color(0xff606368); + audioBottoSheetColor = Color(0xff606368); } }); }); @@ -143,6 +144,7 @@ class _ContinueReadingState extends State { audioPlayer.dispose(); super.dispose(); } + getAllToggelValueFormShowingContent() { SharedPref.getSavedBoolValue(PreferenceConstant.verseTransliterationSetting) .then((value) { @@ -220,8 +222,8 @@ class _ContinueReadingState extends State { changeVersePage() { setState(() { versId = versId + 1; - audioPlayedDuration=Duration.zero; - audioDuration=Duration.zero; + audioPlayedDuration = Duration.zero; + audioDuration = Duration.zero; getVersDetails(); }); } @@ -229,8 +231,8 @@ class _ContinueReadingState extends State { reverschangeVersePage() { setState(() { versId = versId - 1; - audioPlayedDuration=Duration.zero; - audioDuration=Duration.zero; + audioPlayedDuration = Duration.zero; + audioDuration = Duration.zero; getVersDetails(); }); } @@ -248,351 +250,286 @@ class _ContinueReadingState extends State { height = MediaQuery.of(context).size.height; width = MediaQuery.of(context).size.width; return Scaffold( - appBar: AppBar( - automaticallyImplyLeading: false, - centerTitle: false, - backgroundColor: formatingColor.bgColor, - leading: InkWell( - onTap: () { - Navigator.of(context).pop(true); - }, - child: Center( - child: SvgPicture.asset("assets/icons/icon_back_arrow.svg", - width: 20, color: formatingColor.naviagationIconColor), - ), - ), - actions: [ - TextButton( - onPressed: () { - setState(() { - print('Bottom Navigation Menu'); - _onPressedEditButton(context); - }); + appBar: AppBar( + automaticallyImplyLeading: false, + centerTitle: false, + backgroundColor: formatingColor.bgColor, + leading: InkWell( + onTap: () { + Navigator.of(context).pop(true); }, - child: Text( - StringConstant.strAa, - style: Theme.of(context).textTheme.headline1!.copyWith( - fontSize: 18, - fontWeight: FontWeight.w100, - color: formatingColor.naviagationIconColor), + child: Center( + child: SvgPicture.asset("assets/icons/icon_back_arrow.svg", + width: 20, color: formatingColor.naviagationIconColor), ), ), - SizedBox( - width: kPadding, - ), - InkWell( - onTap: () async { - var temp = await Navigator.push( - context, - MaterialPageRoute( - builder: (context) => SettingScreen( - refresh: () { - getAllToggelValueFormShowingContent(); - setState(() { - getVersDetails(); - }); - }, - ), - ), - ); - if (temp) { - getAllToggelValueFormShowingContent(); + actions: [ + TextButton( + onPressed: () { setState(() { - getVersDetails(); + print('Bottom Navigation Menu'); + _onPressedEditButton(context); }); - } - }, - child: Container( - width: 40, - child: Center( - child: SvgPicture.asset('assets/icons/icon_setting_nonsele.svg', + }, + child: Text( + StringConstant.strAa, + style: Theme.of(context).textTheme.displayLarge!.copyWith( + fontSize: 18, + fontWeight: FontWeight.w100, color: formatingColor.naviagationIconColor), ), ), - ), - SizedBox( - width: kDefaultPadding, - ) - ], - ), - backgroundColor: formatingColor.bgColor, - body: GraphQLProvider( - client: client, - child: SafeArea( - child: Stack( - children: [ - Container( - height: height, - child: SingleChildScrollView( - controller: _hideButtomController, - child: Query( - options: QueryOptions(document: gql(verseDetailQuery)), - builder: ( - QueryResult result, { - Refetch? refetch, - FetchMore? fetchMore, - }) { - if (result.hasException) { - print("ERROR : ${result.exception.toString()}"); - } - if (result.data == null) { - return Container( - height: 200, - child: Center( - child: CircularProgressIndicator( - color: primaryColor, - strokeWidth: 2, - ), - ), - ); - } - print("SSSSSS : ${result.data}"); - Map? verse = result.data; - VerseDetailData data = VerseDetailData.fromJson(verse!); - if (data.gitaVerseById == null) { - return Container(); - } - lastReadVerse = LastReadVerse( - verseID: "$versId", - gitaVerseById: data.gitaVerseById!); - //SharedPref.saveLastRead(lastReadVerse!); - LocalNotification.instance - .setNeedToShowLastRead(lastReadVerse!); - chapterNumber=data.gitaVerseById!.chapterNumber??0; - verseNumber=data.gitaVerseById!.verseNumber??0; - return Padding( - padding: - EdgeInsets.symmetric(horizontal: kDefaultPadding), - child: Column( - children: [ - SizedBox( - height: kDefaultPadding, - ), - Text( - "${data.gitaVerseById!.chapterNumber ?? 0}.${data.gitaVerseById!.verseNumber}", - style: Theme.of(context) - .textTheme - .headline2! - .copyWith( - fontFamily: fontFamily, - fontSize: fontSize + 5, - color: formatingColor.textColor)), - SizedBox( - height: kDefaultPadding, - ), - Text( - "${data.gitaVerseById!.text}", - textAlign: TextAlign.center, - style: TextStyle( - fontFamily: fontFamily, - color: Color(0xffd97706), - fontSize: fontSize + 2, - fontWeight: FontWeight.w500), + SizedBox( + width: kPadding, + ), + InkWell( + onTap: () async { + var temp = await Navigator.push( + context, + MaterialPageRoute( + builder: (context) => SettingScreen( + refresh: () { + getAllToggelValueFormShowingContent(); + setState(() { + getVersDetails(); + }); + }, + ), + ), + ); + if (temp) { + getAllToggelValueFormShowingContent(); + setState(() { + getVersDetails(); + }); + } + }, + child: Container( + width: 40, + child: Center( + child: SvgPicture.asset( + 'assets/icons/icon_setting_nonsele.svg', + color: formatingColor.naviagationIconColor), + ), + ), + ), + SizedBox( + width: kDefaultPadding, + ) + ], + ), + backgroundColor: formatingColor.bgColor, + body: GraphQLProvider( + client: client, + child: SafeArea( + child: Stack( + children: [ + Container( + height: height, + child: SingleChildScrollView( + physics: BouncingScrollPhysics(), + controller: _hideButtomController, + child: Query( + options: QueryOptions(document: gql(verseDetailQuery)), + builder: ( + QueryResult result, { + Refetch? refetch, + FetchMore? fetchMore, + }) { + if (result.hasException) { + print("ERROR : ${result.exception.toString()}"); + } + if (result.data == null) { + return Container( + height: 200, + child: Center( + child: CircularProgressIndicator( + color: primaryColor, + strokeWidth: 2, + ), ), - SizedBox(height: kDefaultPadding * 1.5), - showTraliteration - ? Column( - children: [ - Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - SvgPicture.asset( - "assets/icons/icon_left_rtansection.svg"), - SizedBox(width: 7), - Text( - DemoLocalization.of(context)! - .getTranslatedValue( - 'transliteration') - .toString(), - style: Theme.of(context) - .textTheme - .subtitle1! - .copyWith( - fontFamily: fontFamily, - fontSize: (Localizations - .localeOf( - context) - .languageCode == - 'hi') - ? fontSize + 2 - : fontSize - 2, - color: - formatingColor.textColor, - fontWeight: FontWeight.w700, - ), - ), - SizedBox(width: 7), - SvgPicture.asset( - "assets/icons/icon_right_translation.svg") - ], - ), - SizedBox(height: kDefaultPadding), - Text( - "${data.gitaVerseById!.transliteration}", - textAlign: TextAlign.center, - style: Theme.of(context) - .textTheme - .subtitle1! - .copyWith( - fontSize: - (Localizations.localeOf( - context) + ); + } + print("SSSSSS : ${result.data}"); + Map? verse = result.data; + VerseDetailData data = VerseDetailData.fromJson(verse!); + if (data.gitaVerseById == null) { + return Container(); + } + lastReadVerse = LastReadVerse( + verseID: "$versId", + gitaVerseById: data.gitaVerseById!); + //SharedPref.saveLastRead(lastReadVerse!); + LocalNotification.instance + .setNeedToShowLastRead(lastReadVerse!); + chapterNumber = data.gitaVerseById!.chapterNumber ?? 0; + verseNumber = data.gitaVerseById!.verseNumber ?? 0; + return Padding( + padding: + EdgeInsets.symmetric(horizontal: kDefaultPadding), + child: Column( + children: [ + SizedBox( + height: kDefaultPadding, + ), + Text( + "${data.gitaVerseById!.chapterNumber ?? 0}.${data.gitaVerseById!.verseNumber}", + style: Theme.of(context) + .textTheme + .displayMedium! + .copyWith( + fontFamily: fontFamily, + fontSize: fontSize + 5, + color: formatingColor.textColor)), + SizedBox( + height: kDefaultPadding, + ), + Text( + "${data.gitaVerseById!.text}", + textAlign: TextAlign.center, + style: TextStyle( + fontFamily: fontFamily, + color: Color(0xffd97706), + fontSize: fontSize + 2, + fontWeight: FontWeight.w500), + ), + SizedBox(height: kDefaultPadding * 1.5), + showTraliteration + ? Column( + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + SvgPicture.asset( + "assets/icons/icon_left_rtansection.svg"), + SizedBox(width: 7), + Text( + DemoLocalization.of(context)! + .getTranslatedValue( + 'transliteration') + .toString(), + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith( + fontFamily: fontFamily, + fontSize: (Localizations + .localeOf( + context) .languageCode == 'hi') ? fontSize + 2 - : fontSize, - fontStyle: FontStyle.italic, - height: lineSpacing, - color: formatingColor.textColor, - fontFamily: fontFamily), - ), - SizedBox(height: kDefaultPadding), - Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - SvgPicture.asset( - "assets/icons/icon_left_rtansection.svg"), - SizedBox(width: 7), - Text( - DemoLocalization.of(context)! - .getTranslatedValue( - 'word_meanings') - .toString(), - style: Theme.of(context) - .textTheme - .subtitle1! - .copyWith( - fontFamily: fontFamily, + : fontSize - 2, + color: formatingColor + .textColor, + fontWeight: FontWeight.w700, + ), + ), + SizedBox(width: 7), + SvgPicture.asset( + "assets/icons/icon_right_translation.svg") + ], + ), + SizedBox(height: kDefaultPadding), + Text( + "${data.gitaVerseById!.transliteration}", + textAlign: TextAlign.center, + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith( fontSize: (Localizations .localeOf( context) .languageCode == 'hi') ? fontSize + 2 - : fontSize - 2, + : fontSize, + fontStyle: FontStyle.italic, + height: lineSpacing, color: formatingColor.textColor, - fontWeight: FontWeight.w700, - ), - ), - SizedBox(width: 7), - SvgPicture.asset( - "assets/icons/icon_right_translation.svg") - ], - ), - SizedBox(height: kDefaultPadding), - Text( - "${data.gitaVerseById!.wordMeanings}", - textAlign: TextAlign.center, - style: Theme.of(context) - .textTheme - .subtitle1! - .copyWith( - fontSize: - (Localizations.localeOf( - context) + fontFamily: fontFamily), + ), + SizedBox(height: kDefaultPadding), + Row( + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + SvgPicture.asset( + "assets/icons/icon_left_rtansection.svg"), + SizedBox(width: 7), + Text( + DemoLocalization.of(context)! + .getTranslatedValue( + 'word_meanings') + .toString(), + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith( + fontFamily: fontFamily, + fontSize: (Localizations + .localeOf( + context) .languageCode == 'hi') ? fontSize + 2 - : fontSize, - height: lineSpacing, - color: formatingColor.textColor, - fontFamily: fontFamily), - ), - SizedBox(height: kDefaultPadding * 1.5) - ], - ) - : Text(''), - showTranslation - ? Column( - children: [ - Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - SvgPicture.asset( - "assets/icons/icon_left_rtansection.svg"), - SizedBox(width: kDefaultPadding), - Text( - DemoLocalization.of(context)! - .getTranslatedValue( - 'translation') - .toString(), - style: Theme.of(context) - .textTheme - .subtitle1! - .copyWith( - fontFamily: fontFamily, + : fontSize - 2, + color: formatingColor + .textColor, + fontWeight: FontWeight.w700, + ), + ), + SizedBox(width: 7), + SvgPicture.asset( + "assets/icons/icon_right_translation.svg") + ], + ), + SizedBox(height: kDefaultPadding), + Text( + "${data.gitaVerseById!.wordMeanings}", + textAlign: TextAlign.center, + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith( fontSize: (Localizations .localeOf( context) .languageCode == 'hi') ? fontSize + 2 - : fontSize - 2, + : fontSize, + height: lineSpacing, color: formatingColor.textColor, - fontWeight: FontWeight.w700, - ), - ), - SizedBox(width: kDefaultPadding), - SvgPicture.asset( - "assets/icons/icon_right_translation.svg") - ], - ), - SizedBox(height: kDefaultPadding), - Text( - data - .gitaVerseById! - .gitaTranslationsByVerseId! - .nodes! - .length > - 0 - ? data - .gitaVerseById! - .gitaTranslationsByVerseId! - .nodes![0] - .description! - : "---", - style: Theme.of(context) - .textTheme - .subtitle1! - .copyWith( - height: lineSpacing, - fontSize: - (Localizations.localeOf( - context) - .languageCode == - 'hi') - ? fontSize + 2 - : fontSize, - color: formatingColor.textColor, - fontFamily: fontFamily), - ), - ], - ) - : Text(''), - showCommentry - ? Column( - children: [ - SizedBox(height: kDefaultPadding * 1.5), - Row( - mainAxisAlignment: - MainAxisAlignment.center, - children: [ - SvgPicture.asset( - "assets/icons/icon_left_rtansection.svg"), - SizedBox(width: kDefaultPadding), - Text( - DemoLocalization.of(context)! - .getTranslatedValue('commentry') - .toString(), - style: Theme.of(context) - .textTheme - .subtitle1! - .copyWith( + fontFamily: fontFamily), + ), + SizedBox(height: kDefaultPadding * 1.5) + ], + ) + : Text(''), + showTranslation + ? Column( + children: [ + Row( + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + SvgPicture.asset( + "assets/icons/icon_left_rtansection.svg"), + SizedBox(width: kDefaultPadding), + Text( + DemoLocalization.of(context)! + .getTranslatedValue( + 'translation') + .toString(), + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith( fontFamily: fontFamily, fontSize: (Localizations .localeOf( @@ -603,300 +540,379 @@ class _ContinueReadingState extends State { : fontSize - 2, color: formatingColor .textColor, - fontWeight: - FontWeight.w700), - ), - SizedBox(width: kDefaultPadding), - SvgPicture.asset( - "assets/icons/icon_right_translation.svg") - ], - ), - SizedBox( - height: kDefaultPadding, - ), - Text( - data - .gitaVerseById! - .gitaCommentariesByVerseId! - .nodes! - .length > - 0 - ? data - .gitaVerseById! - .gitaCommentariesByVerseId! - .nodes![0] - .description! - : "---", - style: Theme.of(context) - .textTheme - .subtitle1! - .copyWith( - height: lineSpacing, - fontSize: - (Localizations.localeOf( - context) - .languageCode == - 'hi') - ? fontSize + 2 - : fontSize, - color: formatingColor.textColor, - fontFamily: fontFamily), - ), - ], - ) - : Container(), - SizedBox(height: kDefaultPadding * 5), - ], - ), - ); - }, + fontWeight: FontWeight.w700, + ), + ), + SizedBox(width: kDefaultPadding), + SvgPicture.asset( + "assets/icons/icon_right_translation.svg") + ], + ), + SizedBox(height: kDefaultPadding), + Text( + data + .gitaVerseById! + .gitaTranslationsByVerseId! + .nodes! + .length > + 0 + ? data + .gitaVerseById! + .gitaTranslationsByVerseId! + .nodes![0] + .description! + : "---", + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith( + height: lineSpacing, + fontSize: (Localizations + .localeOf( + context) + .languageCode == + 'hi') + ? fontSize + 2 + : fontSize, + color: + formatingColor.textColor, + fontFamily: fontFamily), + ), + ], + ) + : Text(''), + showCommentry + ? Column( + children: [ + SizedBox(height: kDefaultPadding * 1.5), + Row( + mainAxisAlignment: + MainAxisAlignment.center, + children: [ + SvgPicture.asset( + "assets/icons/icon_left_rtansection.svg"), + SizedBox(width: kDefaultPadding), + Text( + DemoLocalization.of(context)! + .getTranslatedValue( + 'commentry') + .toString(), + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith( + fontFamily: fontFamily, + fontSize: (Localizations + .localeOf( + context) + .languageCode == + 'hi') + ? fontSize + 2 + : fontSize - 2, + color: formatingColor + .textColor, + fontWeight: + FontWeight.w700), + ), + SizedBox(width: kDefaultPadding), + SvgPicture.asset( + "assets/icons/icon_right_translation.svg") + ], + ), + SizedBox( + height: kDefaultPadding, + ), + Text( + data + .gitaVerseById! + .gitaCommentariesByVerseId! + .nodes! + .length > + 0 + ? data + .gitaVerseById! + .gitaCommentariesByVerseId! + .nodes![0] + .description! + : "---", + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith( + height: lineSpacing, + fontSize: (Localizations + .localeOf( + context) + .languageCode == + 'hi') + ? fontSize + 2 + : fontSize, + color: + formatingColor.textColor, + fontFamily: fontFamily), + ), + ], + ) + : Container(), + SizedBox(height: kDefaultPadding * 5), + ], + ), + ); + }, + ), ), ), - ), - versId == 1 - ? Container() - : Positioned( - top: MediaQuery.of(context).size.height / 100 * 69, - left: kDefaultPadding, - child: _isVisible - ? AnimatedContainer( - duration: Duration(milliseconds: 200), - child: Container( - height: 48, - width: 48, - decoration: BoxDecoration( - color: whiteColor, - shape: BoxShape.circle, - boxShadow: [ - BoxShadow( - color: editBoxBorderColor, - blurRadius: 10, - ) - ], - ), - child: Material( - color: Colors.transparent, - shape: CircleBorder(), - clipBehavior: Clip.hardEdge, - child: InkWell( - onTap: () { - versId == 1 - ? versId = 1 - : reverschangeVersePage(); - audioPlayer.stop(); - }, - child: Center( - child: SvgPicture.asset( - "assets/icons/icon_slider_verse.svg", + versId == 1 + ? Container() + : Positioned( + top: MediaQuery.of(context).size.height / 100 * 69, + left: kDefaultPadding, + child: _isVisible + ? AnimatedContainer( + duration: Duration(milliseconds: 200), + child: Container( + height: 48, + width: 48, + decoration: BoxDecoration( + color: whiteColor, + shape: BoxShape.circle, + boxShadow: [ + BoxShadow( + color: editBoxBorderColor, + blurRadius: 10, + ) + ], + ), + child: Material( + color: Colors.transparent, + shape: CircleBorder(), + clipBehavior: Clip.hardEdge, + child: InkWell( + onTap: () { + versId == 1 + ? versId = 1 + : reverschangeVersePage(); + audioPlayer.stop(); + }, + child: Center( + child: SvgPicture.asset( + "assets/icons/icon_slider_verse.svg", + ), ), ), ), ), - ), - ) - : Container(), - ), - versId == 701 - ? Container() - : Positioned( - top: MediaQuery.of(context).size.height / 100 * 69, - right: kDefaultPadding, - child: _isVisible - ? AnimatedContainer( - duration: Duration(milliseconds: 200), - child: Container( - height: 48, - width: 48, - decoration: BoxDecoration( - color: whiteColor, - shape: BoxShape.circle, - boxShadow: [ - BoxShadow( - color: editBoxBorderColor, - blurRadius: 10, - ) - ], - ), - child: Material( - color: Colors.transparent, - shape: CircleBorder(), - clipBehavior: Clip.hardEdge, - child: InkWell( - onTap: () { - changeVersePage(); - audioPlayer.stop(); - }, - child: Center( - child: SvgPicture.asset( - "assets/icons/Icon_slider_verseNext.svg", + ) + : Container(), + ), + versId == 701 + ? Container() + : Positioned( + top: MediaQuery.of(context).size.height / 100 * 69, + right: kDefaultPadding, + child: _isVisible + ? AnimatedContainer( + duration: Duration(milliseconds: 200), + child: Container( + height: 48, + width: 48, + decoration: BoxDecoration( + color: whiteColor, + shape: BoxShape.circle, + boxShadow: [ + BoxShadow( + color: editBoxBorderColor, + blurRadius: 10, + ) + ], + ), + child: Material( + color: Colors.transparent, + shape: CircleBorder(), + clipBehavior: Clip.hardEdge, + child: InkWell( + onTap: () { + changeVersePage(); + audioPlayer.stop(); + }, + child: Center( + child: SvgPicture.asset( + "assets/icons/Icon_slider_verseNext.svg", + ), ), ), ), ), - ), - ) - : Container(), - ) - ], + ) + : Container(), + ) + ], + ), ), ), - ), - bottomNavigationBar: SafeArea( - child: AnimatedContainer( - duration: Duration(milliseconds: 200), - height: _isVisible ? 48.0 : 0.0, - child: _isVisible - ? BottomAppBar( - elevation: 0, - child: Container( - height: 48, - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceAround, - children: [ - Expanded( - child: InkWell( - onTap: () { - navigationService.pushNamed(r_ChapterTableView); - }, - child: Container( - child: Center( - child: SvgPicture.asset( - "assets/icons/Icon_menu_bottom.svg"), + bottomNavigationBar: SafeArea( + child: AnimatedContainer( + duration: Duration(milliseconds: 200), + height: _isVisible ? 48.0 : 0.0, + child: _isVisible + ? BottomAppBar( + elevation: 0, + child: Container( + height: 48, + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceAround, + children: [ + Expanded( + child: InkWell( + onTap: () { + navigationService.pushNamed(r_ChapterTableView); + }, + child: Container( + child: Center( + child: SvgPicture.asset( + "assets/icons/Icon_menu_bottom.svg"), + ), ), ), ), - ), - Expanded( - child: InkWell( - onTap: () { - shareVerse(); - }, - child: Container( - child: Center( - child: SvgPicture.asset( - "assets/icons/Icon_shear_bottom.svg"), + Expanded( + child: InkWell( + onTap: () { + shareVerse(); + }, + child: Container( + child: Center( + child: SvgPicture.asset( + "assets/icons/Icon_shear_bottom.svg"), + ), ), ), ), - ), - Expanded( - child: InkWell( - onTap: () async { - if (verseNotes == null) { - VerseNotes temp = VerseNotes( - verseID: "$versId", - gitaVerseById: lastReadVerse!.gitaVerseById, - verseNote: ""); - bool saved = await Navigator.push( - context, - MaterialPageRoute( - builder: (context) => - AddNotesWidget(verseNotes: temp), - ), - ); - if (saved) { - getVerseNotes(); - } - } else { - bool saved = await Navigator.push( - context, - MaterialPageRoute( - builder: (context) => - AddNotesWidget(verseNotes: verseNotes!), - ), - ); - if (saved) { - getVerseNotes(); + Expanded( + child: InkWell( + onTap: () async { + if (verseNotes == null) { + VerseNotes temp = VerseNotes( + verseID: "$versId", + gitaVerseById: + lastReadVerse!.gitaVerseById, + verseNote: ""); + bool saved = await Navigator.push( + context, + MaterialPageRoute( + builder: (context) => + AddNotesWidget(verseNotes: temp), + ), + ); + if (saved) { + getVerseNotes(); + } + } else { + bool saved = await Navigator.push( + context, + MaterialPageRoute( + builder: (context) => AddNotesWidget( + verseNotes: verseNotes!), + ), + ); + if (saved) { + getVerseNotes(); + } } - } - }, - child: Container( - child: Center( - child: verseNotes == null - ? SvgPicture.asset( - "assets/icons/Icon_write_bottom.svg") - : SvgPicture.asset( - 'assets/icons/Icon_fill_addNote.svg'), + }, + child: Container( + child: Center( + child: verseNotes == null + ? SvgPicture.asset( + "assets/icons/Icon_write_bottom.svg") + : SvgPicture.asset( + 'assets/icons/Icon_fill_addNote.svg'), + ), ), ), ), - ), - Expanded( - child: InkWell( - onTap: () async { - if (lastReadVerse != null) { - if (isVerseSaved) { - await SharedPref.removeVerseFromSaved( - "$versId"); - setState(() { - isVerseSaved = !isVerseSaved; - }); - } else { - await SharedPref.saveBookmarkVerse( - lastReadVerse!); - setState(() { - isVerseSaved = !isVerseSaved; - }); + Expanded( + child: InkWell( + onTap: () async { + if (lastReadVerse != null) { + if (isVerseSaved) { + await SharedPref.removeVerseFromSaved( + "$versId"); + setState(() { + isVerseSaved = !isVerseSaved; + }); + } else { + await SharedPref.saveBookmarkVerse( + lastReadVerse!); + setState(() { + isVerseSaved = !isVerseSaved; + }); + } } - } - }, - child: Container( - child: Center( - child: isVerseSaved - ? SvgPicture.asset( - "assets/icons/Icon_saved_bottom.svg") - : SvgPicture.asset( - "assets/icons/Icon_save_bottom.svg"), + }, + child: Container( + child: Center( + child: isVerseSaved + ? SvgPicture.asset( + "assets/icons/Icon_saved_bottom.svg") + : SvgPicture.asset( + "assets/icons/Icon_save_bottom.svg"), + ), ), ), ), - ), - ], + ], + ), ), - ), - ) - : Container(), + ) + : Container(), + ), ), - ), - floatingActionButton:isPlay - ? GestureDetector( - onTap: (){ - audioPlayer.pause().then((value) =>audioPlayerBottomSheet(context)); - }, - child: Container( - decoration: BoxDecoration( - shape: BoxShape.circle, - color: formatingColor.bgColor - ), - child: CircularPercentIndicator( - backgroundWidth:3.5,lineWidth:3.5, - circularStrokeCap:CircularStrokeCap.round , - animation: true, - animateFromLastPercent: true, - animationDuration: 10000, - radius: 25.0, - percent: (audioPlayedDuration.inSeconds.toDouble()*100/audioDuration.inSeconds.toDouble())/100, - // fillColor: formatingColor.bgColor, - center: SvgPicture.asset('assets/icons/pause.svg',height: height*0.0214,), - // Icon(Icons.pause,color: Color(0xffF57903), size: 35), - backgroundColor: Colors.grey.shade300, - progressColor: Color(0xffF57903), + floatingActionButton: isPlay + ? GestureDetector( + onTap: () { + audioPlayer + .pause() + .then((value) => audioPlayerBottomSheet(context)); + }, + child: Container( + decoration: BoxDecoration( + shape: BoxShape.circle, color: formatingColor.bgColor), + child: CircularPercentIndicator( + backgroundWidth: 3.5, lineWidth: 3.5, + circularStrokeCap: CircularStrokeCap.round, + animation: true, + animateFromLastPercent: true, + animationDuration: 10000, + radius: 25.0, + percent: (audioPlayedDuration.inSeconds.toDouble() * + 100 / + audioDuration.inSeconds.toDouble()) / + 100, + // fillColor: formatingColor.bgColor, + center: SvgPicture.asset( + 'assets/icons/pause.svg', + height: height * 0.0214, + ), + // Icon(Icons.pause,color: Color(0xffF57903), size: 35), + backgroundColor: Colors.grey.shade300, + progressColor: Color(0xffF57903), + ), ), - ), - ) - : Container( - height: height*0.0593, - width: width*0.122, - decoration: BoxDecoration( - boxShadow: [ + ) + : Container( + height: height * 0.0593, + width: width * 0.122, + decoration: BoxDecoration(boxShadow: [ BoxShadow( color: Color(0xff162233).withOpacity(0.12), offset: Offset(0, 0), - spreadRadius: 4,blurRadius:20), + spreadRadius: 4, + blurRadius: 20), ], shape: BoxShape.circle), - child: FloatingActionButton( - elevation: 12, - onPressed: () { + child: FloatingActionButton( + elevation: 12, + onPressed: () { String audioUrl = "https://gita.github.io/gita/data/verse_recitation/$chapterNumber/$verseNumber.mp3"; Source source = UrlSource(audioUrl); @@ -904,9 +920,15 @@ class _ContinueReadingState extends State { .play(source) .then((value) => audioPlayerBottomSheet(context)); }, - child: SvgPicture.asset(isPlay?'assets/icons/pause.svg':'assets/icons/play.svg', color: Colors.white,height:height*0.0214 ,),backgroundColor: Color(0xffF57903)), - ) - ); + child: SvgPicture.asset( + isPlay + ? 'assets/icons/pause.svg' + : 'assets/icons/play.svg', + color: Colors.white, + height: height * 0.0214, + ), + backgroundColor: Color(0xffF57903)), + )); } Future audioPlayerBottomSheet(BuildContext context) { @@ -916,117 +938,143 @@ class _ContinueReadingState extends State { borderRadius: BorderRadius.vertical(top: Radius.circular(15))), builder: (BuildContext context) { return StatefulBuilder( - builder: (context,StateSetter builderSetState) { + builder: (context, StateSetter builderSetState) { SharedPref.getSavedVerseListCustomisation().then((value) { - if (value.colorId=='3') { + if (value.colorId == '3') { builderSetState(() { - audioBottoSheetColor=Color(0xff606368); - textColor=Colors.white; + audioBottoSheetColor = Color(0xff606368); + textColor = Colors.white; }); - }else{ - builderSetState(() { - audioBottoSheetColor=Colors.white; - textColor=Colors.black; + } else { + builderSetState(() { + audioBottoSheetColor = Colors.white; + textColor = Colors.black; }); } }); - audioPlayer.onPlayerStateChanged.listen((state){ - try{ - builderSetState(() { - isPlay = state == PlayerState.playing; - });}catch(e){} + audioPlayer.onPlayerStateChanged.listen((state) { + try { + builderSetState(() { + isPlay = state == PlayerState.playing; + }); + } catch (e) {} }); audioPlayer.onDurationChanged.listen((newDuration) { try { builderSetState(() { - audioDuration = newDuration; - }); + audioDuration = newDuration; + }); } catch (e) {} }); audioPlayer.onPositionChanged.listen((event) { try { - builderSetState(() { - audioPlayedDuration = event; - }); + builderSetState(() { + audioPlayedDuration = event; + }); } catch (e) {} - }); - return Container( - height: height*0.145, - decoration: BoxDecoration(color: audioBottoSheetColor,borderRadius: BorderRadius.only(topLeft: Radius.circular(15),topRight:Radius.circular(15) )), - child: Column( - // mainAxisSize: MainAxisSize.min, - children: [ - SizedBox(height: height*0.0147,), - Container( - height: height*0.005, - width: width*0.163,decoration: BoxDecoration(color: Color(0xffD9DBE9),borderRadius: BorderRadius.circular(5))), - SizedBox(height: 10), - Row(mainAxisSize: MainAxisSize.max, - children: [ - Expanded( - child: Column( - mainAxisAlignment: MainAxisAlignment.start, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - SliderTheme( - data: SliderTheme.of(context).copyWith(trackHeight: height*0.0154,thumbShape: RoundSliderThumbShape(enabledThumbRadius: 13,elevation: 5)), - child: Slider( - inactiveColor: Color(0xffD9DBE9), - activeColor: Color(0xffF57903), - thumbColor: Color(0xffF57903), - min: 0, - max: audioDuration.inSeconds.toDouble(), - value: audioPlayedDuration.inSeconds.toDouble(), - onChanged: (value) { - setState(() { - audioPlayedDuration=Duration(seconds: value.toInt()); - }); - audioPlayer.seek(audioPlayedDuration); - }, - ), + }); + return Container( + height: height * 0.145, + decoration: BoxDecoration( + color: audioBottoSheetColor, + borderRadius: BorderRadius.only( + topLeft: Radius.circular(15), + topRight: Radius.circular(15))), + child: Column( + // mainAxisSize: MainAxisSize.min, + children: [ + SizedBox( + height: height * 0.0147, + ), + Container( + height: height * 0.005, + width: width * 0.163, + decoration: BoxDecoration( + color: Color(0xffD9DBE9), + borderRadius: BorderRadius.circular(5))), + SizedBox(height: 10), + Row(mainAxisSize: MainAxisSize.max, children: [ + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + SliderTheme( + data: SliderTheme.of(context).copyWith( + trackHeight: height * 0.0154, + thumbShape: RoundSliderThumbShape( + enabledThumbRadius: 13, elevation: 5)), + child: Slider( + inactiveColor: Color(0xffD9DBE9), + activeColor: Color(0xffF57903), + thumbColor: Color(0xffF57903), + min: 0, + max: audioDuration.inSeconds.toDouble(), + value: audioPlayedDuration.inSeconds.toDouble(), + onChanged: (value) { + setState(() { + audioPlayedDuration = + Duration(seconds: value.toInt()); + }); + audioPlayer.seek(audioPlayedDuration); + }, ), - Padding( - padding: const EdgeInsets.symmetric( - horizontal: 10, vertical: 0), - child: Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - Text(convertDuration(audioPlayedDuration),style: TextStyle(color:textColor ),), - Text(convertDuration(audioDuration),style: TextStyle(color:textColor ),) - ], - ), + ), + Padding( + padding: const EdgeInsets.symmetric( + horizontal: 10, vertical: 0), + child: Row( + mainAxisAlignment: + MainAxisAlignment.spaceBetween, + children: [ + Text( + convertDuration(audioPlayedDuration), + style: TextStyle(color: textColor), + ), + Text( + convertDuration(audioDuration), + style: TextStyle(color: textColor), + ) + ], ), - ], - ), + ), + ], ), - Padding( - padding: const EdgeInsets.only(right: 20), - child: GestureDetector( - onTap: () async { - if (isPlay) { - audioPlayer.pause(); - } else { - String audioUrl="https://gita.github.io/gita/data/verse_recitation/$chapterNumber/$verseNumber.mp3"; - Source source= UrlSource(audioUrl); - audioPlayer.play(source); - } - }, - child: Container( - height: height*0.055, - width: height*0.055, + ), + Padding( + padding: const EdgeInsets.only(right: 20), + child: GestureDetector( + onTap: () async { + if (isPlay) { + audioPlayer.pause(); + } else { + String audioUrl = + "https://gita.github.io/gita/data/verse_recitation/$chapterNumber/$verseNumber.mp3"; + Source source = UrlSource(audioUrl); + audioPlayer.play(source); + } + }, + child: Container( + height: height * 0.055, + width: height * 0.055, alignment: Alignment.center, - decoration: BoxDecoration( - color: Color(0xffF57903), shape: BoxShape.circle), - child: SvgPicture.asset(isPlay?'assets/icons/pause.svg':'assets/icons/play.svg', - color: Colors.white,height:height*0.0214,)))) - ]), - SizedBox(height: 15), + decoration: BoxDecoration( + color: Color(0xffF57903), + shape: BoxShape.circle), + child: SvgPicture.asset( + isPlay + ? 'assets/icons/pause.svg' + : 'assets/icons/play.svg', + color: Colors.white, + height: height * 0.0214, + )))) ]), - ); - } - ); + SizedBox(height: 15), + ]), + ); + }); }); } @@ -1091,9 +1139,10 @@ class _ContinueReadingState extends State { ); } } + String convertDuration(Duration duration) { String twoDigits(int n) => n.toString().padLeft(2, "0"); String twoDigitMinutes = twoDigits(duration.inMinutes.remainder(60)); String twoDigitSeconds = twoDigits(duration.inSeconds.remainder(60)); return "$twoDigitMinutes:$twoDigitSeconds"; -} \ No newline at end of file +} diff --git a/bhagavad_gita/lib/screens/home_screen.dart/saved_page.dart b/bhagavad_gita/lib/screens/home_screen.dart/saved_page.dart index f9e6e40..3ed9e84 100644 --- a/bhagavad_gita/lib/screens/home_screen.dart/saved_page.dart +++ b/bhagavad_gita/lib/screens/home_screen.dart/saved_page.dart @@ -52,13 +52,15 @@ class _SavedPageState extends State DemoLocalization.of(context)! .getTranslatedValue('bookMark') .toString(), - style: - Theme.of(context).textTheme.headline1!.copyWith( - fontSize: 16, - color: isPageIndex == 0 - ? orangeColor - : textLightGreyColor, - ), + style: Theme.of(context) + .textTheme + .displayLarge! + .copyWith( + fontSize: 16, + color: isPageIndex == 0 + ? orangeColor + : textLightGreyColor, + ), ), ), ), @@ -88,13 +90,15 @@ class _SavedPageState extends State DemoLocalization.of(context)! .getTranslatedValue('notes') .toString(), - style: - Theme.of(context).textTheme.headline1!.copyWith( - fontSize: 16, - color: isPageIndex == 1 - ? orangeColor - : textLightGreyColor, - ), + style: Theme.of(context) + .textTheme + .displayLarge! + .copyWith( + fontSize: 16, + color: isPageIndex == 1 + ? orangeColor + : textLightGreyColor, + ), ), ), ), diff --git a/bhagavad_gita/lib/screens/on_board_screen/OnBoardingScreen_one.dart b/bhagavad_gita/lib/screens/on_board_screen/OnBoardingScreen_one.dart index 3c5ceeb..e4cfc66 100644 --- a/bhagavad_gita/lib/screens/on_board_screen/OnBoardingScreen_one.dart +++ b/bhagavad_gita/lib/screens/on_board_screen/OnBoardingScreen_one.dart @@ -9,7 +9,7 @@ import 'package:bhagavad_gita/services/navigator_service.dart'; import 'package:bhagavad_gita/services/shared_preferences.dart'; import 'package:bhagavad_gita/widgets/indicatorWidget.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/cupertino.dart'; +// import 'package:flutter/cupertino.dart'; import 'package:flutter_svg/svg.dart'; class OnbordingScreen extends StatefulWidget { @@ -137,7 +137,7 @@ class _SimplifiedScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith(color: textLightGreyColor), ), ), @@ -154,7 +154,7 @@ class _SimplifiedScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith(color: orangeColor), ), SizedBox(width: 5), @@ -197,11 +197,11 @@ class _SimplifiedScreenState extends State { mainAxisSize: MainAxisSize.min, children: [ SizedBox( - height: height*0.030, + height: height * 0.030, ), SvgPicture.asset("assets/icons/abc_language.svg"), SizedBox( - height: height *0.02, + height: height * 0.02, ), Text( DemoLocalization.of(context)! @@ -210,7 +210,7 @@ class _SimplifiedScreenState extends State { textAlign: TextAlign.center, style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith(fontSize: 18, color: blackColor), ), SizedBox( @@ -222,7 +222,7 @@ class _SimplifiedScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith(fontSize: 14, color: textLightGreyColor), ), SizedBox( @@ -236,7 +236,7 @@ class _SimplifiedScreenState extends State { ListTile( title: Text(listLang[i]), onTap: () { - print("Valye : $i"); + print("Value : $i"); setState(() { val = i; }); @@ -246,7 +246,7 @@ class _SimplifiedScreenState extends State { value: i, groupValue: val, onChanged: (int? value) { - print("Valye : $value"); + print("Value : $value"); setState(() { val = value ?? 0; }); @@ -259,7 +259,8 @@ class _SimplifiedScreenState extends State { ), )), Padding( - padding: EdgeInsets.symmetric(horizontal:30,vertical: height*0.030), + padding: EdgeInsets.symmetric( + horizontal: 30, vertical: height * 0.030), child: Container( height: kPadding * 5, width: kPadding * 19, @@ -325,20 +326,24 @@ class SimplifiedPageOne extends StatelessWidget { return Column( children: [ SizedBox(height: height * 0.089), - SvgPicture.asset('assets/icons/img_simplified_one.svg',height: height*0.39,), - SizedBox(height: height *0.052), + SvgPicture.asset( + 'assets/icons/img_simplified_one.svg', + height: height * 0.39, + ), + SizedBox(height: height * 0.052), Text( DemoLocalization.of(context)! .getTranslatedValue('bhagvadGitaSimplified') .toString(), - style: Theme.of(context).textTheme.headline2!.copyWith(fontSize: 18), + style: + Theme.of(context).textTheme.displayMedium!.copyWith(fontSize: 18), ), SizedBox(height: height * 0.02), Text( DemoLocalization.of(context)! .getTranslatedValue('readTheGita') .toString(), - style: Theme.of(context).textTheme.subtitle1!.copyWith( + style: Theme.of(context).textTheme.titleMedium!.copyWith( color: textLightGreyColor, ), ), @@ -354,13 +359,17 @@ class BeautifulDesignPageTwo extends StatelessWidget { width = MediaQuery.of(context).size.width; return Column( children: [ - SvgPicture.asset('assets/icons/img_beautiful_two.svg',height: height*0.45,), + SvgPicture.asset( + 'assets/icons/img_beautiful_two.svg', + height: height * 0.45, + ), Text( DemoLocalization.of(context)! .getTranslatedValue('beautifulDesign') .toString(), textAlign: TextAlign.justify, - style: Theme.of(context).textTheme.headline2!.copyWith(fontSize: 18), + style: + Theme.of(context).textTheme.displayMedium!.copyWith(fontSize: 18), ), SizedBox(height: kPadding), Text( @@ -368,7 +377,7 @@ class BeautifulDesignPageTwo extends StatelessWidget { .getTranslatedValue('modernAndInteractive') .toString(), textAlign: TextAlign.center, - style: Theme.of(context).textTheme.subtitle1!.copyWith( + style: Theme.of(context).textTheme.titleMedium!.copyWith( color: textLightGreyColor, ), ), @@ -385,23 +394,28 @@ class ExploreEachVerePageThree extends StatelessWidget { return Column( children: [ SizedBox(height: height * 0.07), - SvgPicture.asset('assets/icons/img_exploreverse_three.svg',height: height*0.35,), + SvgPicture.asset( + 'assets/icons/img_exploreverse_three.svg', + height: height * 0.35, + ), SizedBox(height: height * 0.03), Text( DemoLocalization.of(context)! .getTranslatedValue('exploreEachVerse') .toString(), - style: Theme.of(context).textTheme.headline2!.copyWith(fontSize: 18), + style: + Theme.of(context).textTheme.displayMedium!.copyWith(fontSize: 18), ), - SizedBox(height: kPadding-4), + SizedBox(height: kPadding - 4), Text( DemoLocalization.of(context)! .getTranslatedValue('divedeepEachVerse') .toString(), textAlign: TextAlign.center, - style: Theme.of(context).textTheme.subtitle1!.copyWith( - color: textLightGreyColor,fontSize:height* 0.022 - ), + style: Theme.of(context) + .textTheme + .titleMedium! + .copyWith(color: textLightGreyColor, fontSize: height * 0.022), ), // SizedBox(height: kPadding), ], @@ -421,13 +435,17 @@ class MakeItOwnPageFour extends StatelessWidget { return Column( children: [ SizedBox(height: kPadding * 7), - SvgPicture.asset('assets/icons/img_makeitowe_forth.svg',height: height*0.32,), + SvgPicture.asset( + 'assets/icons/img_makeitowe_forth.svg', + height: height * 0.32, + ), SizedBox(height: kPadding * 3), Text( DemoLocalization.of(context)! .getTranslatedValue('makeItYourOwn') .toString(), - style: Theme.of(context).textTheme.headline2!.copyWith(fontSize: 18), + style: + Theme.of(context).textTheme.displayMedium!.copyWith(fontSize: 18), ), SizedBox(height: kPadding), Text( @@ -437,7 +455,7 @@ class MakeItOwnPageFour extends StatelessWidget { textAlign: TextAlign.center, style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith(color: textLightGreyColor), ), ], diff --git a/bhagavad_gita/lib/screens/setting_screens/language_setting.dart b/bhagavad_gita/lib/screens/setting_screens/language_setting.dart index d40461f..b253ff1 100644 --- a/bhagavad_gita/lib/screens/setting_screens/language_setting.dart +++ b/bhagavad_gita/lib/screens/setting_screens/language_setting.dart @@ -66,7 +66,7 @@ class _LanguageSettingScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .headline1! + .displayLarge! .copyWith(color: blackColor, fontSize: 18), ), ), @@ -98,7 +98,7 @@ class _LanguageSettingScreenState extends State { children: [ Text( listLang[index], - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), ], ), diff --git a/bhagavad_gita/lib/screens/setting_screens/open_setting_screen.dart b/bhagavad_gita/lib/screens/setting_screens/open_setting_screen.dart index 66a2650..d42a389 100644 --- a/bhagavad_gita/lib/screens/setting_screens/open_setting_screen.dart +++ b/bhagavad_gita/lib/screens/setting_screens/open_setting_screen.dart @@ -8,7 +8,7 @@ import 'package:bhagavad_gita/screens/setting_screens/verse_commentary_screen.da import 'package:bhagavad_gita/screens/setting_screens/verse_translation_screen.dart'; import 'package:bhagavad_gita/services/navigator_service.dart'; import 'package:bhagavad_gita/services/shared_preferences.dart'; -import 'package:flutter/cupertino.dart'; +// import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:list_tile_switch/list_tile_switch.dart'; @@ -91,7 +91,7 @@ class _SettingScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .headline1! + .displayLarge! .copyWith(color: blackColor, fontSize: 18), ), ), @@ -121,7 +121,7 @@ class _SettingScreenState extends State { DemoLocalization.of(context)! .getTranslatedValue('Language') .toString(), - style: Theme.of(context).textTheme.headline1!.copyWith( + style: Theme.of(context).textTheme.displayLarge!.copyWith( color: settingColor, fontSize: 12, letterSpacing: 1, @@ -181,7 +181,7 @@ class _SettingScreenState extends State { DemoLocalization.of(context)! .getTranslatedValue('author') .toString(), - style: Theme.of(context).textTheme.headline1!.copyWith( + style: Theme.of(context).textTheme.displayLarge!.copyWith( color: settingColor, fontSize: 12, letterSpacing: 1), ), ], @@ -198,7 +198,7 @@ class _SettingScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith(color: textLightGreyColor, fontSize: 12), ), ], @@ -222,7 +222,7 @@ class _SettingScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .subtitle2! + .titleSmall! .copyWith(color: greyScalBodyColor), ), ), @@ -249,7 +249,7 @@ class _SettingScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .subtitle2! + .titleSmall! .copyWith(color: greyScalBodyColor), ), ), @@ -287,7 +287,7 @@ class _SettingScreenState extends State { savedVerseTranslation.title!, style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith(fontSize: 13), overflow: TextOverflow.fade, maxLines: 1, @@ -329,7 +329,7 @@ class _SettingScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .subtitle2! + .titleSmall! .copyWith(color: greyScalBodyColor), ), ), @@ -367,7 +367,7 @@ class _SettingScreenState extends State { savedVerseCommentary.title!, style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith(fontSize: 13), overflow: TextOverflow.fade, maxLines: 1, diff --git a/bhagavad_gita/lib/screens/setting_screens/verse_commentary_screen.dart b/bhagavad_gita/lib/screens/setting_screens/verse_commentary_screen.dart index 39ef26f..9c67799 100644 --- a/bhagavad_gita/lib/screens/setting_screens/verse_commentary_screen.dart +++ b/bhagavad_gita/lib/screens/setting_screens/verse_commentary_screen.dart @@ -75,7 +75,7 @@ class _VerseCommentaryScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .headline1! + .displayLarge! .copyWith(color: blackColor, fontSize: 18), ), ), @@ -114,7 +114,7 @@ class _VerseCommentaryScreenState extends State { child: Text( listTranslationResponseModel[index].title ?? "", textAlign: TextAlign.left, - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), ), ], diff --git a/bhagavad_gita/lib/screens/setting_screens/verse_translation_screen.dart b/bhagavad_gita/lib/screens/setting_screens/verse_translation_screen.dart index 1b955c1..595df0c 100644 --- a/bhagavad_gita/lib/screens/setting_screens/verse_translation_screen.dart +++ b/bhagavad_gita/lib/screens/setting_screens/verse_translation_screen.dart @@ -75,7 +75,7 @@ class _VerseTranslationScreenState extends State { .toString(), style: Theme.of(context) .textTheme - .headline1! + .displayLarge! .copyWith(color: blackColor, fontSize: 18), ), ), @@ -112,7 +112,7 @@ class _VerseTranslationScreenState extends State { children: [ Text( listTranslationResponseModel[index].title ?? "", - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), ], ), diff --git a/bhagavad_gita/lib/widgets/add_notes_widget.dart b/bhagavad_gita/lib/widgets/add_notes_widget.dart index abdb1cb..4268852 100644 --- a/bhagavad_gita/lib/widgets/add_notes_widget.dart +++ b/bhagavad_gita/lib/widgets/add_notes_widget.dart @@ -67,7 +67,8 @@ class _AddNotesWidgetState extends State { : DemoLocalization.of(context)! .getTranslatedValue('editNote') .toString(), - style: Theme.of(context).textTheme.headline2!.copyWith(fontSize: 18), + style: + Theme.of(context).textTheme.displayMedium!.copyWith(fontSize: 18), ), actions: [ verseNotes.verseNote.length > 0 @@ -91,7 +92,7 @@ class _AddNotesWidgetState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( color: Colors.red, fontSize: 16), ) @@ -118,7 +119,7 @@ class _AddNotesWidgetState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( color: blackColor, fontSize: 16), ), @@ -166,7 +167,7 @@ class _AddNotesWidgetState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith(fontSize: 14, color: whiteColor), ), ), diff --git a/bhagavad_gita/lib/widgets/bookmark_verseList_widget.dart b/bhagavad_gita/lib/widgets/bookmark_verseList_widget.dart index 12668f9..25cf706 100644 --- a/bhagavad_gita/lib/widgets/bookmark_verseList_widget.dart +++ b/bhagavad_gita/lib/widgets/bookmark_verseList_widget.dart @@ -5,9 +5,9 @@ import 'package:bhagavad_gita/models/verse_detail_model.dart'; import 'package:bhagavad_gita/screens/home_screen.dart/read_more_page.dart'; import 'package:bhagavad_gita/services/navigator_service.dart'; import 'package:bhagavad_gita/services/shared_preferences.dart'; -import 'package:flutter/cupertino.dart'; +// import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; -import 'package:flutter/rendering.dart'; +// import 'package:flutter/rendering.dart'; import 'package:flutter_svg/svg.dart'; import '../locator.dart'; @@ -59,7 +59,7 @@ class _BookmarkVersListWidgetState extends State { SizedBox(width: kPadding), Text( '${DemoLocalization.of(context)!.getTranslatedValue('verse').toString()} ${listLastReadVerse[indexVerse].gitaVerseById!.chapterNumber}.${listLastReadVerse[indexVerse].gitaVerseById!.verseNumber}', - style: Theme.of(context).textTheme.headline2, + style: Theme.of(context).textTheme.displayMedium, ), Spacer(), PopupMenuButton( @@ -80,7 +80,7 @@ class _BookmarkVersListWidgetState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( color: Colors.red, fontSize: 16), @@ -109,7 +109,7 @@ class _BookmarkVersListWidgetState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( color: blackColor, fontSize: 16), @@ -155,7 +155,7 @@ class _BookmarkVersListWidgetState extends State { .nodes![0] .description ?? ''.replaceAll("\n", ""), - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), Divider() ], diff --git a/bhagavad_gita/lib/widgets/chapter_list_tile_widget.dart b/bhagavad_gita/lib/widgets/chapter_list_tile_widget.dart index e1cf73d..30ae974 100644 --- a/bhagavad_gita/lib/widgets/chapter_list_tile_widget.dart +++ b/bhagavad_gita/lib/widgets/chapter_list_tile_widget.dart @@ -46,7 +46,7 @@ class ChapterListTileWidget extends StatelessWidget { "${chapter.chapterNumber ?? index}", style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith(color: primaryColor), ), ), @@ -54,18 +54,26 @@ class ChapterListTileWidget extends StatelessWidget { SizedBox( width: kDefaultPadding, ), - Expanded(flex: 3, + Expanded( + flex: 3, child: Column( mainAxisAlignment: MainAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start, children: [ Text( - (Localizations.localeOf(context).languageCode == 'hi') ? (chapter.name ?? "") : chapter.nameTranslated ?? "", + (Localizations.localeOf(context).languageCode == 'hi') + ? (chapter.name ?? "") + : chapter.nameTranslated ?? "", style: Theme.of(context) .textTheme - .headline2! - .copyWith(fontSize: (Localizations.localeOf(context).languageCode == 'hi') ? - 18 : 16, color: titleLableColor), + .displayMedium! + .copyWith( + fontSize: (Localizations.localeOf(context) + .languageCode == + 'hi') + ? 18 + : 16, + color: titleLableColor), ), SizedBox( height: kDefaultPadding * 0.5, @@ -80,7 +88,7 @@ class ChapterListTileWidget extends StatelessWidget { '${chapter.versesCount ?? ""} ${DemoLocalization.of(context)!.getTranslatedValue('verses').toString()}', style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith( fontSize: 14, color: greyScalLableColor), ), diff --git a/bhagavad_gita/lib/widgets/last_read_widget.dart b/bhagavad_gita/lib/widgets/last_read_widget.dart index ae298cd..6f31255 100644 --- a/bhagavad_gita/lib/widgets/last_read_widget.dart +++ b/bhagavad_gita/lib/widgets/last_read_widget.dart @@ -30,7 +30,7 @@ class LastReadWidget extends StatelessWidget { .toString(), style: Theme.of(context) .textTheme - .headline1! + .displayLarge! .copyWith(color: greyScalBodyColor, fontSize: 20), ), Spacer(), @@ -38,7 +38,7 @@ class LastReadWidget extends StatelessWidget { "${DemoLocalization.of(context)!.getTranslatedValue('VERSE').toString()} ${lastReadVerse.gitaVerseById!.chapterNumber ?? 0}.${lastReadVerse.gitaVerseById!.verseNumber}", style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith(color: greyScalLableColor, fontSize: 14), ), ], @@ -54,10 +54,11 @@ class LastReadWidget extends StatelessWidget { .nodes![0].description! : "---", maxLines: 4, - style: Theme.of(context) - .textTheme - .subtitle1! - .copyWith(color: greyScalLableColor, fontSize: (Localizations.localeOf(context).languageCode == 'hi') ? 18 : 16), + style: Theme.of(context).textTheme.titleMedium!.copyWith( + color: greyScalLableColor, + fontSize: (Localizations.localeOf(context).languageCode == 'hi') + ? 18 + : 16), ), InkWell( onTap: () { @@ -71,7 +72,7 @@ class LastReadWidget extends StatelessWidget { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith(color: primaryColor, fontSize: width * 0.037), ), ), diff --git a/bhagavad_gita/lib/widgets/line_space_widget.dart b/bhagavad_gita/lib/widgets/line_space_widget.dart index 73c6d9a..c40cd24 100644 --- a/bhagavad_gita/lib/widgets/line_space_widget.dart +++ b/bhagavad_gita/lib/widgets/line_space_widget.dart @@ -1,5 +1,5 @@ import 'package:bhagavad_gita/Constant/app_colors.dart'; -import 'package:flutter/cupertino.dart'; +// import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; diff --git a/bhagavad_gita/lib/widgets/notes_list_screen.dart b/bhagavad_gita/lib/widgets/notes_list_screen.dart index 11c0fd3..a1f9971 100644 --- a/bhagavad_gita/lib/widgets/notes_list_screen.dart +++ b/bhagavad_gita/lib/widgets/notes_list_screen.dart @@ -55,7 +55,7 @@ class _NotesVerseKistWidgetState extends State { SizedBox(width: kPadding), Text( '${DemoLocalization.of(context)!.getTranslatedValue('verse').toString()} ${writeNotes[index].gitaVerseById!.chapterNumber}.${writeNotes[index].gitaVerseById!.verseNumber}', - style: Theme.of(context).textTheme.headline2, + style: Theme.of(context).textTheme.displayMedium, ), Spacer(), PopupMenuButton( @@ -76,7 +76,7 @@ class _NotesVerseKistWidgetState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( color: Colors.red, fontSize: 16), @@ -105,7 +105,7 @@ class _NotesVerseKistWidgetState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( color: blackColor, fontSize: 16), @@ -146,7 +146,7 @@ class _NotesVerseKistWidgetState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( color: blackColor, fontSize: 16), @@ -194,7 +194,7 @@ class _NotesVerseKistWidgetState extends State { maxLines: 2, style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( fontWeight: FontWeight.w400, color: textLightGreyColor), @@ -213,7 +213,7 @@ class _NotesVerseKistWidgetState extends State { child: Text( '${writeNotes[index].verseNote}', maxLines: 5, - style: Theme.of(context).textTheme.subtitle1, + style: Theme.of(context).textTheme.titleMedium, ), ) ], diff --git a/bhagavad_gita/lib/widgets/searchbar_widget.dart b/bhagavad_gita/lib/widgets/searchbar_widget.dart index e8ada68..a7b1192 100644 --- a/bhagavad_gita/lib/widgets/searchbar_widget.dart +++ b/bhagavad_gita/lib/widgets/searchbar_widget.dart @@ -1,7 +1,7 @@ import 'package:bhagavad_gita/Constant/app_colors.dart'; import 'package:bhagavad_gita/Constant/app_size_config.dart'; import 'package:bhagavad_gita/localization/demo_localization.dart'; -import 'package:flutter/cupertino.dart'; +// import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; class SearchBarWidget extends StatelessWidget { @@ -37,7 +37,7 @@ class SearchBarWidget extends StatelessWidget { .toString(), hintStyle: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith(color: textLightGreyColor), border: InputBorder.none, ), diff --git a/bhagavad_gita/lib/widgets/tableof_content_Chapter_widget.dart b/bhagavad_gita/lib/widgets/tableof_content_Chapter_widget.dart index 8bb410b..7cc00de 100644 --- a/bhagavad_gita/lib/widgets/tableof_content_Chapter_widget.dart +++ b/bhagavad_gita/lib/widgets/tableof_content_Chapter_widget.dart @@ -2,7 +2,7 @@ import 'package:bhagavad_gita/Constant/app_colors.dart'; import 'package:bhagavad_gita/Constant/app_size_config.dart'; import 'package:bhagavad_gita/localization/demo_localization.dart'; import 'package:bhagavad_gita/models/chapter_model.dart'; -import 'package:flutter/cupertino.dart'; +// import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; @@ -32,7 +32,7 @@ class TableOfContentChapterWidget extends StatelessWidget { "${DemoLocalization.of(context)!.getTranslatedValue('chapter').toString()} ${chapter.chapterNumber ?? 0}", style: Theme.of(context) .textTheme - .headline1! + .displayLarge! .copyWith(fontSize: 14), ), Spacer(), @@ -49,7 +49,7 @@ class TableOfContentChapterWidget extends StatelessWidget { ), Text( "${(Localizations.localeOf(context).languageCode == 'hi') ? (chapter.name ?? "") : chapter.nameTranslated ?? ""}", - style: Theme.of(context).textTheme.subtitle1), + style: Theme.of(context).textTheme.titleMedium), SizedBox(height: kDefaultPadding), !chapter.isExpanded! ? Row( @@ -66,7 +66,7 @@ class TableOfContentChapterWidget extends StatelessWidget { "${chapter.versesCount ?? 0} ${DemoLocalization.of(context)!.getTranslatedValue('verses').toString()}", style: Theme.of(context) .textTheme - .subtitle1! + .titleMedium! .copyWith(fontSize: 14, color: textLightGreyColor), ), ], diff --git a/bhagavad_gita/lib/widgets/verse_detail_widget.dart b/bhagavad_gita/lib/widgets/verse_detail_widget.dart index b51ddc2..a28decf 100644 --- a/bhagavad_gita/lib/widgets/verse_detail_widget.dart +++ b/bhagavad_gita/lib/widgets/verse_detail_widget.dart @@ -5,7 +5,7 @@ import 'package:bhagavad_gita/models/chapter_detail_model.dart'; import 'package:bhagavad_gita/models/color_selection_model.dart'; import 'package:bhagavad_gita/screens/home_screen.dart/read_more_page.dart'; import 'package:bhagavad_gita/services/navigator_service.dart'; -import 'package:flutter/cupertino.dart'; +// import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; import 'package:flutter_svg/svg.dart'; import 'package:graphql_flutter/graphql_flutter.dart'; @@ -18,7 +18,8 @@ class VerseDetailWidget extends StatefulWidget { required this.formatingColor, required this.lineSpacing, required this.fontSize, - required this.fontFamily, required this.refreshEditing, + required this.fontFamily, + required this.refreshEditing, }) : super(key: key); final GitaVersesByChapterIdNode verse; @@ -65,7 +66,7 @@ class _VerseDetailWidgetState extends State { SizedBox(width: kPadding), Text( "${DemoLocalization.of(context)!.getTranslatedValue('verse').toString()} ${widget.verse.verseNumber}", - style: Theme.of(context).textTheme.headline2!.copyWith( + style: Theme.of(context).textTheme.displayMedium!.copyWith( fontFamily: widget.fontFamily, fontSize: widget.fontSize, height: widget.lineSpacing, @@ -85,7 +86,7 @@ class _VerseDetailWidgetState extends State { ? widget.verse.gitaTranslationsByVerseId!.nodes![0].description! .replaceAll("\n", "") : "---".replaceAll("\n", ""), - style: Theme.of(context).textTheme.subtitle1!.copyWith( + style: Theme.of(context).textTheme.titleMedium!.copyWith( fontFamily: widget.fontFamily, fontSize: widget.fontSize, height: widget.lineSpacing, diff --git a/bhagavad_gita/lib/widgets/verse_of_the_day_widget.dart b/bhagavad_gita/lib/widgets/verse_of_the_day_widget.dart index 89bf47b..946457e 100644 --- a/bhagavad_gita/lib/widgets/verse_of_the_day_widget.dart +++ b/bhagavad_gita/lib/widgets/verse_of_the_day_widget.dart @@ -11,7 +11,7 @@ import 'package:bhagavad_gita/services/last_read_services.dart'; import 'package:bhagavad_gita/services/navigator_service.dart'; import 'package:flutter/material.dart'; import 'package:graphql_flutter/graphql_flutter.dart'; -import 'package:intl/intl.dart'; +// import 'package:intl/intl.dart'; import '../locator.dart'; class VerseOfTheDayWidget extends StatefulWidget { @@ -90,8 +90,7 @@ class _VerseOfTheDayWidgetState extends State { height: (width - kDefaultPadding) * 0.52, decoration: BoxDecoration( image: DecorationImage( - image: - AssetImage('assets/images/gyan-vigyana-yoga.jpg'), + image: AssetImage('assets/images/gyan-vigyana-yoga.jpg'), fit: BoxFit.fill), borderRadius: BorderRadius.circular(kDefaultCornerRadius)), child: Stack( @@ -106,9 +105,7 @@ class _VerseOfTheDayWidgetState extends State { ), Padding( padding: EdgeInsets.only( - left: kDefaultPadding, - top: kDefaultPadding, - bottom: 0), + left: kDefaultPadding, top: kDefaultPadding, bottom: 0), child: Column( crossAxisAlignment: CrossAxisAlignment.start, children: [ @@ -118,9 +115,11 @@ class _VerseOfTheDayWidgetState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( - color: Colors.orangeAccent, fontSize: width * 0.04, fontWeight: FontWeight.w700), + color: Colors.orangeAccent, + fontSize: width * 0.04, + fontWeight: FontWeight.w700), ), Spacer(), VerseOfTheDayTextWidget( @@ -146,9 +145,10 @@ class _VerseOfTheDayWidgetState extends State { .toString(), style: Theme.of(context) .textTheme - .headline2! + .displayMedium! .copyWith( - color: Colors.white, fontSize: width * 0.035), + color: Colors.white, + fontSize: width * 0.035), ), ) ], @@ -257,7 +257,7 @@ class _VerseOfTheDayTextWidgetState extends State { padding: EdgeInsets.only( right: 18.0, ), - child: RichText( + child: RichText( maxLines: 4, text: TextSpan( // text: @@ -273,16 +273,16 @@ class _VerseOfTheDayTextWidgetState extends State { 0 ? '${verseOTheDayDetailResponseModel.gitaVerseById!.gitaTranslationsByVerseId!.nodes![0].description ?? ''}' : '', - style: Theme.of(context).textTheme.headline2!.copyWith( - overflow: TextOverflow.ellipsis, - color: whiteColor, - fontSize: height*0.020, - ), + style: + Theme.of(context).textTheme.displayMedium!.copyWith( + overflow: TextOverflow.ellipsis, + color: whiteColor, + fontSize: height * 0.020, + ), ), ], ), - ) - ); + )); }, ), ); diff --git a/bhagavad_gita/pubspec.lock b/bhagavad_gita/pubspec.lock index 0fe051a..042012d 100644 --- a/bhagavad_gita/pubspec.lock +++ b/bhagavad_gita/pubspec.lock @@ -5,231 +5,264 @@ packages: dependency: transitive description: name: archive - url: "https://pub.dartlang.org" + sha256: ca12e6c9ac022f33fd89128e7007fb5e97ab6e814d4fa05dd8d4f2db1e3c69cb + url: "https://pub.dev" source: hosted - version: "3.3.5" + version: "3.4.5" args: dependency: transitive description: name: args - url: "https://pub.dartlang.org" + sha256: eef6c46b622e0494a36c5a12d10d77fb4e855501a91c1b9ef9339326e58f0596 + url: "https://pub.dev" source: hosted - version: "2.3.2" + version: "2.4.2" async: dependency: transitive description: name: async - url: "https://pub.dartlang.org" + sha256: "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c" + url: "https://pub.dev" source: hosted - version: "2.9.0" + version: "2.11.0" audioplayers: dependency: "direct main" description: name: audioplayers - url: "https://pub.dartlang.org" + sha256: cb7d3a5bbe5eb7a1bdb405f5ff0d0f8fe9e8527ff31c8c872ccd06b2d3c91a84 + url: "https://pub.dev" source: hosted version: "2.0.0" audioplayers_android: dependency: transitive description: name: audioplayers_android - url: "https://pub.dartlang.org" + sha256: "5bf6b30f45c59297909efd107a42d270a2087291e05a46433ad523c88210eec5" + url: "https://pub.dev" source: hosted version: "1.1.4" audioplayers_darwin: dependency: transitive description: name: audioplayers_darwin - url: "https://pub.dartlang.org" + sha256: "133c01aec9341e0eec8ff17dca7cb375b40193e4cf80aa70b39dcdf1d5fa6137" + url: "https://pub.dev" source: hosted version: "2.0.0" audioplayers_linux: dependency: transitive description: name: audioplayers_linux - url: "https://pub.dartlang.org" + sha256: c661499b1bca540afad261ede1cab20222061610ad82488388746690262a8ed3 + url: "https://pub.dev" source: hosted version: "1.0.3" audioplayers_platform_interface: dependency: transitive description: name: audioplayers_platform_interface - url: "https://pub.dartlang.org" + sha256: c8c8ed4258b35e8b3cdceced460a9165eb2f3bfb13902aa6ad43e1800d872075 + url: "https://pub.dev" source: hosted version: "3.0.0" audioplayers_web: dependency: transitive description: name: audioplayers_web - url: "https://pub.dartlang.org" + sha256: "3f02d6d3d142d0a694a648bfe6d9c95e427b0a82771fea0f7c22e952fbb35689" + url: "https://pub.dev" source: hosted version: "2.1.1" audioplayers_windows: dependency: transitive description: name: audioplayers_windows - url: "https://pub.dartlang.org" + sha256: b32dc8b52e75a5bc2582d7399cfb77ee04a476d25313deb8ede348021398024a + url: "https://pub.dev" source: hosted version: "1.1.2" boolean_selector: dependency: transitive description: name: boolean_selector - url: "https://pub.dartlang.org" + sha256: "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" characters: dependency: transitive description: name: characters - url: "https://pub.dartlang.org" + sha256: "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605" + url: "https://pub.dev" source: hosted - version: "1.2.1" + version: "1.3.0" clock: dependency: transitive description: name: clock - url: "https://pub.dartlang.org" + sha256: cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf + url: "https://pub.dev" source: hosted version: "1.1.1" collection: dependency: transitive description: name: collection - url: "https://pub.dartlang.org" + sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687 + url: "https://pub.dev" source: hosted - version: "1.16.0" + version: "1.17.2" connectivity_plus: dependency: transitive description: name: connectivity_plus - url: "https://pub.dartlang.org" + sha256: "3f8fe4e504c2d33696dac671a54909743bc6a902a9bb0902306f7a2aed7e528e" + url: "https://pub.dev" source: hosted version: "2.3.9" connectivity_plus_linux: dependency: transitive description: name: connectivity_plus_linux - url: "https://pub.dartlang.org" + sha256: "3caf859d001f10407b8e48134c761483e4495ae38094ffcca97193f6c271f5e2" + url: "https://pub.dev" source: hosted version: "1.3.1" connectivity_plus_macos: dependency: transitive description: name: connectivity_plus_macos - url: "https://pub.dartlang.org" + sha256: "488d2de1e47e1224ad486e501b20b088686ba1f4ee9c4420ecbc3b9824f0b920" + url: "https://pub.dev" source: hosted version: "1.2.6" connectivity_plus_platform_interface: dependency: transitive description: name: connectivity_plus_platform_interface - url: "https://pub.dartlang.org" + sha256: cf1d1c28f4416f8c654d7dc3cd638ec586076255d407cef3ddbdaf178272a71a + url: "https://pub.dev" source: hosted - version: "1.2.3" + version: "1.2.4" connectivity_plus_web: dependency: transitive description: name: connectivity_plus_web - url: "https://pub.dartlang.org" + sha256: "81332be1b4baf8898fed17bb4fdef27abb7c6fd990bf98c54fd978478adf2f1a" + url: "https://pub.dev" source: hosted version: "1.2.5" connectivity_plus_windows: dependency: transitive description: name: connectivity_plus_windows - url: "https://pub.dartlang.org" + sha256: "535b0404b4d5605c4dd8453d67e5d6d2ea0dd36e3b477f50f31af51b0aeab9dd" + url: "https://pub.dev" source: hosted version: "1.2.2" convert: dependency: transitive description: name: convert - url: "https://pub.dartlang.org" + sha256: "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592" + url: "https://pub.dev" source: hosted version: "3.1.1" crypto: dependency: transitive description: name: crypto - url: "https://pub.dartlang.org" + sha256: ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.3" cupertino_icons: dependency: "direct main" description: name: cupertino_icons - url: "https://pub.dartlang.org" + sha256: d57953e10f9f8327ce64a508a355f0b1ec902193f66288e8cb5070e7c47eeb2d + url: "https://pub.dev" source: hosted - version: "1.0.5" + version: "1.0.6" dbus: dependency: transitive description: name: dbus - url: "https://pub.dartlang.org" + sha256: "4f814fc7e73057f78f307a6c4714fe2ffb4bdb994ab1970540a068ec4d5a45be" + url: "https://pub.dev" source: hosted version: "0.7.3" fake_async: dependency: transitive description: name: fake_async - url: "https://pub.dartlang.org" + sha256: "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78" + url: "https://pub.dev" source: hosted version: "1.3.1" ffi: dependency: transitive description: name: ffi - url: "https://pub.dartlang.org" + sha256: "13a6ccf6a459a125b3fcdb6ec73bd5ff90822e071207c663bfd1f70062d51d18" + url: "https://pub.dev" source: hosted version: "1.2.1" file: dependency: transitive description: name: file - url: "https://pub.dartlang.org" + sha256: "1b92bec4fc2a72f59a8e15af5f52cd441e4a7860b49499d69dfa817af20e925d" + url: "https://pub.dev" source: hosted version: "6.1.4" firebase_core: dependency: "direct main" description: name: firebase_core - url: "https://pub.dartlang.org" + sha256: "4f1d7c13a909e82ff026679c9b8493cdeb35a9c76bc46c42bf9e2240c9e57e80" + url: "https://pub.dev" source: hosted version: "1.24.0" firebase_core_platform_interface: dependency: "direct main" description: name: firebase_core_platform_interface - url: "https://pub.dartlang.org" + sha256: b51257a8b4388565cd66062d727d3e60067b5f5cc3390eb0ecd20b8f97741bdb + url: "https://pub.dev" source: hosted version: "4.5.1" firebase_core_web: dependency: transitive description: name: firebase_core_web - url: "https://pub.dartlang.org" + sha256: "839f1b48032a61962792cea1225fae030d4f27163867f181d6d2072dd40acbee" + url: "https://pub.dev" source: hosted version: "1.7.3" firebase_messaging: dependency: "direct main" description: name: firebase_messaging - url: "https://pub.dartlang.org" + sha256: "446a59243da7eb27924f3a5a594185564a4483c33fe922b13f593a92391760a0" + url: "https://pub.dev" source: hosted version: "11.4.4" firebase_messaging_platform_interface: dependency: transitive description: name: firebase_messaging_platform_interface - url: "https://pub.dartlang.org" + sha256: "3e85a7578b47e08a39e318832dbb795d70c95733bc925b9596b5cc9656eaa127" + url: "https://pub.dev" source: hosted version: "3.5.4" firebase_messaging_web: dependency: transitive description: name: firebase_messaging_web - url: "https://pub.dartlang.org" + sha256: "918d17ad2df94284b71f843e420f8f3257b12c67ae2b33c2931a88d0b7a182fd" + url: "https://pub.dev" source: hosted version: "2.4.4" flutter: @@ -241,35 +274,40 @@ packages: dependency: transitive description: name: flutter_hooks - url: "https://pub.dartlang.org" + sha256: "6a126f703b89499818d73305e4ce1e3de33b4ae1c5512e3b8eab4b986f46774c" + url: "https://pub.dev" source: hosted - version: "0.18.5+1" + version: "0.18.6" flutter_launcher_icons: dependency: "direct dev" description: name: flutter_launcher_icons - url: "https://pub.dartlang.org" + sha256: "559c600f056e7c704bd843723c21e01b5fba47e8824bd02422165bcc02a5de1d" + url: "https://pub.dev" source: hosted version: "0.9.3" flutter_local_notifications: dependency: "direct main" description: name: flutter_local_notifications - url: "https://pub.dartlang.org" + sha256: "57d0012730780fe137260dd180e072c18a73fbeeb924cdc029c18aaa0f338d64" + url: "https://pub.dev" source: hosted version: "9.9.1" flutter_local_notifications_linux: dependency: transitive description: name: flutter_local_notifications_linux - url: "https://pub.dartlang.org" + sha256: b472bfc173791b59ede323661eae20f7fff0b6908fea33dd720a6ef5d576bae8 + url: "https://pub.dev" source: hosted version: "0.5.1" flutter_local_notifications_platform_interface: dependency: transitive description: name: flutter_local_notifications_platform_interface - url: "https://pub.dartlang.org" + sha256: "21bceee103a66a53b30ea9daf677f990e5b9e89b62f222e60dd241cd08d63d3a" + url: "https://pub.dev" source: hosted version: "5.0.0" flutter_localizations: @@ -281,14 +319,16 @@ packages: dependency: "direct main" description: name: flutter_offline - url: "https://pub.dartlang.org" + sha256: a72ae6c771e38482afe1ebf3b564158769fd90a6508ed3c995da56101bcfddc2 + url: "https://pub.dev" source: hosted version: "2.1.0" flutter_svg: dependency: "direct main" description: name: flutter_svg - url: "https://pub.dartlang.org" + sha256: "9ac1967e2f72a08af11b05b39167920f90d043cf67163d13a544a358c8f31afa" + url: "https://pub.dev" source: hosted version: "0.22.0" flutter_test: @@ -305,394 +345,442 @@ packages: dependency: "direct main" description: name: get_it - url: "https://pub.dartlang.org" + sha256: f79870884de16d689cf9a7d15eedf31ed61d750e813c538a6efb92660fea83c3 + url: "https://pub.dev" source: hosted - version: "7.2.0" + version: "7.6.4" gql: dependency: transitive description: name: gql - url: "https://pub.dartlang.org" + sha256: "998304fbb88a3956cfea10cd27a56f8e5d4b3bc110f03c952c18a9310774e8bb" + url: "https://pub.dev" source: hosted version: "0.14.0" gql_dedupe_link: dependency: transitive description: name: gql_dedupe_link - url: "https://pub.dartlang.org" + sha256: "89681048cf956348e865da872a40081499b8c087fc84dd4d4b9c134bd70d27b3" + url: "https://pub.dev" source: hosted version: "2.0.3+1" gql_error_link: dependency: transitive description: name: gql_error_link - url: "https://pub.dartlang.org" + sha256: e7bfdd2b6232f3e15861cd96c2ad6b7c9c94693843b3dea18295136a5fb5b534 + url: "https://pub.dev" source: hosted version: "0.2.3+1" gql_exec: dependency: transitive description: name: gql_exec - url: "https://pub.dartlang.org" + sha256: "0d1fdb2e4154efbfc1dcf3f35ec36d19c8428ff0d560eb4c45b354f8f871dc50" + url: "https://pub.dev" source: hosted version: "0.4.3" gql_http_link: dependency: transitive description: name: gql_http_link - url: "https://pub.dartlang.org" + sha256: "89ef87b32947acf4189f564c095f1148b0ab9bb9996fe518716dbad66708b834" + url: "https://pub.dev" source: hosted version: "0.4.5" gql_link: dependency: transitive description: name: gql_link - url: "https://pub.dartlang.org" + sha256: f7973279126bc922d465c4f4da6ed93d187085e597b3480f5e14e74d28fe14bd + url: "https://pub.dev" source: hosted version: "0.5.1" gql_transform_link: dependency: transitive description: name: gql_transform_link - url: "https://pub.dartlang.org" + sha256: b1735a9a92d25a92960002a8b40dfaede95ec1e5ed848906125d69efd878661f + url: "https://pub.dev" source: hosted version: "0.2.2+1" graphql: dependency: transitive description: name: graphql - url: "https://pub.dartlang.org" + sha256: b061201579040e9548cec2bae17bbdea0ab30666cb4e7ba48b9675f14d982199 + url: "https://pub.dev" source: hosted version: "5.1.3" graphql_flutter: dependency: "direct main" description: name: graphql_flutter - url: "https://pub.dartlang.org" + sha256: "9ff835973d9b0e23194153944ecc7d12953d30ffe3ed23431bf476e2b0386ca4" + url: "https://pub.dev" source: hosted version: "5.1.0" hive: dependency: transitive description: name: hive - url: "https://pub.dartlang.org" + sha256: "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941" + url: "https://pub.dev" source: hosted version: "2.2.3" http: dependency: transitive description: name: http - url: "https://pub.dartlang.org" + sha256: "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2" + url: "https://pub.dev" source: hosted - version: "0.13.5" + version: "0.13.6" http_parser: dependency: transitive description: name: http_parser - url: "https://pub.dartlang.org" + sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b" + url: "https://pub.dev" source: hosted version: "4.0.2" image: dependency: transitive description: name: image - url: "https://pub.dartlang.org" + sha256: "02bafd3b4f399bfeb10034deba9753d93b55ce41cd0c4d3d8b355626f80e5b32" + url: "https://pub.dev" source: hosted version: "3.1.3" in_app_review: dependency: "direct main" description: name: in_app_review - url: "https://pub.dartlang.org" + sha256: "16328b8202d36522322b95804ae5d975577aa9f584d634985849ba1099645850" + url: "https://pub.dev" source: hosted version: "2.0.6" in_app_review_platform_interface: dependency: transitive description: name: in_app_review_platform_interface - url: "https://pub.dartlang.org" + sha256: b12ec9aaf6b34d3a72aa95895eb252b381896246bdad4ef378d444affe8410ef + url: "https://pub.dev" source: hosted version: "2.0.4" intl: dependency: "direct main" description: name: intl - url: "https://pub.dartlang.org" + sha256: "3bc132a9dbce73a7e4a21a17d06e1878839ffbf975568bc875c60537824b0c4d" + url: "https://pub.dev" source: hosted - version: "0.17.0" + version: "0.18.1" js: dependency: transitive description: name: js - url: "https://pub.dartlang.org" + sha256: f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3 + url: "https://pub.dev" source: hosted - version: "0.6.4" + version: "0.6.7" list_tile_switch: dependency: "direct main" description: name: list_tile_switch - url: "https://pub.dartlang.org" + sha256: b7e6ac3a68dfaa785b3649a14c3bcd1ab06b1838692ad7b8f6d8db4650176a0f + url: "https://pub.dev" source: hosted version: "1.0.0" matcher: dependency: transitive description: name: matcher - url: "https://pub.dartlang.org" + sha256: "1803e76e6653768d64ed8ff2e1e67bea3ad4b923eb5c56a295c3e634bad5960e" + url: "https://pub.dev" source: hosted - version: "0.12.12" + version: "0.12.16" material_color_utilities: dependency: transitive description: name: material_color_utilities - url: "https://pub.dartlang.org" + sha256: "9528f2f296073ff54cb9fee677df673ace1218163c3bc7628093e7eed5203d41" + url: "https://pub.dev" source: hosted - version: "0.1.5" + version: "0.5.0" meta: dependency: transitive description: name: meta - url: "https://pub.dartlang.org" + sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3" + url: "https://pub.dev" source: hosted - version: "1.8.0" + version: "1.9.1" mime: dependency: transitive description: name: mime - url: "https://pub.dartlang.org" + sha256: e4ff8e8564c03f255408decd16e7899da1733852a9110a58fe6d1b817684a63e + url: "https://pub.dev" source: hosted version: "1.0.4" network_info_plus: dependency: transitive description: name: network_info_plus - url: "https://pub.dartlang.org" + sha256: "746b4bcc936c1d1887e12ea867dd1e351112d6a4525185d54479eea0aec79785" + url: "https://pub.dev" source: hosted version: "2.3.2" network_info_plus_linux: dependency: transitive description: name: network_info_plus_linux - url: "https://pub.dartlang.org" + sha256: eff8b47a34745a5e341c843972d5a4f4485c8d7542b0afd3ea548f8f160a3550 + url: "https://pub.dev" source: hosted version: "1.1.2" network_info_plus_macos: dependency: transitive description: name: network_info_plus_macos - url: "https://pub.dartlang.org" + sha256: eb9dfa9183c4aec41aa68debcbf771c9a80c7526e70edf3d7b4d968d97f7db05 + url: "https://pub.dev" source: hosted version: "1.3.0" network_info_plus_platform_interface: dependency: transitive description: name: network_info_plus_platform_interface - url: "https://pub.dartlang.org" + sha256: "881f5029c5edaf19c616c201d3d8b366c5b1384afd5c1da5a49e4345de82fb8b" + url: "https://pub.dev" source: hosted version: "1.1.3" network_info_plus_web: dependency: transitive description: name: network_info_plus_web - url: "https://pub.dartlang.org" + sha256: a89a5a1c6aeb5d6a73102d0cba1f3d97950ed0741bd96ef4a6c5b3d6ebdeef07 + url: "https://pub.dev" source: hosted version: "1.0.1" network_info_plus_windows: dependency: transitive description: name: network_info_plus_windows - url: "https://pub.dartlang.org" + sha256: "463ecc0787c0ac9b3a2b75d15e61b6362c4f4d626d00ab963f55e483eea49998" + url: "https://pub.dev" source: hosted version: "1.0.2" nm: dependency: transitive description: name: nm - url: "https://pub.dartlang.org" + sha256: "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254" + url: "https://pub.dev" source: hosted version: "0.5.0" normalize: dependency: transitive description: name: normalize - url: "https://pub.dartlang.org" + sha256: baf8caf2d8b745af5737cca6c24f7fe3cf3158897fdbcde9a909b9c8d3e2e5af + url: "https://pub.dev" source: hosted version: "0.7.2" path: dependency: transitive description: name: path - url: "https://pub.dartlang.org" + sha256: "8829d8a55c13fc0e37127c29fedf290c102f4e40ae94ada574091fe0ff96c917" + url: "https://pub.dev" source: hosted - version: "1.8.2" + version: "1.8.3" path_drawing: dependency: transitive description: name: path_drawing - url: "https://pub.dartlang.org" + sha256: "3bdd251dae9ffaef944450b73f168610db7e968e7b20daf0c3907f8b4aafc8a2" + url: "https://pub.dev" source: hosted version: "0.5.1+1" path_parsing: dependency: transitive description: name: path_parsing - url: "https://pub.dartlang.org" + sha256: ee5c47c1058ad66b4a41746ec3996af9593d0858872807bcd64ac118f0700337 + url: "https://pub.dev" source: hosted version: "0.2.1" path_provider: dependency: transitive description: name: path_provider - url: "https://pub.dartlang.org" + sha256: "3087813781ab814e4157b172f1a11c46be20179fcc9bea043e0fba36bc0acaa2" + url: "https://pub.dev" source: hosted - version: "2.0.11" + version: "2.0.15" path_provider_android: dependency: transitive description: name: path_provider_android - url: "https://pub.dartlang.org" + sha256: "6b8b19bd80da4f11ce91b2d1fb931f3006911477cec227cce23d3253d80df3f1" + url: "https://pub.dev" source: hosted - version: "2.0.22" - path_provider_ios: + version: "2.2.0" + path_provider_foundation: dependency: transitive description: - name: path_provider_ios - url: "https://pub.dartlang.org" + name: path_provider_foundation + sha256: "19314d595120f82aca0ba62787d58dde2cc6b5df7d2f0daf72489e38d1b57f2d" + url: "https://pub.dev" source: hosted - version: "2.0.11" + version: "2.3.1" path_provider_linux: dependency: transitive description: name: path_provider_linux - url: "https://pub.dartlang.org" + sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279 + url: "https://pub.dev" source: hosted - version: "2.1.7" - path_provider_macos: - dependency: transitive - description: - name: path_provider_macos - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.7" + version: "2.2.1" path_provider_platform_interface: dependency: transitive description: name: path_provider_platform_interface - url: "https://pub.dartlang.org" + sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c" + url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.1.1" path_provider_windows: dependency: transitive description: name: path_provider_windows - url: "https://pub.dartlang.org" + sha256: a34ecd7fb548f8e57321fd8e50d865d266941b54e6c3b7758cf8f37c24116905 + url: "https://pub.dev" source: hosted version: "2.0.7" percent_indicator: dependency: "direct main" description: name: percent_indicator - url: "https://pub.dartlang.org" + sha256: c37099ad833a883c9d71782321cb65c3a848c21b6939b6185f0ff6640d05814c + url: "https://pub.dev" source: hosted - version: "4.2.2" + version: "4.2.3" petitparser: dependency: transitive description: name: petitparser - url: "https://pub.dartlang.org" + sha256: cb3798bef7fc021ac45b308f4b51208a152792445cce0448c9a4ba5879dd8750 + url: "https://pub.dev" source: hosted - version: "5.1.0" + version: "5.4.0" platform: dependency: transitive description: name: platform - url: "https://pub.dartlang.org" + sha256: ae68c7bfcd7383af3629daafb32fb4e8681c7154428da4febcff06200585f102 + url: "https://pub.dev" source: hosted - version: "3.1.0" + version: "3.1.2" plugin_platform_interface: dependency: transitive description: name: plugin_platform_interface - url: "https://pub.dartlang.org" + sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d + url: "https://pub.dev" source: hosted - version: "2.1.3" + version: "2.1.6" pointycastle: dependency: transitive description: name: pointycastle - url: "https://pub.dartlang.org" + sha256: "7c1e5f0d23c9016c5bbd8b1473d0d3fb3fc851b876046039509e18e0c7485f2c" + url: "https://pub.dev" source: hosted - version: "3.6.2" + version: "3.7.3" process: dependency: transitive description: name: process - url: "https://pub.dartlang.org" + sha256: "53fd8db9cec1d37b0574e12f07520d582019cb6c44abf5479a01505099a34a09" + url: "https://pub.dev" source: hosted version: "4.2.4" rxdart: dependency: transitive description: name: rxdart - url: "https://pub.dartlang.org" + sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb" + url: "https://pub.dev" source: hosted version: "0.27.7" share: dependency: "direct main" description: name: share - url: "https://pub.dartlang.org" + sha256: "97e6403f564ed1051a01534c2fc919cb6e40ea55e60a18ec23cee6e0ce19f4be" + url: "https://pub.dev" source: hosted version: "2.0.4" shared_preferences: dependency: "direct main" description: name: shared_preferences - url: "https://pub.dartlang.org" + sha256: b7f41bad7e521d205998772545de63ff4e6c97714775902c199353f8bf1511ac + url: "https://pub.dev" source: hosted - version: "2.0.16" + version: "2.2.1" shared_preferences_android: dependency: transitive description: name: shared_preferences_android - url: "https://pub.dartlang.org" + sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06" + url: "https://pub.dev" source: hosted - version: "2.0.14" + version: "2.2.1" shared_preferences_foundation: dependency: transitive description: name: shared_preferences_foundation - url: "https://pub.dartlang.org" + sha256: "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.3.4" shared_preferences_linux: dependency: transitive description: name: shared_preferences_linux - url: "https://pub.dartlang.org" + sha256: c2eb5bf57a2fe9ad6988121609e47d3e07bb3bdca5b6f8444e4cf302428a128a + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.3.1" shared_preferences_platform_interface: dependency: transitive description: name: shared_preferences_platform_interface - url: "https://pub.dartlang.org" + sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.3.1" shared_preferences_web: dependency: transitive description: name: shared_preferences_web - url: "https://pub.dartlang.org" + sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf + url: "https://pub.dev" source: hosted - version: "2.0.4" + version: "2.2.1" shared_preferences_windows: dependency: transitive description: name: shared_preferences_windows - url: "https://pub.dartlang.org" + sha256: f763a101313bd3be87edffe0560037500967de9c394a714cd598d945517f694f + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.3.1" sky_engine: dependency: transitive description: flutter @@ -702,163 +790,194 @@ packages: dependency: transitive description: name: source_span - url: "https://pub.dartlang.org" + sha256: "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c" + url: "https://pub.dev" source: hosted - version: "1.9.0" + version: "1.10.0" stack_trace: dependency: transitive description: name: stack_trace - url: "https://pub.dartlang.org" + sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5 + url: "https://pub.dev" source: hosted - version: "1.10.0" + version: "1.11.0" stream_channel: dependency: transitive description: name: stream_channel - url: "https://pub.dartlang.org" + sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8" + url: "https://pub.dev" source: hosted - version: "2.1.0" + version: "2.1.1" string_scanner: dependency: transitive description: name: string_scanner - url: "https://pub.dartlang.org" + sha256: "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde" + url: "https://pub.dev" source: hosted - version: "1.1.1" + version: "1.2.0" term_glyph: dependency: transitive description: name: term_glyph - url: "https://pub.dartlang.org" + sha256: a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84 + url: "https://pub.dev" source: hosted version: "1.2.1" test_api: dependency: transitive description: name: test_api - url: "https://pub.dartlang.org" + sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8" + url: "https://pub.dev" source: hosted - version: "0.4.12" + version: "0.6.0" timezone: dependency: transitive description: name: timezone - url: "https://pub.dartlang.org" + sha256: "57b35f6e8ef731f18529695bffc62f92c6189fac2e52c12d478dec1931afb66e" + url: "https://pub.dev" source: hosted version: "0.8.0" typed_data: dependency: transitive description: name: typed_data - url: "https://pub.dartlang.org" + sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c + url: "https://pub.dev" source: hosted - version: "1.3.1" + version: "1.3.2" url_launcher: dependency: transitive description: name: url_launcher - url: "https://pub.dartlang.org" + sha256: "47e208a6711459d813ba18af120d9663c20bdf6985d6ad39fe165d2538378d27" + url: "https://pub.dev" source: hosted - version: "6.1.8" + version: "6.1.14" url_launcher_android: dependency: transitive description: name: url_launcher_android - url: "https://pub.dartlang.org" + sha256: b04af59516ab45762b2ca6da40fa830d72d0f6045cd97744450b73493fa76330 + url: "https://pub.dev" source: hosted - version: "6.0.23" + version: "6.1.0" url_launcher_ios: dependency: transitive description: name: url_launcher_ios - url: "https://pub.dartlang.org" + sha256: "7c65021d5dee51813d652357bc65b8dd4a6177082a9966bc8ba6ee477baa795f" + url: "https://pub.dev" source: hosted - version: "6.0.18" + version: "6.1.5" url_launcher_linux: dependency: transitive description: name: url_launcher_linux - url: "https://pub.dartlang.org" + sha256: b651aad005e0cb06a01dbd84b428a301916dc75f0e7ea6165f80057fee2d8e8e + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.6" url_launcher_macos: dependency: transitive description: name: url_launcher_macos - url: "https://pub.dartlang.org" + sha256: b55486791f666e62e0e8ff825e58a023fd6b1f71c49926483f1128d3bbd8fe88 + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.7" url_launcher_platform_interface: dependency: transitive description: name: url_launcher_platform_interface - url: "https://pub.dartlang.org" + sha256: "95465b39f83bfe95fcb9d174829d6476216f2d548b79c38ab2506e0458787618" + url: "https://pub.dev" source: hosted - version: "2.1.1" + version: "2.1.5" url_launcher_web: dependency: transitive description: name: url_launcher_web - url: "https://pub.dartlang.org" + sha256: "2942294a500b4fa0b918685aff406773ba0a4cd34b7f42198742a94083020ce5" + url: "https://pub.dev" source: hosted - version: "2.0.14" + version: "2.0.20" url_launcher_windows: dependency: transitive description: name: url_launcher_windows - url: "https://pub.dartlang.org" + sha256: "95fef3129dc7cfaba2bc3d5ba2e16063bb561fc6d78e63eee16162bc70029069" + url: "https://pub.dev" source: hosted - version: "3.0.2" + version: "3.0.8" uuid: dependency: transitive description: name: uuid - url: "https://pub.dartlang.org" + sha256: "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313" + url: "https://pub.dev" source: hosted version: "3.0.7" vector_math: dependency: transitive description: name: vector_math - url: "https://pub.dartlang.org" + sha256: "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803" + url: "https://pub.dev" source: hosted - version: "2.1.2" + version: "2.1.4" + web: + dependency: transitive + description: + name: web + sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10 + url: "https://pub.dev" + source: hosted + version: "0.1.4-beta" web_socket_channel: dependency: transitive description: name: web_socket_channel - url: "https://pub.dartlang.org" + sha256: "3a969ddcc204a3e34e863d204b29c0752716f78b6f9cc8235083208d268a4ccd" + url: "https://pub.dev" source: hosted version: "2.2.0" win32: dependency: transitive description: name: win32 - url: "https://pub.dartlang.org" + sha256: c0e3a4f7be7dae51d8f152230b86627e3397c1ba8c3fa58e63d44a9f3edc9cef + url: "https://pub.dev" source: hosted version: "2.6.1" xdg_directories: dependency: transitive description: name: xdg_directories - url: "https://pub.dartlang.org" + sha256: bd512f03919aac5f1313eb8249f223bacf4927031bf60b02601f81f687689e86 + url: "https://pub.dev" source: hosted version: "0.2.0+3" xml: dependency: transitive description: name: xml - url: "https://pub.dartlang.org" + sha256: "80d494c09849dc3f899d227a78c30c5b949b985ededf884cb3f3bcd39f4b447a" + url: "https://pub.dev" source: hosted version: "5.4.1" yaml: dependency: transitive description: name: yaml - url: "https://pub.dartlang.org" + sha256: "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5" + url: "https://pub.dev" source: hosted - version: "3.1.1" + version: "3.1.2" sdks: - dart: ">=2.18.0 <3.0.0" - flutter: ">=3.0.0" + dart: ">=3.1.0 <4.0.0" + flutter: ">=3.13.0" diff --git a/bhagavad_gita/pubspec.yaml b/bhagavad_gita/pubspec.yaml index 59b0a0d..6fb974a 100644 --- a/bhagavad_gita/pubspec.yaml +++ b/bhagavad_gita/pubspec.yaml @@ -22,7 +22,7 @@ dependencies: get_it: ^7.2.0 graphql_flutter: ^5.0.0 in_app_review: ^2.0.6 - intl: ^0.17.0 + intl: ^0.18.1 list_tile_switch: ^1.0.0 percent_indicator: ^4.2.2 share: ^2.0.4 @@ -80,11 +80,11 @@ flutter: weight: 500 - family: Arial fonts: - - asset: fonts/Arial-Regular.ttf + - asset: fonts/Arial-Regular.TTF weight: 400 - - asset: fonts/Arial-Black.ttf + - asset: fonts/Arial-Black.TTF weight: 700 - - asset: fonts/Arial-Bold.ttf + - asset: fonts/Arial-Bold.TTF weight: 600 - asset: fonts/Arial-Medium.ttf weight: 500