resolve conflit
This commit is contained in:
@@ -1,10 +1,8 @@
|
||||
import 'package:fcs/domain/entities/box.dart';
|
||||
import 'package:fcs/pages/main/util.dart';
|
||||
import 'package:fcs/pages/widgets/bottom_up_page_route.dart';
|
||||
import 'package:flutter/cupertino.dart';
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:intl/intl.dart';
|
||||
|
||||
import 'box_editor.dart';
|
||||
import 'box_info.dart';
|
||||
|
||||
class BoxListRow extends StatefulWidget {
|
||||
@@ -35,7 +33,7 @@ class _BoxListRowState extends State<BoxListRow> {
|
||||
onTap: () {
|
||||
Navigator.push(
|
||||
context,
|
||||
BottomUpPageRoute(BoxInfo(box: _box)),
|
||||
CupertinoPageRoute(builder: (context) => BoxInfo(box: _box)),
|
||||
);
|
||||
},
|
||||
child: Row(
|
||||
|
||||
Reference in New Issue
Block a user