diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies new file mode 100644 index 0000000..4f34335 --- /dev/null +++ b/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"video_player_avfoundation","path":"/home/aeologic/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/video_player_avfoundation-2.3.7/","native_build":true,"dependencies":[]}],"android":[{"name":"video_player_android","path":"/home/aeologic/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/video_player_android-2.3.9/","native_build":true,"dependencies":[]}],"macos":[],"linux":[],"windows":[],"web":[{"name":"video_player_web","path":"/home/aeologic/snap/flutter/common/flutter/.pub-cache/hosted/pub.dartlang.org/video_player_web-2.0.12/","dependencies":[]}]},"dependencyGraph":[{"name":"video_player","dependencies":["video_player_android","video_player_avfoundation","video_player_web"]},{"name":"video_player_android","dependencies":[]},{"name":"video_player_avfoundation","dependencies":[]},{"name":"video_player_web","dependencies":[]}],"date_created":"2022-11-16 18:37:27.352070","version":"3.0.5"} \ No newline at end of file diff --git a/.idea/libraries/Dart_Packages.xml b/.idea/libraries/Dart_Packages.xml index f3fe204..c9aa762 100644 --- a/.idea/libraries/Dart_Packages.xml +++ b/.idea/libraries/Dart_Packages.xml @@ -5,182 +5,262 @@ - - + + + + + + - + + + + + + - + + + + + + - + + + + + + - - + + + + + + + + + + + + + + + + + + - - + - - + - - + - - + - - - - - - - - - + - - + - - + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.idea/libraries/Dart_SDK.xml b/.idea/libraries/Dart_SDK.xml index 9f56ad0..064833e 100644 --- a/.idea/libraries/Dart_SDK.xml +++ b/.idea/libraries/Dart_SDK.xml @@ -1,25 +1,25 @@ - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + diff --git a/.idea/libraries/Flutter_Plugins.xml b/.idea/libraries/Flutter_Plugins.xml index a615f38..d9729b9 100644 --- a/.idea/libraries/Flutter_Plugins.xml +++ b/.idea/libraries/Flutter_Plugins.xml @@ -1,8 +1,10 @@ - - + + + + diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 19f9194..2119635 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -8,6 +8,9 @@ + + @@ -18,127 +21,29 @@ - + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - + @@ -244,18 +161,6 @@ - - - - - @@ -281,7 +180,15 @@ + @@ -371,33 +279,15 @@ - - - - - + - - - + diff --git a/android/app/build.gradle b/android/app/build.gradle index e768613..ae1e61c 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -12,11 +12,10 @@ if (flutterRoot == null) { } apply plugin: 'com.android.application' -apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 27 + compileSdkVersion 31 compileOptions { sourceCompatibility 1.8 @@ -34,7 +33,7 @@ android { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.aeologic.fluttersplash" minSdkVersion 16 - targetSdkVersion 27 + targetSdkVersion 31 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -54,8 +53,8 @@ flutter { } dependencies { - implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' } diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 586d940..0ccbb0c 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -13,11 +13,12 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> + android:name="flutterEmbedding" + android:value="2" /> diff --git a/android/app/src/main/kotlin/com/aeologic/flutterapp/MainActivity.kt b/android/app/src/main/kotlin/com/aeologic/flutterapp/MainActivity.kt index e920a36..15306b1 100644 --- a/android/app/src/main/kotlin/com/aeologic/flutterapp/MainActivity.kt +++ b/android/app/src/main/kotlin/com/aeologic/flutterapp/MainActivity.kt @@ -1,13 +1,8 @@ package com.aeologic.flutterapp -import android.os.Bundle -import io.flutter.app.FlutterActivity -import io.flutter.plugins.GeneratedPluginRegistrant +import io.flutter.embedding.android.FlutterActivity; class MainActivity(): FlutterActivity() { - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - GeneratedPluginRegistrant.registerWith(this) - } + } diff --git a/android/build.gradle b/android/build.gradle index 2cad21a..db24410 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,12 +1,12 @@ buildscript { - ext.kotlin_version = '1.2.71' + ext.kotlin_version = '1.7.20' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:3.3.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } @@ -14,7 +14,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/android/gradle.properties b/android/gradle.properties index 8bd86f6..4d3226a 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1 +1,3 @@ org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index bae5290..9b6616c 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip diff --git a/android/gradlew b/android/gradlew old mode 100644 new mode 100755 diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh new file mode 100755 index 0000000..d4b6f79 --- /dev/null +++ b/ios/Flutter/flutter_export_environment.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# This is a generated file; do not edit or check into version control. +export "FLUTTER_ROOT=/home/aeologic/snap/flutter/common/flutter" +export "FLUTTER_APPLICATION_PATH=/home/aeologic/projects/flutter_splash_app" +export "COCOAPODS_PARALLEL_CODE_SIGN=true" +export "FLUTTER_TARGET=lib/main.dart" +export "FLUTTER_BUILD_DIR=build" +export "FLUTTER_BUILD_NAME=1.0.0" +export "FLUTTER_BUILD_NUMBER=1" +export "DART_OBFUSCATION=false" +export "TRACK_WIDGET_CREATION=false" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/lib/Constant/Constant.dart b/lib/Constant/Constant.dart index 7f6f09b..6c4ca46 100644 --- a/lib/Constant/Constant.dart +++ b/lib/Constant/Constant.dart @@ -1,2 +1,4 @@ - String HOME_SCREEN='/HomeScreen',IMAGE_SPLASH='/ImageSplashScreen',VIDEO_SPALSH='/VideoSplashScreen', - ANIMATED_SPALSH='/AnimatedSplashScreen'; \ No newline at end of file +String HOME_SCREEN = '/HomeScreen', + IMAGE_SPLASH = '/ImageSplashScreen', + VIDEO_SPALSH = '/VideoSplashScreen', + ANIMATED_SPALSH = '/AnimatedSplashScreen'; diff --git a/lib/Screen/AnimatedSplashScreen.dart b/lib/Screen/AnimatedSplashScreen.dart index 2d9a2f4..f538e70 100644 --- a/lib/Screen/AnimatedSplashScreen.dart +++ b/lib/Screen/AnimatedSplashScreen.dart @@ -1,9 +1,10 @@ import 'dart:async'; import 'package:AeologicSplashDemo/Constant/Constant.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'HomePage.dart'; + class AnimatedSplashScreen extends StatefulWidget { @override SplashScreenState createState() => new SplashScreenState(); @@ -22,7 +23,8 @@ class SplashScreenState extends State } void navigationPage() { - Navigator.of(context).pushReplacementNamed(HOME_SCREEN); + Navigator.of(context) + .push(MaterialPageRoute(builder: (context) => HomeScreen())); } @override diff --git a/lib/Screen/HomePage.dart b/lib/Screen/HomePage.dart index a1c8264..3297554 100644 --- a/lib/Screen/HomePage.dart +++ b/lib/Screen/HomePage.dart @@ -1,5 +1,4 @@ import 'package:AeologicSplashDemo/Constant/Constant.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; class HomeScreen extends StatefulWidget { diff --git a/lib/Screen/ImageSplashScreen.dart b/lib/Screen/ImageSplashScreen.dart index a763955..1d051f9 100644 --- a/lib/Screen/ImageSplashScreen.dart +++ b/lib/Screen/ImageSplashScreen.dart @@ -1,9 +1,10 @@ import 'dart:async'; import 'package:AeologicSplashDemo/Constant/Constant.dart'; -import 'package:flutter/cupertino.dart'; import 'package:flutter/material.dart'; +import 'HomePage.dart'; + class ImageSplashScreen extends StatefulWidget { @override SplashScreenState createState() => new SplashScreenState(); @@ -16,7 +17,8 @@ class SplashScreenState extends State { } void navigationPage() { - Navigator.of(context).pushReplacementNamed(HOME_SCREEN); + Navigator.of(context) + .push(MaterialPageRoute(builder: (context) => HomeScreen())); } @override diff --git a/lib/Screen/VideoSplashScreen.dart b/lib/Screen/VideoSplashScreen.dart index d390668..d9d1d55 100644 --- a/lib/Screen/VideoSplashScreen.dart +++ b/lib/Screen/VideoSplashScreen.dart @@ -1,7 +1,7 @@ import 'dart:async'; import 'package:AeologicSplashDemo/Constant/Constant.dart'; -import 'package:flutter/cupertino.dart'; +import 'package:AeologicSplashDemo/Screen/HomePage.dart'; import 'package:flutter/material.dart'; import 'package:video_player/video_player.dart'; @@ -37,7 +37,8 @@ class VideoState extends State { playerController.setVolume(0.0); playerController.removeListener(listener); Navigator.of(context).pop(VIDEO_SPALSH); - Navigator.of(context).pushReplacementNamed(HOME_SCREEN); + Navigator.of(context) + .push(MaterialPageRoute(builder: (context) => HomeScreen())); } void initializeVideo() { diff --git a/lib/main.dart b/lib/main.dart index e0790c0..4acb9a3 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -1,4 +1,3 @@ -import 'dart:async'; import 'package:AeologicSplashDemo/Constant/Constant.dart'; import 'package:AeologicSplashDemo/Screen/AnimatedSplashScreen.dart'; @@ -6,22 +5,25 @@ import 'package:AeologicSplashDemo/Screen/HomePage.dart'; import 'package:AeologicSplashDemo/Screen/ImageSplashScreen.dart'; import 'package:AeologicSplashDemo/Screen/VideoSplashScreen.dart'; import 'package:flutter/material.dart'; -import 'package:shared_preferences/shared_preferences.dart'; -Future main() async { - runApp(new MaterialApp( - title: 'FluterSplashDemo', - debugShowCheckedModeBanner: false, - theme: new ThemeData( - primarySwatch: Colors.red, - ), - home: new AnimatedSplashScreen(), - routes: { - HOME_SCREEN: (BuildContext context) => new HomeScreen(), - VIDEO_SPALSH: (BuildContext context) => new VideoSplashScreen(), - IMAGE_SPLASH: (BuildContext context) => new ImageSplashScreen(), - ANIMATED_SPALSH: (BuildContext context) => new AnimatedSplashScreen() - }, - )); -} +void main() => runApp(MyApp()); +class MyApp extends StatelessWidget { + @override + Widget build(BuildContext context) { + return MaterialApp( + title: 'FlutterSplashDemo', + debugShowCheckedModeBanner: false, + theme: new ThemeData( + primarySwatch: Colors.red, + ), + home: new AnimatedSplashScreen(), + routes: { + HOME_SCREEN: (BuildContext context) => new HomeScreen(), + VIDEO_SPALSH: (BuildContext context) => new VideoSplashScreen(), + IMAGE_SPLASH: (BuildContext context) => new ImageSplashScreen(), + ANIMATED_SPALSH: (BuildContext context) => new AnimatedSplashScreen() + }, + ); + } +} diff --git a/pubspec.lock b/pubspec.lock index 11e3f74..bf40540 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -1,5 +1,5 @@ # Generated by pub -# See https://www.dartlang.org/tools/pub/glossary#lockfile +# See https://dart.dev/tools/pub/glossary#lockfile packages: async: dependency: transitive @@ -7,35 +7,63 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.8.2" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "2.1.0" + characters: + dependency: transitive + description: + name: characters + url: "https://pub.dartlang.org" + source: hosted + version: "1.2.0" charcode: dependency: transitive description: name: charcode url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.3.1" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.0" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" + version: "1.16.0" + csslib: + dependency: transitive + description: + name: csslib + url: "https://pub.dartlang.org" + source: hosted + version: "0.17.2" cupertino_icons: dependency: "direct main" description: name: cupertino_icons url: "https://pub.dartlang.org" source: hosted - version: "0.1.2" + version: "1.0.5" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.0" flutter: dependency: "direct main" description: flutter @@ -46,41 +74,60 @@ packages: description: flutter source: sdk version: "0.0.0" + flutter_web_plugins: + dependency: transitive + description: flutter + source: sdk + version: "0.0.0" + html: + dependency: transitive + description: + name: html + url: "https://pub.dartlang.org" + source: hosted + version: "0.15.1" + js: + dependency: transitive + description: + name: js + url: "https://pub.dartlang.org" + source: hosted + version: "0.6.4" matcher: dependency: transitive description: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.3+1" + version: "0.12.11" + material_color_utilities: + dependency: transitive + description: + name: material_color_utilities + url: "https://pub.dartlang.org" + source: hosted + version: "0.1.4" meta: dependency: transitive description: name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" + version: "1.7.0" path: dependency: transitive description: name: path url: "https://pub.dartlang.org" source: hosted - version: "1.6.2" - quiver: + version: "1.8.1" + plugin_platform_interface: dependency: transitive description: - name: quiver - url: "https://pub.dartlang.org" - source: hosted - version: "2.0.1" - shared_preferences: - dependency: "direct main" - description: - name: shared_preferences + name: plugin_platform_interface url: "https://pub.dartlang.org" source: hosted - version: "0.4.3" + version: "2.1.3" sky_engine: dependency: transitive description: flutter @@ -92,63 +139,84 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.4.1" + version: "1.8.2" stack_trace: dependency: transitive description: name: stack_trace url: "https://pub.dartlang.org" source: hosted - version: "1.9.3" + version: "1.10.0" stream_channel: dependency: transitive description: name: stream_channel url: "https://pub.dartlang.org" source: hosted - version: "1.6.8" + version: "2.1.0" string_scanner: dependency: transitive description: name: string_scanner url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" + version: "1.1.0" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.0.1" + version: "1.2.0" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.1" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.6" + version: "0.4.9" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.2" video_player: dependency: "direct main" description: name: video_player url: "https://pub.dartlang.org" source: hosted - version: "0.8.0" + version: "2.4.7" + video_player_android: + dependency: transitive + description: + name: video_player_android + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.9" + video_player_avfoundation: + dependency: transitive + description: + name: video_player_avfoundation + url: "https://pub.dartlang.org" + source: hosted + version: "2.3.7" + video_player_platform_interface: + dependency: transitive + description: + name: video_player_platform_interface + url: "https://pub.dartlang.org" + source: hosted + version: "5.1.4" + video_player_web: + dependency: transitive + description: + name: video_player_web + url: "https://pub.dartlang.org" + source: hosted + version: "2.0.12" sdks: - dart: ">=2.0.0 <3.0.0" - flutter: ">=0.2.5 <2.0.0" + dart: ">=2.17.0-0 <3.0.0" + flutter: ">=2.10.0" diff --git a/pubspec.yaml b/pubspec.yaml index a3ec201..636bc9f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,15 +1,19 @@ name: AeologicSplashDemo description: A new Flutter application. +version: 1.0.0+1 + +environment: + sdk: ">=2.1.0 <3.0.0" + dependencies: flutter: sdk: flutter # The following adds the Cupertino Icons font to your application. # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^0.1.2 - video_player: ^0.8.0 - shared_preferences: "^0.4.2" + cupertino_icons: ^1.0.5 + video_player: ^2.4.7 dev_dependencies: flutter_test: diff --git a/test/widget_test.dart b/test/widget_test.dart index 20ea254..acced5b 100644 --- a/test/widget_test.dart +++ b/test/widget_test.dart @@ -7,12 +7,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_test/flutter_test.dart'; -import 'package:flutter_app/main.dart'; void main() { testWidgets('Counter increments smoke test', (WidgetTester tester) async { // Build our app and trigger a frame. - await tester.pumpWidget(new MyApp()); + // await tester.pumpWidget(); // Verify that our counter starts at 0. expect(find.text('0'), findsOneWidget);