Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Migration/flutter 3.13.4 #93

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions example/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
buildscript {
ext.kotlin_version = '1.3.50'
ext.kotlin_version = '1.9.10'
repositories {
google()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath 'com.android.tools.build:gradle:7.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down
2 changes: 1 addition & 1 deletion example/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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-5.6.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
6 changes: 2 additions & 4 deletions example/lib/basic_example.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:drag_and_drop_lists/drag_and_drop_item.dart';
import 'package:drag_and_drop_lists/drag_and_drop_lists.dart';
import 'package:example/navigation_drawer.dart';
import 'package:example/navigation_drawer.dart' as drawer;
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

class BasicExample extends StatefulWidget {
BasicExample({Key? key}) : super(key: key);
Expand Down Expand Up @@ -57,7 +55,7 @@ class _BasicExample extends State<BasicExample> {
appBar: AppBar(
title: Text('Basic'),
),
drawer: NavigationDrawer(),
drawer: drawer.NavigationDrawer(),
body: DragAndDropLists(
children: _contents,
onItemReorder: _onItemReorder,
Expand Down
6 changes: 2 additions & 4 deletions example/lib/drag_handle_example.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:drag_and_drop_lists/drag_and_drop_lists.dart';
import 'package:example/navigation_drawer.dart';
import 'package:example/navigation_drawer.dart' as drawer;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart';

class DragHandleExample extends StatefulWidget {
DragHandleExample({Key? key}) : super(key: key);
Expand Down Expand Up @@ -86,7 +84,7 @@ class _DragHandleExample extends State<DragHandleExample> {
appBar: AppBar(
title: Text('Drag Handle'),
),
drawer: NavigationDrawer(),
drawer: drawer.NavigationDrawer(),
body: DragAndDropLists(
children: _contents,
onItemReorder: _onItemReorder,
Expand Down
6 changes: 2 additions & 4 deletions example/lib/drag_into_list_example.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
import 'package:drag_and_drop_lists/drag_and_drop_item.dart';
import 'package:drag_and_drop_lists/drag_and_drop_list_interface.dart';
import 'package:drag_and_drop_lists/drag_and_drop_lists.dart';
import 'package:example/navigation_drawer.dart';
import 'package:example/navigation_drawer.dart' as drawer;
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

class DragIntoListExample extends StatefulWidget {
DragIntoListExample({Key? key}) : super(key: key);
Expand All @@ -21,7 +19,7 @@ class _DragIntoListExample extends State<DragIntoListExample> {
appBar: AppBar(
title: Text('Drag Into List'),
),
drawer: NavigationDrawer(),
drawer: drawer.NavigationDrawer(),
body: Column(
children: <Widget>[
Flexible(
Expand Down
7 changes: 2 additions & 5 deletions example/lib/expansion_tile_example.dart
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import 'package:drag_and_drop_lists/drag_and_drop_list_expansion.dart';
import 'package:drag_and_drop_lists/drag_and_drop_lists.dart';
import 'package:example/navigation_drawer.dart';
import 'package:example/navigation_drawer.dart' as drawer;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart';

class ExpansionTileExample extends StatefulWidget {
ExpansionTileExample({Key? key}) : super(key: key);
Expand Down Expand Up @@ -39,7 +36,7 @@ class _ListTileExample extends State<ExpansionTileExample> {
appBar: AppBar(
title: Text('Expansion Tiles'),
),
drawer: NavigationDrawer(),
drawer: drawer.NavigationDrawer(),
body: DragAndDropLists(
children: List.generate(_lists.length, (index) => _buildList(index)),
onItemReorder: _onItemReorder,
Expand Down
6 changes: 2 additions & 4 deletions example/lib/fixed_example.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:drag_and_drop_lists/drag_and_drop_item.dart';
import 'package:drag_and_drop_lists/drag_and_drop_lists.dart';
import 'package:example/navigation_drawer.dart';
import 'package:example/navigation_drawer.dart' as drawer;
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

class FixedExample extends StatefulWidget {
FixedExample({Key? key}) : super(key: key);
Expand Down Expand Up @@ -61,7 +59,7 @@ class _FixedExample extends State<FixedExample> {
appBar: AppBar(
title: Text('Fixed Items'),
),
drawer: NavigationDrawer(),
drawer: drawer.NavigationDrawer(),
body: DragAndDropLists(
children: _contents,
onItemReorder: _onItemReorder,
Expand Down
10 changes: 4 additions & 6 deletions example/lib/horizontal_example.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:drag_and_drop_lists/drag_and_drop_item.dart';
import 'package:drag_and_drop_lists/drag_and_drop_lists.dart';
import 'package:example/navigation_drawer.dart';
import 'package:example/navigation_drawer.dart' as drawer;
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

class HorizontalExample extends StatefulWidget {
HorizontalExample({Key? key}) : super(key: key);
Expand Down Expand Up @@ -38,7 +36,7 @@ class _HorizontalExample extends State<HorizontalExample> {
appBar: AppBar(
title: Text('Horizontal'),
),
drawer: NavigationDrawer(),
drawer: drawer.NavigationDrawer(),
body: DragAndDropLists(
children: List.generate(_lists.length, (index) => _buildList(index)),
onItemReorder: _onItemReorder,
Expand Down Expand Up @@ -77,7 +75,7 @@ class _HorizontalExample extends State<HorizontalExample> {
padding: EdgeInsets.all(10),
child: Text(
'Header ${innerList.name}',
style: Theme.of(context).primaryTextTheme.headline6,
style: Theme.of(context).primaryTextTheme.titleLarge,
),
),
),
Expand All @@ -95,7 +93,7 @@ class _HorizontalExample extends State<HorizontalExample> {
padding: EdgeInsets.all(10),
child: Text(
'Footer ${innerList.name}',
style: Theme.of(context).primaryTextTheme.headline6,
style: Theme.of(context).primaryTextTheme.titleLarge,
),
),
),
Expand Down
6 changes: 2 additions & 4 deletions example/lib/list_tile_example.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:drag_and_drop_lists/drag_and_drop_lists.dart';
import 'package:example/navigation_drawer.dart';
import 'package:example/navigation_drawer.dart' as drawer;
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:flutter/widgets.dart';

class ListTileExample extends StatefulWidget {
ListTileExample({Key? key}) : super(key: key);
Expand Down Expand Up @@ -78,7 +76,7 @@ class _ListTileExample extends State<ListTileExample> {
appBar: AppBar(
title: Text('List Tiles'),
),
drawer: NavigationDrawer(),
drawer: drawer.NavigationDrawer(),
body: DragAndDropLists(
children: _contents,
onItemReorder: _onItemReorder,
Expand Down
1 change: 0 additions & 1 deletion example/lib/navigation_drawer.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

class NavigationDrawer extends StatelessWidget {
@override
Expand Down
8 changes: 3 additions & 5 deletions example/lib/sliver_example.dart
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
import 'package:drag_and_drop_lists/drag_and_drop_item.dart';
import 'package:drag_and_drop_lists/drag_and_drop_lists.dart';
import 'package:example/navigation_drawer.dart';
import 'package:example/navigation_drawer.dart' as drawer;
import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';

class SliverExample extends StatefulWidget {
SliverExample({Key? key}) : super(key: key);
Expand Down Expand Up @@ -63,7 +61,7 @@ class _SliverExample extends State<SliverExample> {
@override
Widget build(BuildContext context) {
return Scaffold(
drawer: NavigationDrawer(),
drawer: drawer.NavigationDrawer(),
body: CustomScrollView(
controller: _scrollController,
slivers: <Widget>[
Expand All @@ -75,7 +73,7 @@ class _SliverExample extends State<SliverExample> {
alignment: Alignment.bottomCenter,
child: Text(
'Slivers',
style: Theme.of(context).primaryTextTheme.headline1,
style: Theme.of(context).primaryTextTheme.displayLarge,
),
),
),
Expand Down
Loading