screens

Author: iLukSbr

.github/workflows/ci.yml

@@ -15,8 +15,8 @@ jobs:
     - uses: actions/checkout@v3
     - uses: actions/setup-java@v2
       with:
-        distribution: 'zulu'
-        java-version: '17'
+        distribution: 'oracle'
+        java-version: '25'
     - uses: subosito/flutter-action@v2
       with: 
         flutter-version: '3.24.0'

.metadata

@@ -1,38 +1,23 @@
 # This file tracks properties of this Flutter project.
 # Used by Flutter tool to assess capabilities and perform upgrades etc.
 #
-# This file should be version controlled.
+# This file should be version controlled and should not be manually edited.
 
 version:
-  revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-  channel: stable
+  revision: "adc901062556672b4138e18a4dc62a4be8f4b3c2"
+  channel: "stable"
 
 project_type: app
 
 # Tracks metadata for the flutter migrate command
 migration:
   platforms:
     - platform: root
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: android
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: ios
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: linux
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: macos
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-    - platform: web
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
+      base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
     - platform: windows
-      create_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
-      base_revision: b8f7f1f9869bb2d116aa6a70dbeac61000b52849
+      create_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
+      base_revision: adc901062556672b4138e18a4dc62a4be8f4b3c2
 
   # User provided section
 

android/app/build.gradle

@@ -28,12 +28,12 @@ android {
     ndkVersion flutter.ndkVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_21
-        targetCompatibility JavaVersion.VERSION_21
+        sourceCompatibility JavaVersion.VERSION_24
+        targetCompatibility JavaVersion.VERSION_24
     }
 
     kotlinOptions {
-        jvmTarget = '21'
+        jvmTarget = '24'
     }
 
     sourceSets {

android/app/src/main/AndroidManifest.xml

@@ -5,6 +5,12 @@
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+    <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
+    <uses-permission android:name="android.permission.BLUETOOTH_SCAN" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
    <application
         android:label="Be for Bike"
         android:name="${applicationName}"

android/app/src/main/kotlin/com/beforbike/app/database/ActivityDatabaseHelper.kt

@@ -1,4 +1,4 @@
-org.gradle.jvmargs=-Xmx4096M
+org.gradle.jvmargs=-Xmx8192M
 android.useAndroidX=true
 android.enableJetifier=true
 android.aarMetadata.check.enabled=false

android/build/reports/problems/problems-report.html

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.1.0-all.zip

android/gradle.properties

@@ -20,7 +20,7 @@ pluginManagement {
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0-25.0.1"
     id "com.android.application" version "8.13.0" apply false
-    id "org.jetbrains.kotlin.android" version "2.2.20" apply false
+    id "org.jetbrains.kotlin.android" version "2.2.21" apply false
 }
 
 include ":app"

android/gradle/wrapper/gradle-wrapper.properties

@@ -67,7 +67,7 @@ class ApiHelper {
           break;
       }
       return response;
-    } on DioError catch (error) {
+    } on DioException catch (error) {
       if (error.response?.statusCode == 401) {
         return remoteApi.handleUnauthorizedError(error, data, queryParams);
       }
@@ -149,7 +149,7 @@ class RemoteApi {
 
         handler.next(response);
       },
-      onError: (DioError error, ErrorInterceptorHandler handler) async {
+      onError: (DioException error, ErrorInterceptorHandler handler) async {
         handler.next(error);
       },
     ));
@@ -170,7 +170,7 @@ class RemoteApi {
   /// Handles an unauthorized error by refreshing the JWT and making the request again.
   ///
   /// Returns the [Response] object or null if navigation to the login screen occurs.
-  Future<Response?> handleUnauthorizedError(DioError error,
+  Future<Response?> handleUnauthorizedError(DioException error,
       Map<String, dynamic>? data, Map<String, dynamic>? queryParams) async {
     try {
       String? jwt = await UserApi.refreshToken();
@@ -188,10 +188,10 @@ class RemoteApi {
             responseType: error.requestOptions.responseType,
           ),
         );
-      } on DioError catch (_) {
+      } on DioException catch (_) {
         navigatorKey.currentState?.pushReplacementNamed('/login');
       }
-    } on DioError {
+    } on DioException {
       navigatorKey.currentState?.pushReplacementNamed('/login');
     }
     return null;