diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..c5f3f6b --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.configuration.updateBuildConfiguration": "interactive" +} \ No newline at end of file diff --git a/android/app/build.gradle b/android/app/build.gradle index 46ee066..2b60416 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -26,7 +26,7 @@ if (flutterVersionName == null) { android { namespace = "com.example.sefer_admin1" compileSdk = flutter.compileSdkVersion - ndkVersion = flutter.ndkVersion + ndkVersion = "26.1.10909125" compileOptions { sourceCompatibility = JavaVersion.VERSION_1_8 diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 8ed9141..062d3fd 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -1,24 +1,12 @@ - - + + + - + @@ -26,12 +14,9 @@ - + - diff --git a/android/build.gradle b/android/build.gradle index d2ffbff..9028d2a 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,3 +1,18 @@ +buildscript { + ext.kotlin_version = '1.9.10' + // Update to a compatible Kotlin version + + repositories { + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:8.0.2' // Use a compatible AGP version + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" + } +} + allprojects { repositories { google() @@ -6,10 +21,9 @@ allprojects { } rootProject.buildDir = "../build" + subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" -} -subprojects { project.evaluationDependsOn(":app") } diff --git a/android/settings.gradle b/android/settings.gradle index dc2d592..92694c3 100644 --- a/android/settings.gradle +++ b/android/settings.gradle @@ -19,7 +19,7 @@ pluginManagement { plugins { id "dev.flutter.flutter-plugin-loader" version "1.0.0" - id "com.android.application" version '8.4.0' apply false + id "com.android.application" version '8.0.2' apply false // START: FlutterFire Configuration id "com.google.gms.google-services" version "4.3.15" apply false // END: FlutterFire Configuration diff --git a/lib/controller/functions/location_permission.dart b/lib/controller/functions/location_permission.dart index 9bbf33c..4c7b37d 100644 --- a/lib/controller/functions/location_permission.dart +++ b/lib/controller/functions/location_permission.dart @@ -1,16 +1,16 @@ -import 'package:location/location.dart'; -import 'package:get/get.dart'; +// import 'package:location/location.dart'; +// import 'package:get/get.dart'; -class LocationPermissions { - late Location location; +// class LocationPermissions { +// late Location location; - Future locationPermissions() async { - location = Location(); - var permissionStatus = await location.requestPermission(); - if (permissionStatus == PermissionStatus.denied) { - // The user denied the location permission. - Get.defaultDialog(title: 'GPS Required Allow !.'.tr, middleText: ''); - return null; - } - } -} +// Future locationPermissions() async { +// location = Location(); +// var permissionStatus = await location.requestPermission(); +// if (permissionStatus == PermissionStatus.denied) { +// // The user denied the location permission. +// Get.defaultDialog(title: 'GPS Required Allow !.'.tr, middleText: ''); +// return null; +// } +// } +// } diff --git a/macos/Flutter/GeneratedPluginRegistrant.swift b/macos/Flutter/GeneratedPluginRegistrant.swift index d17c3a1..24f9c66 100644 --- a/macos/Flutter/GeneratedPluginRegistrant.swift +++ b/macos/Flutter/GeneratedPluginRegistrant.swift @@ -9,7 +9,6 @@ import firebase_core import firebase_messaging import flutter_secure_storage_macos import google_sign_in_ios -import location import path_provider_foundation import sqflite import url_launcher_macos @@ -19,7 +18,6 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin")) FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin")) FLTGoogleSignInPlugin.register(with: registry.registrar(forPlugin: "FLTGoogleSignInPlugin")) - LocationPlugin.register(with: registry.registrar(forPlugin: "LocationPlugin")) PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin")) SqflitePlugin.register(with: registry.registrar(forPlugin: "SqflitePlugin")) UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin")) diff --git a/pubspec.lock b/pubspec.lock index ae16ae5..484405e 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -334,14 +334,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.0.2" - flutter_paypal: - dependency: "direct main" - description: - name: flutter_paypal - sha256: "783d52ca84528b4b7a1213db5195e6946a2d27b2192f4fcd6d0b04b8c37e359e" - url: "https://pub.dev" - source: hosted - version: "0.2.0" flutter_plugin_android_lifecycle: dependency: transitive description: @@ -398,14 +390,6 @@ packages: url: "https://pub.dev" source: hosted version: "3.1.2" - flutter_spinkit: - dependency: transitive - description: - name: flutter_spinkit - sha256: d2696eed13732831414595b98863260e33e8882fc069ee80ec35d4ac9ddb0472 - url: "https://pub.dev" - source: hosted - version: "5.2.1" flutter_test: dependency: "direct dev" description: flutter @@ -520,14 +504,6 @@ packages: url: "https://pub.dev" source: hosted version: "0.13.6" - http_auth: - dependency: transitive - description: - name: http_auth - sha256: b7625acba2987fa69140d9600c679819f33227d665f525fbb2f394e08cf917d1 - url: "https://pub.dev" - source: hosted - version: "1.0.4" http_multi_server: dependency: transitive description: @@ -656,30 +632,6 @@ packages: url: "https://pub.dev" source: hosted version: "1.0.10" - location: - dependency: "direct main" - description: - name: location - sha256: "37ffdadcd4b1498b769824f45ebb4de8ed46663a4a67ac27b33a590ee486579f" - url: "https://pub.dev" - source: hosted - version: "6.0.2" - location_platform_interface: - dependency: transitive - description: - name: location_platform_interface - sha256: "2ecde6bb0f88032b0bbbde37e18975b4468711dd92619c2235cc0c0ee93b4b8e" - url: "https://pub.dev" - source: hosted - version: "4.0.0" - location_web: - dependency: transitive - description: - name: location_web - sha256: "15ad7b4c8a9f55abee513373755e093a40c04d7e24fc1b4f89676fe99523d034" - url: "https://pub.dev" - source: hosted - version: "5.0.1" logging: dependency: transitive description: @@ -1069,38 +1021,6 @@ packages: url: "https://pub.dev" source: hosted version: "2.4.5" - webview_flutter: - dependency: "direct main" - description: - name: webview_flutter - sha256: "6869c8786d179f929144b4a1f86e09ac0eddfe475984951ea6c634774c16b522" - url: "https://pub.dev" - source: hosted - version: "4.8.0" - webview_flutter_android: - dependency: transitive - description: - name: webview_flutter_android - sha256: "0d21cfc3bfdd2e30ab2ebeced66512b91134b39e72e97b43db2d47dda1c4e53a" - url: "https://pub.dev" - source: hosted - version: "3.16.3" - webview_flutter_platform_interface: - dependency: transitive - description: - name: webview_flutter_platform_interface - sha256: d937581d6e558908d7ae3dc1989c4f87b786891ab47bb9df7de548a151779d8d - url: "https://pub.dev" - source: hosted - version: "2.10.0" - webview_flutter_wkwebview: - dependency: transitive - description: - name: webview_flutter_wkwebview - sha256: "7affdf9d680c015b11587181171d3cad8093e449db1f7d9f0f08f4f33d24f9a0" - url: "https://pub.dev" - source: hosted - version: "3.13.1" win32: dependency: transitive description: diff --git a/pubspec.yaml b/pubspec.yaml index 2c95c4a..45fc3d5 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -39,7 +39,7 @@ dependencies: sdk: flutter flutter_launcher_icons: ^0.13.1 # flutter_local_notifications: ^17.1.1 - flutter_paypal: ^0.2.0 + # flutter_paypal: ^0.2.0 flutter_secure_storage: ^9.0.0 # flutter_stripe: ^10.1.1 get: ^4.6.6 @@ -53,11 +53,11 @@ dependencies: # image_picker: ^1.1.1 intl: ^0.19.0 local_auth: ^2.2.0 - location: ^6.0.1 + # location: ^6.0.1 path: ^1.9.0 sqflite: ^2.3.3+1 url_launcher: ^6.2.6 - webview_flutter: ^4.7.0 + # webview_flutter: ^4.7.0 dev_dependencies: flutter_test: