changed base url

MAyman007 · web-flow · commit 70dd6ee12421 · 2023-08-23T14:50:56.000+03:00
Master
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:hadithsearcher/views/about_view.dart';
 import 'package:hadithsearcher/views/favourites_view.dart';
 import 'package:hadithsearcher/views/search_view.dart';
@@ -13,6 +14,7 @@ void main() async {
   DatabaseHelper sqlDb = DatabaseHelper();
   await sqlDb.initialDb();
   final theme = await sqlDb.getTheme();
+  await dotenv.load(fileName: ".env");
   runApp(HomePage(theme: theme));
 }
 
diff --git a/lib/views/favourites_view.dart b/lib/views/favourites_view.dart
@@ -1,5 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_animate/flutter_animate.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:hadithsearcher/utilities/show_navigation_drawer.dart';
 import 'package:hadithsearcher/views/similar_hadith_view.dart';
 import '../constants/routes.dart';
@@ -19,6 +21,8 @@ class FavouritesView extends StatefulWidget {
 class _FavouritesViewState extends State<FavouritesView> {
   DatabaseHelper sqlDb = DatabaseHelper();
 
+  String hadithApiBaseUrl = dotenv.env['HADITH_API_BASE_URL']!;
+
   bool _isLoading = false;
 
   bool _isEmpty = true;
@@ -249,7 +253,7 @@ class _FavouritesViewState extends State<FavouritesView> {
                                                           'hasSharhMetadata'] ==
                                                       true) {
                                                     var url = Uri.parse(
-                                                        "https://dorar-hadith-api.cyclic.cloud/v1/site/sharh/${hadith['sharhMetadata']['id']}");
+                                                        "$hadithApiBaseUrl/v1/site/sharh/${hadith['sharhMetadata']['id']}");
                                                     var response = await http
                                                         .get(url)
                                                         .timeout(const Duration(
@@ -427,7 +431,7 @@ class _FavouritesViewState extends State<FavouritesView> {
                                   ),
                                 );
                               },
-                            ),
+                            ).animate().fade(duration: 200.ms),
                           ),
                   ],
                 ),
diff --git a/lib/views/search_view.dart b/lib/views/search_view.dart
@@ -1,5 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_animate/flutter_animate.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:hadithsearcher/db/database.dart';
 import 'package:hadithsearcher/views/similar_hadith_view.dart';
 import 'package:http/http.dart' as http;
@@ -20,6 +21,8 @@ class SearchView extends StatefulWidget {
 class _SearchViewState extends State<SearchView> {
   DatabaseHelper sqlDb = DatabaseHelper();
 
+  String hadithApiBaseUrl = dotenv.env['HADITH_API_BASE_URL']!;
+
   bool _isLoading = false;
 
   bool _isEmpty = true;
@@ -180,7 +183,7 @@ class _SearchViewState extends State<SearchView> {
         searchBook = '96';
       }
       var url = Uri.parse(
-          'https://dorar-hadith-api.cyclic.cloud/v1/site/hadith/search?value=$searchKeyword&page=$searchPagaNumber&st=$searchWay&t=$searchRange&d[]=$searchGrade&m[]=$searchMohdith&s[]=$searchBook$searchExcludedWords');
+          '$hadithApiBaseUrl/v1/site/hadith/search?value=$searchKeyword&page=$searchPagaNumber&st=$searchWay&t=$searchRange&d[]=$searchGrade&m[]=$searchMohdith&s[]=$searchBook$searchExcludedWords');
       var response = await http.get(url).timeout(const Duration(seconds: 24));
       var decodedBody = utf8.decode(response.bodyBytes);
       var jsonResponse = json.decode(decodedBody);
@@ -984,7 +987,7 @@ class _SearchViewState extends State<SearchView> {
                                                             'hasSharhMetadata'] ==
                                                         true) {
                                                       var url = Uri.parse(
-                                                          "https://dorar-hadith-api.cyclic.cloud/v1/site/sharh/${hadith['sharhMetadata']['id']}");
+                                                          "$hadithApiBaseUrl/v1/site/sharh/${hadith['sharhMetadata']['id']}");
                                                       var response = await http
                                                           .get(url)
                                                           .timeout(
@@ -1188,9 +1191,9 @@ class _SearchViewState extends State<SearchView> {
                                         ),
                                       ],
                                     ),
-                                  ).animate().fade(duration: 200.ms);
+                                  );
                                 },
-                              ),
+                              ).animate().fade(duration: 200.ms),
                             ),
                   _isEmpty
                       ? const Text('')
diff --git a/lib/views/similar_hadith_view.dart b/lib/views/similar_hadith_view.dart
@@ -1,4 +1,6 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_animate/flutter_animate.dart';
+import 'package:flutter_dotenv/flutter_dotenv.dart';
 import 'package:http/http.dart' as http;
 import 'dart:async';
 import 'dart:convert';
@@ -17,6 +19,8 @@ class SimilarHadithView extends StatefulWidget {
 class _SimilarHadithViewState extends State<SimilarHadithView> {
   DatabaseHelper sqlDb = DatabaseHelper();
 
+  String hadithApiBaseUrl = dotenv.env['HADITH_API_BASE_URL']!;
+
   bool _isLoading = false;
 
   bool _showBackToTopButton = false;
@@ -88,8 +92,7 @@ class _SimilarHadithViewState extends State<SimilarHadithView> {
       );
     }
     try {
-      var url = Uri.parse(
-          'https://dorar-hadith-api.cyclic.cloud/v1/site/hadith/similar/$hadithId');
+      var url = Uri.parse('$hadithApiBaseUrl/v1/site/hadith/similar/$hadithId');
       var response = await http.get(url).timeout(const Duration(seconds: 24));
       var decodedBody = utf8.decode(response.bodyBytes);
       var jsonResponse = json.decode(decodedBody);
@@ -266,7 +269,7 @@ class _SimilarHadithViewState extends State<SimilarHadithView> {
                                           if (hadith['hasSharhMetadata'] ==
                                               true) {
                                             var url = Uri.parse(
-                                                "https://dorar-hadith-api.cyclic.cloud/v1/site/sharh/${hadith['sharhMetadata']['id']}");
+                                                "$hadithApiBaseUrl/v1/site/sharh/${hadith['sharhMetadata']['id']}");
                                             var response = await http
                                                 .get(url)
                                                 .timeout(
@@ -417,7 +420,7 @@ class _SimilarHadithViewState extends State<SimilarHadithView> {
                           ),
                         );
                       },
-                    ),
+                    ).animate().fade(duration: 200.ms),
                   ),
                 ],
               ),
diff --git a/pubspec.lock b/pubspec.lock
@@ -126,6 +126,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "4.2.0+1"
+  flutter_dotenv:
+    dependency: "direct main"
+    description:
+      name: flutter_dotenv
+      sha256: "9357883bdd153ab78cbf9ffa07656e336b8bbb2b5a3ca596b0b27e119f7c7d77"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.0"
   flutter_launcher_icons:
     dependency: "direct main"
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -46,6 +46,7 @@ dependencies:
   in_app_update: ^4.1.4
   flutter_launcher_icons: ^0.13.1
   flutter_animate: ^4.2.0+1
+  flutter_dotenv: ^5.1.0
 
 flutter_native_splash:
  color: "#ffffff"
@@ -83,6 +84,7 @@ flutter:
   # To add assets to your application, add an assets section, like this:
   assets:
     - assets/icons/logo.png
+    - .env
   #   - images/a_dot_ham.jpeg
 
   # An image asset can refer to one or more resolution-specific "variants", see
