ammar/syncrow-app
1
0
Fork 0
mirror of https://github.com/SyncrowIOT/syncrow-app.git synced 2025-08-26 07:49:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

showSpaceBottomSheet in a DefaultAppBar and Routine trigger from the device screen

Browse Source 
and fixes github comments
and i used this package flutter_html: ^3.0.0-beta.2
This commit is contained in:
mohammad
2025-01-20 15:50:36 +03:00
parent bcc4ba98ff
commit de024994c9
7 changed files with 211 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/build.gradle
View File

@ -1,5 +1,5 @@
buildscript { buildscript {
ext.kotlin_version = '1.9.23' ext.kotlin_version = '1.7.10'
repositories { repositories {
google() google()
mavenCentral() mavenCentral()

104
lib/features/app_layout/view/widgets/default_app_bar.dart
View File

@ -1,7 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_svg/svg.dart';
import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart'; import 'package:syncrow_app/features/app_layout/bloc/home_cubit.dart';
import 'package:syncrow_app/features/app_layout/model/space_model.dart';
import 'package:syncrow_app/generated/assets.dart';
import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
import 'package:syncrow_app/utils/resource_manager/constants.dart'; import 'package:syncrow_app/utils/resource_manager/constants.dart';
class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget { class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
@ -19,10 +22,21 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
backgroundColor: Colors.transparent, backgroundColor: Colors.transparent,
leadingWidth: 200, leadingWidth: 200,
toolbarHeight: Constants.appBarHeight, toolbarHeight: Constants.appBarHeight,
leading: HomeCubit.getInstance().spaces!.isNotEmpty leading: InkWell(
? HomeCubit.appBarLeading[HomeCubit.bottomNavItems[HomeCubit.pageIndex].label]! onTap: () {
: null, final spaces = HomeCubit.getInstance().spaces!;
actions: HomeCubit.appBarActions[HomeCubit.bottomNavItems[HomeCubit.pageIndex].label], showSpaceBottomSheet(context, spaces);
},
child: HomeCubit.getInstance().spaces!.isNotEmpty
? AbsorbPointer(
absorbing: true,
child: HomeCubit.appBarLeading[HomeCubit
.bottomNavItems[HomeCubit.pageIndex].label]!,
)
: null,
),
actions: HomeCubit.appBarActions[
HomeCubit.bottomNavItems[HomeCubit.pageIndex].label],
)); ));
}, },
); );
@ -31,3 +45,83 @@ class DefaultAppBar extends StatelessWidget implements PreferredSizeWidget {
@override @override
Size get preferredSize => Size.fromHeight(Constants.appBarHeight); Size get preferredSize => Size.fromHeight(Constants.appBarHeight);
} }
void showSpaceBottomSheet(BuildContext context, List<SpaceModel> spaces) {
showModalBottomSheet(
isScrollControlled: true,
context: context,
builder: (BuildContext context) {
return StatefulBuilder(
builder: (BuildContext context, StateSetter setModalState) {
String? selectedSpaceId = HomeCubit.getInstance().selectedSpace?.id;
final bool shouldLimitHeight = spaces.length > 5;
return Container(
constraints: shouldLimitHeight
? BoxConstraints(
maxHeight: MediaQuery.of(context).size.height * 0.5,
)
: const BoxConstraints(),
child: SingleChildScrollView(
child: Column(
children: [
const SizedBox(height: 10),
Container(
decoration: const BoxDecoration(color: Colors.black12),
height: 5,
width: 50,
),
ListView.separated(
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
itemCount: spaces.length,
itemBuilder: (BuildContext context, int index) {
final space = spaces[index];
return Padding(
padding: const EdgeInsets.only(left: 30, right: 30),
child: Row(
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.spaceBetween,
children: [
Row(
children: [
Text(space.name),
],
),
Radio<String>(
value: space.id,
groupValue: selectedSpaceId,
onChanged: (String? newValue) {
if (newValue != null) {
setModalState(() {
selectedSpaceId = newValue;
});
HomeCubit.getInstance().changeSelectedSpace(
spaces.firstWhere((s) => s.id == newValue),
);
Navigator.of(context).pop();
}
},
),
],
),
);
},
separatorBuilder: (BuildContext context, int index) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 50),
child: const Divider(
color: Colors.grey,
thickness: 0.5,
),
);
},
),
],
),
),
);
},
);
},
);
}

82
lib/features/auth/view/sign_up_view.dart
View File

@ -11,6 +11,7 @@ import 'package:syncrow_app/features/shared_widgets/text_widgets/title_medium.da
import 'package:syncrow_app/generated/assets.dart'; import 'package:syncrow_app/generated/assets.dart';
import 'package:syncrow_app/navigation/routing_constants.dart'; import 'package:syncrow_app/navigation/routing_constants.dart';
import 'package:syncrow_app/utils/context_extension.dart'; import 'package:syncrow_app/utils/context_extension.dart';
import 'package:syncrow_app/utils/resource_manager/color_manager.dart';
import 'package:syncrow_app/utils/resource_manager/constants.dart'; import 'package:syncrow_app/utils/resource_manager/constants.dart';
import 'package:syncrow_app/utils/resource_manager/font_manager.dart'; import 'package:syncrow_app/utils/resource_manager/font_manager.dart';
import 'package:syncrow_app/utils/resource_manager/styles_manager.dart'; import 'package:syncrow_app/utils/resource_manager/styles_manager.dart';
@ -212,11 +213,14 @@ class SignUpView extends StatelessWidget {
TextSpan( TextSpan(
text: text:
'By signing up you agree to our ', 'By signing up you agree to our ',
style: const TextStyle( style: Theme.of(context)
color: Colors.white, .textTheme
fontSize: 14, .bodyMedium!
fontWeight: FontWeight.w400, .copyWith(
), fontSize: 16,
color: ColorsManager
.onPrimaryColor,
),
children: [ children: [
WidgetSpan( WidgetSpan(
child: GestureDetector( child: GestureDetector(
@ -227,27 +231,34 @@ class SignUpView extends StatelessWidget {
const UserAgreement(), const UserAgreement(),
)); ));
}, },
child: const Text( child: BodyMedium(
'Terms & Conditions', text: 'Terms & Conditions',
style: TextStyle( style: Theme.of(context)
fontSize: 16, .textTheme
color: Colors.white, .bodyMedium
fontWeight: FontWeight.w400, ?.copyWith(
decoration: TextDecoration decoration:
.underline, TextDecoration
decorationColor: .underline,
Colors.white, decorationColor:
), ColorsManager
.onPrimaryColor,
color: ColorsManager
.onPrimaryColor,
fontSize: 16),
), ),
), ),
), ),
const TextSpan( TextSpan(
text: ' and ', text: ' and ',
style: TextStyle( style: Theme.of(context)
fontWeight: FontWeight.w400, .textTheme
fontSize: 16, .bodyMedium!
color: Colors.white), .copyWith(
), fontSize: 16,
color: ColorsManager
.onPrimaryColor,
)),
WidgetSpan( WidgetSpan(
child: GestureDetector( child: GestureDetector(
onTap: () { onTap: () {
@ -257,17 +268,20 @@ class SignUpView extends StatelessWidget {
const PrivacyPolicy(), const PrivacyPolicy(),
)); ));
}, },
child: const Text( child: BodyMedium(
'Privacy Policy', text: 'Privacy Policy',
style: TextStyle( style: Theme.of(context)
fontSize: 16, .textTheme
color: Colors.white, .bodySmall
fontWeight: FontWeight.w400, ?.copyWith(
decoration: TextDecoration decoration:
.underline, TextDecoration
decorationColor: .underline,
Colors.white, decorationColor:
), Colors.white,
color: ColorsManager
.onPrimaryColor,
fontSize: 16),
), ),
), ),
), ),

45
lib/features/devices/view/widgets/scene_listview.dart
View File

@ -1,14 +1,11 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:syncrow_app/features/scene/bloc/create_scene/create_scene_bloc.dart'; import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_bloc.dart';
import 'package:syncrow_app/features/scene/bloc/smart_scene/smart_scene_select_dart_bloc.dart'; import 'package:syncrow_app/features/scene/bloc/scene_bloc/scene_event.dart';
import 'package:syncrow_app/features/scene/enum/create_scene_enum.dart';
import 'package:syncrow_app/features/scene/model/scene_settings_route_arguments.dart';
import 'package:syncrow_app/features/scene/model/scenes_model.dart'; import 'package:syncrow_app/features/scene/model/scenes_model.dart';
import 'package:syncrow_app/features/shared_widgets/default_container.dart'; import 'package:syncrow_app/features/shared_widgets/default_container.dart';
import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart'; import 'package:syncrow_app/features/shared_widgets/text_widgets/body_medium.dart';
import 'package:syncrow_app/generated/assets.dart'; import 'package:syncrow_app/generated/assets.dart';
import 'package:syncrow_app/navigation/routing_constants.dart';
class SceneListview extends StatelessWidget { class SceneListview extends StatelessWidget {
final List<ScenesModel> scenes; final List<ScenesModel> scenes;
@ -31,23 +28,28 @@ class SceneListview extends StatelessWidget {
padding: const EdgeInsets.only(right: 10), padding: const EdgeInsets.only(right: 10),
child: DefaultContainer( child: DefaultContainer(
onTap: () { onTap: () {
Navigator.pushNamed( context
context, .read<SceneBloc>()
Routes.sceneTasksRoute, .add(SceneTrigger(scene.id, scene.name));
arguments: SceneSettingsRouteArguments( // Navigator.pushNamed(
sceneType: CreateSceneEnum.tabToRun.name, // context,
sceneId: scene.id, // Routes.sceneTasksRoute,
sceneName: scene.name, // arguments: SceneSettingsRouteArguments(
), // sceneType: CreateSceneEnum.tabToRun.name,
); // sceneId: scene.id,
context.read<SmartSceneSelectBloc>().add(const SmartSceneClearEvent()); // sceneName: scene.name,
// ),
// );
// context.read<SmartSceneSelectBloc>()
// .add(const SmartSceneClearEvent());
BlocProvider.of<CreateSceneBloc>(context) // BlocProvider.of<CreateSceneBloc>(context).add(
.add(FetchSceneTasksEvent(sceneId: scene.id, isAutomation: false)); // FetchSceneTasksEvent(
// sceneId: scene.id, isAutomation: false));
/// the state to set the scene type must be after the fetch // /// the state to set the scene type must be after the fetch
BlocProvider.of<CreateSceneBloc>(context) // BlocProvider.of<CreateSceneBloc>(context)
.add(const SceneTypeEvent(CreateSceneEnum.tabToRun)); // .add(const SceneTypeEvent(CreateSceneEnum.tabToRun));
}, },
child: SizedBox( child: SizedBox(
width: MediaQuery.of(context).size.width * 0.4, width: MediaQuery.of(context).size.width * 0.4,
@ -62,7 +64,8 @@ class SceneListview extends StatelessWidget {
height: 32, height: 32,
width: 32, width: 32,
fit: BoxFit.fill, fit: BoxFit.fill,
errorBuilder: (context, error, stackTrace) => Image.asset( errorBuilder: (context, error, stackTrace) =>
Image.asset(
Assets.assetsIconsLogo, Assets.assetsIconsLogo,
height: 32, height: 32,
width: 32, width: 32,

28
lib/features/menu/bloc/privacy_policy.dart
View File

@ -1,17 +1,26 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_widget_from_html/flutter_widget_from_html.dart'; import 'package:flutter_html/flutter_html.dart';
import 'package:syncrow_app/features/menu/bloc/menu_cubit.dart'; import 'package:syncrow_app/features/menu/bloc/menu_cubit.dart';
import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart'; import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
class PrivacyPolicy extends StatelessWidget { class PrivacyPolicy extends StatefulWidget {
const PrivacyPolicy({super.key}); const PrivacyPolicy({super.key});
@override
_PrivacyPolicyState createState() => _PrivacyPolicyState();
}
class _PrivacyPolicyState extends State<PrivacyPolicy> {
@override
void initState() {
super.initState();
MenuCubit.of(context).fetchPrivacyPolicy();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final menuCubit = MenuCubit.of(context);
menuCubit.fetchPrivacyPolicy();
return DefaultScaffold( return DefaultScaffold(
title: 'Privacy Policy', title: 'Privacy Policy',
child: BlocBuilder<MenuCubit, MenuState>( child: BlocBuilder<MenuCubit, MenuState>(
@ -21,12 +30,13 @@ class PrivacyPolicy extends StatelessWidget {
} else if (state is MenuLoaded) { } else if (state is MenuLoaded) {
return ListView( return ListView(
children: [ children: [
HtmlWidget( Html(
state.userAgreementHtml, data: state.userAgreementHtml.isNotEmpty
onTapUrl: (url) async { ? state.userAgreementHtml
final uri = Uri.parse(url); : '',
onLinkTap: (url, attributes, element) async {
final uri = Uri.parse(url!);
await launchUrl(uri, mode: LaunchMode.externalApplication); await launchUrl(uri, mode: LaunchMode.externalApplication);
return true;
}, },
), ),
], ],

29
lib/features/menu/bloc/user_agreement.dart
View File

@ -1,17 +1,26 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flutter_widget_from_html/flutter_widget_from_html.dart'; import 'package:flutter_html/flutter_html.dart';
import 'package:syncrow_app/features/menu/bloc/menu_cubit.dart'; import 'package:syncrow_app/features/menu/bloc/menu_cubit.dart';
import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart'; import 'package:syncrow_app/features/shared_widgets/default_scaffold.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
class UserAgreement extends StatelessWidget { class UserAgreement extends StatefulWidget {
const UserAgreement({super.key}); const UserAgreement({super.key});
@override
_UserAgreementState createState() => _UserAgreementState();
}
class _UserAgreementState extends State<UserAgreement> {
@override
void initState() {
super.initState();
MenuCubit.of(context).fetchAgreement();
}
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
final menuCubit = MenuCubit.of(context);
menuCubit.fetchAgreement();
return DefaultScaffold( return DefaultScaffold(
title: 'User Agreement', title: 'User Agreement',
child: BlocBuilder<MenuCubit, MenuState>( child: BlocBuilder<MenuCubit, MenuState>(
@ -21,13 +30,13 @@ class UserAgreement extends StatelessWidget {
} else if (state is MenuLoaded) { } else if (state is MenuLoaded) {
return ListView( return ListView(
children: [ children: [
HtmlWidget( Html(
state data: state.userAgreementHtml.isNotEmpty
.userAgreementHtml, ? state.userAgreementHtml
onTapUrl: (url) async { : '',
final uri = Uri.parse(url); onLinkTap: (url, attributes, element) async {
final uri = Uri.parse(url!);
await launchUrl(uri, mode: LaunchMode.externalApplication); await launchUrl(uri, mode: LaunchMode.externalApplication);
return true;
}, },
), ),
], ],

3
pubspec.yaml
View File

@ -47,8 +47,7 @@ dependencies:
fl_chart: ^0.69.0 fl_chart: ^0.69.0
firebase_database: ^10.5.7 firebase_database: ^10.5.7
percent_indicator: ^4.2.3 percent_indicator: ^4.2.3
flutter_widget_from_html: ^0.15.3 flutter_html: ^3.0.0-beta.2
dev_dependencies: dev_dependencies: