Add flutter 3+ support. Update dependencies. Fix code style and format issues.
This commit is contained in:
@@ -3,13 +3,14 @@ import 'package:thingsboard_app/core/entity/entity_details_page.dart';
|
||||
import 'package:thingsboard_client/thingsboard_client.dart';
|
||||
|
||||
class TenantDetailsPage extends ContactBasedDetailsPage<Tenant> {
|
||||
|
||||
TenantDetailsPage(TbContext tbContext, String tenantId):
|
||||
super(tbContext, entityId: tenantId, defaultTitle: 'Tenant', subTitle: 'Tenant details');
|
||||
TenantDetailsPage(TbContext tbContext, String tenantId)
|
||||
: super(tbContext,
|
||||
entityId: tenantId,
|
||||
defaultTitle: 'Tenant',
|
||||
subTitle: 'Tenant details');
|
||||
|
||||
@override
|
||||
Future<Tenant?> fetchEntity(String tenantId) {
|
||||
return tbClient.getTenantService().getTenant(tenantId);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -6,13 +6,14 @@ import 'tenant_details_page.dart';
|
||||
import 'tenants_page.dart';
|
||||
|
||||
class TenantRoutes extends TbRoutes {
|
||||
|
||||
late var tenantsHandler = Handler(handlerFunc: (BuildContext? context, Map<String, dynamic> params) {
|
||||
late var tenantsHandler = Handler(
|
||||
handlerFunc: (BuildContext? context, Map<String, dynamic> params) {
|
||||
var searchMode = params['search']?.first == 'true';
|
||||
return TenantsPage(tbContext, searchMode: searchMode);
|
||||
});
|
||||
|
||||
late var tenantDetailsHandler = Handler(handlerFunc: (BuildContext? context, Map<String, dynamic> params) {
|
||||
late var tenantDetailsHandler = Handler(
|
||||
handlerFunc: (BuildContext? context, Map<String, dynamic> params) {
|
||||
return TenantDetailsPage(tbContext, params["id"][0]);
|
||||
});
|
||||
|
||||
@@ -23,5 +24,4 @@ class TenantRoutes extends TbRoutes {
|
||||
router.define("/tenants", handler: tenantsHandler);
|
||||
router.define("/tenant/:id", handler: tenantDetailsHandler);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
import 'package:thingsboard_app/core/entity/entities_base.dart';
|
||||
import 'package:thingsboard_client/thingsboard_client.dart';
|
||||
|
||||
mixin TenantsBase on EntitiesBase<Tenant, PageLink> {
|
||||
|
||||
mixin TenantsBase on EntitiesBase<Tenant, PageLink> {
|
||||
@override
|
||||
String get title => 'Tenants';
|
||||
|
||||
@@ -18,5 +17,4 @@ mixin TenantsBase on EntitiesBase<Tenant, PageLink> {
|
||||
void onEntityTap(Tenant tenant) {
|
||||
navigateTo('/tenant/${tenant.id!.id}');
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -5,8 +5,10 @@ import 'package:thingsboard_client/thingsboard_client.dart';
|
||||
|
||||
import 'tenants_base.dart';
|
||||
|
||||
class TenantsList extends BaseEntitiesWidget<Tenant, PageLink> with TenantsBase, ContactBasedBase, EntitiesListStateBase {
|
||||
|
||||
TenantsList(TbContext tbContext, PageKeyController<PageLink> pageKeyController, {searchMode = false}) : super(tbContext, pageKeyController, searchMode: searchMode);
|
||||
|
||||
class TenantsList extends BaseEntitiesWidget<Tenant, PageLink>
|
||||
with TenantsBase, ContactBasedBase, EntitiesListStateBase {
|
||||
TenantsList(
|
||||
TbContext tbContext, PageKeyController<PageLink> pageKeyController,
|
||||
{searchMode = false})
|
||||
: super(tbContext, pageKeyController, searchMode: searchMode);
|
||||
}
|
||||
|
||||
@@ -7,23 +7,22 @@ import 'package:thingsboard_app/widgets/tb_app_bar.dart';
|
||||
import 'tenants_list.dart';
|
||||
|
||||
class TenantsPage extends TbPageWidget {
|
||||
|
||||
final bool searchMode;
|
||||
|
||||
TenantsPage(TbContext tbContext, {this.searchMode = false}) : super(tbContext);
|
||||
TenantsPage(TbContext tbContext, {this.searchMode = false})
|
||||
: super(tbContext);
|
||||
|
||||
@override
|
||||
_TenantsPageState createState() => _TenantsPageState();
|
||||
|
||||
}
|
||||
|
||||
class _TenantsPageState extends TbPageState<TenantsPage> {
|
||||
|
||||
final PageLinkController _pageLinkController = PageLinkController();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
var tenantsList = TenantsList(tbContext, _pageLinkController, searchMode: widget.searchMode);
|
||||
var tenantsList = TenantsList(tbContext, _pageLinkController,
|
||||
searchMode: widget.searchMode);
|
||||
PreferredSizeWidget appBar;
|
||||
if (widget.searchMode) {
|
||||
appBar = TbAppSearchBar(
|
||||
@@ -31,24 +30,16 @@ class _TenantsPageState extends TbPageState<TenantsPage> {
|
||||
onSearch: (searchText) => _pageLinkController.onSearchText(searchText),
|
||||
);
|
||||
} else {
|
||||
appBar = TbAppBar(
|
||||
tbContext,
|
||||
title: Text(tenantsList.title),
|
||||
actions: [
|
||||
IconButton(
|
||||
icon: Icon(
|
||||
Icons.search
|
||||
),
|
||||
onPressed: () {
|
||||
navigateTo('/tenants?search=true');
|
||||
},
|
||||
)
|
||||
]);
|
||||
appBar = TbAppBar(tbContext, title: Text(tenantsList.title), actions: [
|
||||
IconButton(
|
||||
icon: Icon(Icons.search),
|
||||
onPressed: () {
|
||||
navigateTo('/tenants?search=true');
|
||||
},
|
||||
)
|
||||
]);
|
||||
}
|
||||
return Scaffold(
|
||||
appBar: appBar,
|
||||
body: tenantsList
|
||||
);
|
||||
return Scaffold(appBar: appBar, body: tenantsList);
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -56,5 +47,4 @@ class _TenantsPageState extends TbPageState<TenantsPage> {
|
||||
_pageLinkController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -6,21 +6,18 @@ import 'package:thingsboard_app/core/entity/entities_base.dart';
|
||||
import 'tenants_list.dart';
|
||||
|
||||
class TenantsWidget extends TbContextWidget {
|
||||
|
||||
TenantsWidget(TbContext tbContext) : super(tbContext);
|
||||
|
||||
@override
|
||||
_TenantsWidgetState createState() => _TenantsWidgetState();
|
||||
|
||||
}
|
||||
|
||||
class _TenantsWidgetState extends TbContextState<TenantsWidget> {
|
||||
|
||||
final PageLinkController _pageLinkController = PageLinkController();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return TenantsList(tbContext, _pageLinkController);
|
||||
return TenantsList(tbContext, _pageLinkController);
|
||||
}
|
||||
|
||||
@override
|
||||
@@ -28,5 +25,4 @@ class _TenantsWidgetState extends TbContextState<TenantsWidget> {
|
||||
_pageLinkController.dispose();
|
||||
super.dispose();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user