Merge pull request #137 from gita/upgrade_targetsdk

Change build gradle version
gita · Oct 15, 2024 · 545db51 · 545db51
2 parents 25dd442 + cacfb74
commit 545db51
Show file tree

Hide file tree

Showing 12 changed files with 132 additions and 97 deletions.
diff --git a/bhagavad_gita/android/app/build.gradle b/bhagavad_gita/android/app/build.gradle
@@ -20,13 +20,19 @@ def flutterVersionName = localProperties.getProperty('flutter.versionName')
 if (flutterVersionName == null) {
     flutterVersionName = '1.0'
 }
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
 
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
 
 android {
-    compileSdkVersion flutter.compileSdkVersion
+    namespace = "com.gitainitiative.bhagavadgita"
+    compileSdkVersion 34
     ndkVersion flutter.ndkVersion
 
     compileOptions {
@@ -45,18 +51,27 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId "com.gitainitiative.bhagavadgita"
-        minSdkVersion 21
-        targetSdkVersion 33
+        minSdkVersion 24
+        targetSdkVersion 34
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         multiDexEnabled true
     }
 
+    signingConfigs {
+       release {
+           keyAlias keystoreProperties['keyAlias']
+           keyPassword keystoreProperties['keyPassword']
+           storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+           storePassword keystoreProperties['storePassword']
+       }
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig signingConfigs.debug
+            signingConfig signingConfigs.release
         }
     }
 }

diff --git a/bhagavad_gita/android/build.gradle b/bhagavad_gita/android/build.gradle
@@ -1,15 +1,26 @@
 buildscript {
-    ext.kotlin_version = '1.8.0'
+    ext.kotlin_version = '1.8.22'
     repositories {
         google()
         mavenCentral()
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.0'
-        classpath 'com.google.gms:google-services:4.3.15'
+        classpath 'com.android.tools.build:gradle:8.1.4'
+        classpath 'com.google.gms:google-services:4.4.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
+    subprojects {
+        afterEvaluate { project ->
+            if (project.hasProperty('android')) {
+                project.android {
+                    if (namespace == null) {
+                        namespace project.group
+                    }
+                }
+            }
+        }
+    }
 }
 
 allprojects {
@@ -22,9 +33,11 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
+}
+subprojects {
     project.evaluationDependsOn(':app')
 }
 
 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
@@ -1,6 +1,6 @@
-#Fri Jun 23 08:50:38 CEST 2017
+#Sat Oct 05 12:39:54 IST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
diff --git a/bhagavad_gita/android/hanuman.jks b/bhagavad_gita/android/hanuman.jks
diff --git a/bhagavad_gita/android/my-key.keystore b/bhagavad_gita/android/my-key.keystore
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
@@ -91,103 +91,106 @@ class _BottomNavigationMenuState extends State<BottomNavigationMenu> {
             ],
           ),
           SizedBox(height: 10),
-          Container(
-            child: Row(
-              children: [
-                Material(
-                  child: InkWell(
-                    onTap: () {
-                      widget.fontSizeIncrease(true);
-                    },
-                    child: Container(
-                      height: 40,
-                      width: 76,
-                      decoration: BoxDecoration(
-                        color: whiteFormatingColor.bgColor,
-                        border: Border.all(
-                          color: editBoxBorderColor,
-                          style: BorderStyle.solid,
-                        ),
-                        borderRadius: BorderRadius.only(
-                          topLeft: Radius.circular(10),
+          Row(
+            children: [
+              Expanded(
+                child: Row(
+                  children: [
+                    Expanded(
+                      child: Material(
+                        child: InkWell(
+                          onTap: () {
+                            widget.fontSizeIncrease(true);
+                          },
+                          child: Container(
+                            height: 40,
+                            decoration: BoxDecoration(
+                              color: whiteFormatingColor.bgColor,
+                              border: Border.all(
+                                color: editBoxBorderColor,
+                                style: BorderStyle.solid,
+                              ),
+                              borderRadius: BorderRadius.only(
+                                topLeft: Radius.circular(10),
+                              ),
+                            ),
+                            child: Center(
+                              child: SvgPicture.asset(
+                                'assets/icons/image_aa_pluse.svg',
+                              ),
+                            ),
+                          ),
                         ),
                       ),
-                      child: Center(
-                        child: SvgPicture.asset(
-                          'assets/icons/image_aa_pluse.svg',
+                    ),
+                    Expanded(
+                      child: Material(
+                        child: InkWell(
+                          onTap: () {
+                            widget.fontSizeIncrease(false);
+                          },
+                          child: Container(
+                            height: 40,
+                            decoration: BoxDecoration(
+                              color: whiteFormatingColor.bgColor,
+                              border: Border.all(
+                                  color: editBoxBorderColor,
+                                  style: BorderStyle.solid),
+                              borderRadius: BorderRadius.only(
+                                topRight: Radius.circular(10),
+                              ),
+                            ),
+                            child: Center(
+                              child: SvgPicture.asset(
+                                'assets/icons/image_aa_min.svg',
+                              ),
+                            ),
+                          ),
                         ),
                       ),
                     ),
-                  ),
+                  ],
                 ),
-                Material(
+              ),
+              SizedBox(width: 30),
+              Expanded(
+                child: Material(
                   child: InkWell(
                     onTap: () {
-                      widget.fontSizeIncrease(false);
+                      print('change font family');
+                      _onPressedInter(context,
+                          selectedFontFamily: (String fontFamily) {
+                        setState(() {
+                          fontFamilyName = fontFamily;
+                        });
+                        print('Selected font family 0: $fontFamily');
+                        widget.selectedFontFamily(fontFamily);
+                      });
                     },
                     child: Container(
                       height: 40,
-                      width: 76,
+                      width: 180,
                       decoration: BoxDecoration(
                         color: whiteFormatingColor.bgColor,
                         border: Border.all(
                             color: editBoxBorderColor,
                             style: BorderStyle.solid),
-                        borderRadius: BorderRadius.only(
-                          topRight: Radius.circular(10),
-                        ),
+                        borderRadius: BorderRadius.circular(5),
                       ),
                       child: Center(
-                        child: SvgPicture.asset(
-                          'assets/icons/image_aa_min.svg',
+                        child: Text(
+                          fontFamilyName,
+                          style: Theme.of(context)
+                              .textTheme
+                              .titleMedium!
+                              .copyWith(fontSize: 18, color: titleLableColor),
                         ),
                       ),
                     ),
                   ),
                 ),
-                Spacer(),
-                Row(
-                  children: [
-                    Material(
-                      child: InkWell(
-                        onTap: () {
-                          print('change font family');
-                          _onPressedInter(context,
-                              selectedFontFamily: (String fontFamily) {
-                            setState(() {
-                              fontFamilyName = fontFamily;
-                            });
-                            print('Selected font family 0: $fontFamily');
-                            widget.selectedFontFamily(fontFamily);
-                          });
-                        },
-                        child: Container(
-                          height: 40,
-                          width: 180,
-                          decoration: BoxDecoration(
-                            color: whiteFormatingColor.bgColor,
-                            border: Border.all(
-                                color: editBoxBorderColor,
-                                style: BorderStyle.solid),
-                            borderRadius: BorderRadius.circular(5),
-                          ),
-                          child: Center(
-                            child: Text(
-                              fontFamilyName,
-                              style: Theme.of(context)
-                                  .textTheme
-                                  .titleMedium!
-                                  .copyWith(
-                                      fontSize: 18, color: titleLableColor),
-                            ),
-                          ),
-                        ),
-                      ),
-                    ),
-                  ],
-                )
-              ],
-            ),
+              )
+            ],
           ),
           SizedBox(height: 16),
           Column(
@@ -321,6 +324,7 @@ class _BottomNavigationMenuState extends State<BottomNavigationMenu> {
       {required Function(String) selectedFontFamily}) {
     showModalBottomSheet(
       context: context,
+      backgroundColor: Colors.transparent,
       builder: (context) {
         return Container(
           color: Colors.transparent,

diff --git a/bhagavad_gita/lib/screens/chapter_detail/chapter_detail_screen.dart b/bhagavad_gita/lib/screens/chapter_detail/chapter_detail_screen.dart
@@ -408,9 +408,10 @@ class _ChapterDetailScreenState extends State<ChapterDetailScreen> {
   formatingModalBottomSheet(BuildContext context) {
     return showModalBottomSheet(
       context: context,
+      backgroundColor: Colors.transparent,
       builder: (context) {
         return Container(
-          color: Color(0XFF737373),
+          color: Colors.transparent,
           height: 350,
           child: Container(
             child: BottomNavigationMenu(
@@ -457,7 +458,7 @@ class _ChapterDetailScreenState extends State<ChapterDetailScreen> {
               formatingColor: formatingColor,
             ),
             decoration: BoxDecoration(
-              color: formatingColor.bgColor,
+              color: Colors.white,
               borderRadius: BorderRadius.only(
                 topLeft: Radius.circular(20),
                 topRight: Radius.circular(20),

diff --git a/bhagavad_gita/lib/screens/home_screen.dart/quotes_page.dart b/bhagavad_gita/lib/screens/home_screen.dart/quotes_page.dart
@@ -3,7 +3,7 @@ import 'package:bhagavad_gita/Constant/app_size_config.dart';
 import 'package:bhagavad_gita/Constant/quotes.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_svg/svg.dart';
-import 'package:share/share.dart';
+import 'package:share_plus/share_plus.dart';
 
 class QuotesScreen extends StatefulWidget {
   @override

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
@@ -20,7 +20,7 @@ import 'package:flutter/rendering.dart';
 import 'package:flutter_svg/svg.dart';
 import 'package:graphql_flutter/graphql_flutter.dart';
 import 'package:percent_indicator/percent_indicator.dart';
-import 'package:share/share.dart';
+import 'package:share_plus/share_plus.dart';
 import '../../locator.dart';
 
 class ContinueReading extends StatefulWidget {
@@ -1039,9 +1039,10 @@ class _ContinueReadingState extends State<ContinueReading> {
   _onPressedEditButton(context) {
     showModalBottomSheet(
       context: context,
+      backgroundColor: Colors.transparent,
       builder: (context) {
         return Container(
-          color: Color(0XFF737373),
+          color: Colors.transparent,
           height: 350,
           child: Container(
             child: BottomNavigationMenu(
@@ -1085,7 +1086,7 @@ class _ContinueReadingState extends State<ContinueReading> {
               formatingColor: formatingColor,
             ),
             decoration: BoxDecoration(
-              color: formatingColor.bgColor,
+              color: Colors.white,
               borderRadius: BorderRadius.only(
                 topLeft: Radius.circular(20),
                 topRight: Radius.circular(20),

diff --git a/bhagavad_gita/lib/screens/on_board_screen/OnBoardingScreen_one.dart b/bhagavad_gita/lib/screens/on_board_screen/OnBoardingScreen_one.dart
@@ -400,7 +400,7 @@ class ExploreEachVerePageThree extends StatelessWidget {
               .toString(),
           textAlign: TextAlign.center,
           style: Theme.of(context).textTheme.titleMedium!.copyWith(
-                color: textLightGreyColor,fontSize:height* 0.022
+                color: textLightGreyColor,/* fontSize:height* 0.022 */
               ),
         ),
         // SizedBox(height: kPadding),

diff --git a/bhagavad_gita/lib/widgets/line_space_widget.dart b/bhagavad_gita/lib/widgets/line_space_widget.dart
@@ -24,15 +24,15 @@ class LineSpaceWidget extends StatelessWidget {
                 ? Colors.orange[50] ?? Colors.transparent
                 : Colors.transparent,
             width: 5),
-        borderRadius: BorderRadius.circular(8),
+        borderRadius: BorderRadius.circular(14),
       ),
       child: Container(
         width: 140,
         height: 40,
         decoration: BoxDecoration(
           border: Border.all(
               color: showBorder ? orangeColor : Colors.transparent, width: 3),
-          borderRadius: BorderRadius.circular(8),
+          borderRadius: BorderRadius.circular(11),
         ),
         child: Container(
           width: 100,