Merge branch 'release/v2.1.0'

cytryn · Nov 4, 2019 · 4cf6870 · 4cf6870
2 parents 1f32d69 + f5345c9
commit 4cf6870
Show file tree

Hide file tree

Showing 29 changed files with 1,856 additions and 58 deletions.
diff --git a/.github/stale.yml b/.github/stale.yml
@@ -0,0 +1,17 @@
+# Number of days of inactivity before an issue becomes stale
+daysUntilStale: 21
+# Number of days of inactivity before a stale issue is closed
+daysUntilClose: 14
+# Issues with these labels will never be considered stale
+exemptLabels:
+  - pinned
+  - security
+# Label to use when marking an issue as stale
+staleLabel: wontfix
+# Comment to post when marking an issue as stale. Set to `false` to disable
+markComment: >
+  This issue has been automatically marked as stale because it has not had
+  recent activity. It will be closed if no further activity occurs. Thank you
+  for your contributions.
+# Comment to post when closing a stale issue. Set to `false` to disable
+closeComment: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+## [2.1.0] - New Animations
+
+### Animations
+
+Added 4 more animations:
+- Bouncing Line
+  - LoadingBouncingLine.circle()
+  - LoadingBouncingLine.square()
+- Bumping Line
+  - LoadingBumpingLine.circle()
+  - LoadingBumpingLine.square()
+- Fading Line
+  - LoadingFadingLine.circle()
+  - LoadingFadingLine.square()
+- Jumping Line
+  - LoadingJumpingLine.circle()
+  - LoadingJumpingLine.circle()
+
+### Example project
+
+Added all the new animations to the example project.
+
+
 ## [2.0.0] - Renaming convention
 
 ### Breaking changes:

diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Add the following to your `pubspec.yaml` file:
 ...
 dependencies:
   ...
-  loading_animations: "^2.0.0"
+  loading_animations: "^2.1.0"
 ...
 ```
 
@@ -22,17 +22,31 @@ import 'package:loading_animations/loading_animations.dart';
 ## How to use
 
 Choose a loading animation from the list:
-### LoadingFlipping
+### Flipping
 - `LoadingFlipping.circle()`
 - `LoadingFlipping.square()`
-### LoadingRotating
+### Rotating
 - `LoadingRotating.square()`
-### LoadingDoubleFlipping
+### Double Flipping
 - `LoadingDoubleFlipping.circle()`
 - `LoadingDoubleFlipping.square()`
-### LoadingBouncingGrid
+### Bouncing Grid
 - `LoadingBouncingGrid.circle()`
 - `LoadingBouncingGrid.square()`
+### Filling
+- `LoadingFilling.square()`
+### Fading Line
+- `LoadingFadingLine.circle()`
+- `LoadingFadingLine.square()`
+### Bouncing Line
+- `LoadingBouncingLine.circle()`
+- `LoadingBouncingLine.square()`
+### Jumping Line
+- `LoadingJumpingLine.circle()`
+- `LoadingJumpingLine.square()`
+### Bumping Line
+- `LoadingBumpingLine.circle()`
+- `LoadingBumpingLine.square()`
 
 
 Then add the following code:
@@ -59,15 +73,15 @@ LoadingFlipping.circle(
 );
 ```
 
-For more customization, please look inside the loading animaton files.
+For more customization, please look inside the loading animation files.
 
 Note: all the animations come ready to go just by calling `LoadingDoubleFlipping.square()`, for example.
 
 Many basic animations contain `.circle()` and `.square()` variations by default.
 
 ## Examples
 
-Note: the following gifs are not yet updated to reflect verison 2.0.0
+> Note: the following gifs are not yet updated to reflect version 2.1.0
 
 For a more true experience of the animations and its variations, download the example project and run using `flutter run --profile`.
 

diff --git a/example/ios/.gitignore b/example/ios/.gitignore
@@ -0,0 +1,32 @@
+*.mode1v3
+*.mode2v3
+*.moved-aside
+*.pbxuser
+*.perspectivev3
+**/*sync/
+.sconsign.dblite
+.tags*
+**/.vagrant/
+**/DerivedData/
+Icon?
+**/Pods/
+**/.symlinks/
+profile
+xcuserdata
+**/.generated/
+Flutter/App.framework
+Flutter/Flutter.framework
+Flutter/Flutter.podspec
+Flutter/Generated.xcconfig
+Flutter/app.flx
+Flutter/app.zip
+Flutter/flutter_assets/
+Flutter/flutter_export_environment.sh
+ServiceDefinitions.json
+Runner/GeneratedPluginRegistrant.*
+
+# Exceptions to above rules.
+!default.mode1v3
+!default.mode2v3
+!default.pbxuser
+!default.perspectivev3
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,12 +1,20 @@
+import 'package:flutter/material.dart';
+import 'package:loading_animations/loading_animations.dart';
+
+import 'package:example/tabs/bumping_line_circle_tab.dart';
+import 'package:example/tabs/bumping_line_square_tab.dart';
+import 'package:example/tabs/fading_line_circle_tab.dart';
+import 'package:example/tabs/fading_line_square_tab.dart';
+import 'package:example/tabs/jumping_line_circle_tab.dart';
+import 'package:example/tabs/jumping_line_square_tab.dart';
+import 'package:example/tabs/bouncing_line_circle_tab.dart';
+import 'package:example/tabs/bouncing_line_square_tab.dart';
 import 'package:example/tabs/bouncing_grid_circle_tab.dart';
 import 'package:example/tabs/bouncing_grid_square_tab.dart';
 import 'package:example/tabs/double_flipping_circle_tab.dart';
 import 'package:example/tabs/double_flipping_square_tab.dart';
 import 'package:example/tabs/filling_square_tab.dart';
 import 'package:example/tabs/rotating_square_tab.dart';
-import 'package:flutter/material.dart';
-
-import 'package:loading_animations/loading_animations.dart';
 import 'package:example/tabs/flipping_circle_tab.dart';
 import 'package:example/tabs/flipping_square_tab.dart';
 
@@ -21,7 +29,7 @@ class MyApp extends StatelessWidget {
         primarySwatch: Colors.blueGrey,
       ),
       home: DefaultTabController(
-        length: 8,
+        length: 16,
         child: Scaffold(
             appBar: AppBar(
               centerTitle: true,
@@ -31,6 +39,54 @@ class MyApp extends StatelessWidget {
                   isScrollable: true,
                   indicatorColor: Colors.white,
                   tabs: <Widget>[
+                    Tab(
+                      child: LoadingBumpingLine.circle(
+                        size: 30,
+                        backgroundColor: Colors.white,
+                      ),
+                    ),
+                    Tab(
+                      child: LoadingBumpingLine.square(
+                        size: 30,
+                        backgroundColor: Colors.white,
+                      ),
+                    ),
+                    Tab(
+                      child: LoadingFadingLine.circle(
+                        size: 30,
+                        backgroundColor: Colors.white,
+                      ),
+                    ),
+                    Tab(
+                      child: LoadingFadingLine.square(
+                        size: 30,
+                        backgroundColor: Colors.white,
+                      ),
+                    ),
+                    Tab(
+                      child: LoadingBouncingLine.circle(
+                        size: 30,
+                        backgroundColor: Colors.white,
+                      ),
+                    ),
+                    Tab(
+                      child: LoadingBouncingLine.square(
+                        size: 30,
+                        backgroundColor: Colors.white,
+                      ),
+                    ),
+                    Tab(
+                      child: LoadingJumpingLine.circle(
+                        size: 30,
+                        backgroundColor: Colors.white,
+                      ),
+                    ),
+                    Tab(
+                      child: LoadingJumpingLine.square(
+                        size: 30,
+                        backgroundColor: Colors.white,
+                      ),
+                    ),
                     Tab(
                       child: LoadingFlipping.circle(
                         size: 30,
@@ -86,6 +142,14 @@ class MyApp extends StatelessWidget {
             ),
             body: TabBarView(
               children: <Widget>[
+                BumpingLineCircleExample(),
+                BumpingLineSquareExample(),
+                FadingLineCircleExample(),
+                FadingLineSquareExample(),
+                BouncingLineCircleExample(),
+                BouncingLineSquareExample(),
+                JumpingLineCircleExample(),
+                JumpingLineSqaureExample(),
                 FlippingCircleExample(),
                 FlippingSquareExample(),
                 RotatingSquareExample(),

diff --git a/example/lib/tabs/bouncing_grid_circle_tab.dart b/example/lib/tabs/bouncing_grid_circle_tab.dart
@@ -46,22 +46,27 @@ class BouncingGridCircleExample extends StatelessWidget with RowBuilder {
               LoadingBouncingGrid.circle(
                 borderColor: Colors.cyan,
                 backgroundColor: Colors.transparent,
+                borderSize: 2,
               ),
               LoadingBouncingGrid.circle(
                 borderColor: Colors.blue,
                 backgroundColor: Colors.transparent,
+                borderSize: 3,
               ),
               LoadingBouncingGrid.circle(
                 borderColor: Colors.deepPurple,
                 backgroundColor: Colors.transparent,
+                borderSize: 5,
               ),
               LoadingBouncingGrid.circle(
                 borderColor: Colors.pink,
                 backgroundColor: Colors.transparent,
+                borderSize: 8,
               ),
               LoadingBouncingGrid.circle(
                 borderColor: Colors.deepOrange,
                 backgroundColor: Colors.transparent,
+                borderSize: 13,
               ),
             ],
           ),

diff --git a/example/lib/tabs/bouncing_grid_square_tab.dart b/example/lib/tabs/bouncing_grid_square_tab.dart
@@ -46,22 +46,27 @@ class BouncingGridSquareExample extends StatelessWidget with RowBuilder {
               LoadingBouncingGrid.square(
                 borderColor: Colors.cyan,
                 backgroundColor: Colors.transparent,
+                borderSize: 2,
               ),
               LoadingBouncingGrid.square(
                 borderColor: Colors.blue,
                 backgroundColor: Colors.transparent,
+                borderSize: 3,
               ),
               LoadingBouncingGrid.square(
                 borderColor: Colors.deepPurple,
                 backgroundColor: Colors.transparent,
+                borderSize: 5,
               ),
               LoadingBouncingGrid.square(
                 borderColor: Colors.pink,
                 backgroundColor: Colors.transparent,
+                borderSize: 8,
               ),
               LoadingBouncingGrid.square(
                 borderColor: Colors.deepOrange,
                 backgroundColor: Colors.transparent,
+                borderSize: 13,
               ),
             ],
           ),