diff --git a/android/app/build.gradle b/android/app/build.gradle index c79285f..ff1badc 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -27,9 +27,6 @@ apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { compileSdkVersion 28 - lintOptions { - disable 'InvalidPackage' - } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 9622e89..8c1be12 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -7,11 +7,10 @@ additional functionality it is fine to subclass or reimplement FlutterApplication and put your custom class here. --> + diff --git a/android/app/src/main/java/com/example/shimmer_effect/MainActivity.java b/android/app/src/main/java/com/example/shimmer_effect/MainActivity.java index a2d93fa..4e826bc 100644 --- a/android/app/src/main/java/com/example/shimmer_effect/MainActivity.java +++ b/android/app/src/main/java/com/example/shimmer_effect/MainActivity.java @@ -1,13 +1,9 @@ package com.example.shimmer_effect; import android.os.Bundle; -import io.flutter.app.FlutterActivity; +import io.flutter.embedding.android.FlutterActivity; import io.flutter.plugins.GeneratedPluginRegistrant; public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } + } diff --git a/android/gradle.properties b/android/gradle.properties index 8bd86f6..a673820 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -1 +1,4 @@ org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true +android.enableR8=true diff --git a/ios/Flutter/flutter_export_environment.sh b/ios/Flutter/flutter_export_environment.sh new file mode 100644 index 0000000..210f82f --- /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=C:\Users\NASHITHA\AppData\Local\Google\flutter" +export "FLUTTER_APPLICATION_PATH=C:\Users\NASHITHA\AndroidStudioProjects\Shimmer-Effect-Flutter" +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=true" +export "TREE_SHAKE_ICONS=false" +export "PACKAGE_CONFIG=.dart_tool/package_config.json" diff --git a/lib/main.dart b/lib/main.dart index 2decd4f..43b9279 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -44,7 +44,7 @@ class _DelayedListState extends State { isLoading = false; }); }); - + print("loading:$isLoading"); return isLoading ? ShimmerList() : DataList(timer); } } @@ -118,27 +118,29 @@ class ShimmerLayout extends StatelessWidget { width: 100, color: Colors.grey, ), - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Container( - height: containerHeight, - width: containerWidth, - color: Colors.grey, - ), - SizedBox(height: 5), - Container( - height: containerHeight, - width: containerWidth, - color: Colors.grey, - ), - SizedBox(height: 5), - Container( - height: containerHeight, - width: containerWidth * 0.75, - color: Colors.grey, - ) - ], + Flexible( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Container( + height: containerHeight, + width: containerWidth, + color: Colors.grey, + ), + SizedBox(height: 5), + Container( + height: containerHeight, + width: containerWidth, + color: Colors.grey, + ), + SizedBox(height: 5), + Container( + height: containerHeight, + width: containerWidth * 0.75, + color: Colors.grey, + ) + ], + ), ) ], ), diff --git a/pubspec.lock b/pubspec.lock index 9825f52..1fc9611 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,28 +7,35 @@ packages: name: async url: "https://pub.dartlang.org" source: hosted - version: "2.1.0" + version: "2.9.0" boolean_selector: dependency: transitive description: name: boolean_selector url: "https://pub.dartlang.org" source: hosted - version: "1.0.4" - charcode: + version: "2.1.0" + characters: dependency: transitive description: - name: charcode + name: characters url: "https://pub.dartlang.org" source: hosted - version: "1.1.2" + version: "1.2.1" + clock: + dependency: transitive + description: + name: clock + url: "https://pub.dartlang.org" + source: hosted + version: "1.1.1" collection: dependency: transitive description: name: collection url: "https://pub.dartlang.org" source: hosted - version: "1.14.11" + version: "1.16.0" cupertino_icons: dependency: "direct main" description: @@ -36,6 +43,13 @@ packages: url: "https://pub.dartlang.org" source: hosted version: "0.1.2" + fake_async: + dependency: transitive + description: + name: fake_async + url: "https://pub.dartlang.org" + source: hosted + version: "1.3.1" flutter: dependency: "direct main" description: flutter @@ -52,35 +66,28 @@ packages: name: matcher url: "https://pub.dartlang.org" source: hosted - version: "0.12.5" - meta: + version: "0.12.12" + material_color_utilities: dependency: transitive description: - name: meta + name: material_color_utilities url: "https://pub.dartlang.org" source: hosted - version: "1.1.6" - path: - dependency: transitive - description: - name: path - url: "https://pub.dartlang.org" - source: hosted - version: "1.6.2" - pedantic: + version: "0.1.5" + meta: dependency: transitive description: - name: pedantic + name: meta url: "https://pub.dartlang.org" source: hosted - version: "1.5.0" - quiver: + version: "1.8.0" + path: dependency: transitive description: - name: quiver + name: path url: "https://pub.dartlang.org" source: hosted - version: "2.0.2" + version: "1.8.2" shimmer: dependency: "direct main" description: @@ -99,55 +106,48 @@ packages: name: source_span url: "https://pub.dartlang.org" source: hosted - version: "1.5.5" + version: "1.9.0" 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: "2.0.0" + 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.1" term_glyph: dependency: transitive description: name: term_glyph url: "https://pub.dartlang.org" source: hosted - version: "1.1.0" + version: "1.2.1" test_api: dependency: transitive description: name: test_api url: "https://pub.dartlang.org" source: hosted - version: "0.2.4" - typed_data: - dependency: transitive - description: - name: typed_data - url: "https://pub.dartlang.org" - source: hosted - version: "1.1.6" + version: "0.4.12" vector_math: dependency: transitive description: name: vector_math url: "https://pub.dartlang.org" source: hosted - version: "2.0.8" + version: "2.1.2" sdks: - dart: ">=2.2.0 <3.0.0" + dart: ">=2.17.0-0 <3.0.0"