fixed merge aftermath

SayNode · May 31, 2022 · 8339c06 · 8339c06
1 parent 7732753
commit 8339c06
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 182 deletions.
diff --git a/vidaia/android/app/build.gradle b/vidaia/android/app/build.gradle
@@ -46,8 +46,8 @@ android {
 
 
         applicationId "ch.saynode.vidaia"
-        minSdkVersion 18
-        targetSdkVersion 28
+        minSdkVersion 21
+        targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName
         manifestPlaceholders += [appAuthRedirectScheme: 'ch.saynode.vidaia']

diff --git a/vidaia/lib/main.dart b/vidaia/lib/main.dart
@@ -2,7 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:get_it/get_it.dart';
 import 'package:google_fonts/google_fonts.dart';
-import 'package:vidaia/pages/auth0_testing_page.dart';
+import 'package:vidaia/pages/login_page.dart';
 import 'package:vidaia/repositories/dataRepository.dart';
 
 GetIt getIt = GetIt.instance;
@@ -94,7 +94,7 @@ class _MyAppState extends State<MyApp> {
         ),
       ),
       darkTheme: ThemeData.dark(),
-      home: Auth0TestPage(),
+      home: LoginPage(),
     );
   }
 }
diff --git a/vidaia/lib/pages/auth0_testing_page.dart b/vidaia/lib/pages/auth0_testing_page.dart
diff --git a/vidaia/lib/utils/auth0.dart b/vidaia/lib/utils/auth0.dart
diff --git a/vidaia/pubspec.lock b/vidaia/pubspec.lock
@@ -313,7 +313,6 @@ packages:
       name: flutter_appauth
       url: "https://pub.dartlang.org"
     source: hosted
-
     version: "4.0.0"
   flutter_appauth_platform_interface:
     dependency: transitive
@@ -567,7 +566,7 @@ packages:
       name: mobile_scanner
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.0.0"
+    version: "2.0.0"
   nested:
     dependency: transitive
     description:
@@ -1099,5 +1098,5 @@ packages:
     source: hosted
     version: "3.1.0"
 sdks:
-  dart: ">=2.17.0-0 <3.0.0"
-  flutter: ">=2.10.0"
+  dart: ">=2.17.0 <3.0.0"
+  flutter: ">=3.0.0"
diff --git a/vidaia/pubspec.yaml b/vidaia/pubspec.yaml
@@ -51,8 +51,8 @@ dependencies:
   get_it: ^7.2.0
   url_launcher: ^6.1.0
   contained_tab_bar_view: ^0.8.0
-  mobile_scanner: ^1.0.0
-  flutter_appauth: ^2.4.2
+  mobile_scanner: ^2.0.0
+  #flutter_appauth: ^2.4.2
   change_app_package_name: ^1.0.0
 
 dev_dependencies: