Mr.Rahmani
/
didvan-app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

D1APP-30 time picker configured

This commit is contained in:
MohammadTaha Basiri 2021-12-26 17:40:22 +03:30
parent 63b5d17a7e
commit d6b902ff2a
8 changed files with 193 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/config/theme_data.dart
View File

@ -12,6 +12,7 @@ class LightThemeConfig {
colorScheme: _colorScheme,
fontFamily: 'Dana-FA',
textTheme: _textTheme,
cardColor: _colorScheme.surface,
);
static final TextTheme _textTheme = const TextTheme(
@ -84,6 +85,7 @@ class DarkThemeConfig {
iconTheme: const IconThemeData(
color: text,
),
cardColor: _colorScheme.surface,
);
static final TextTheme _textTheme = const TextTheme(

3
lib/main.dart
View File

@ -10,6 +10,8 @@ void main() {
runApp(const Didvan());
}
final GlobalKey<NavigatorState> navigatorKey = GlobalKey<NavigatorState>();
class Didvan extends StatelessWidget {
const Didvan({Key? key}) : super(key: key);
@override
@ -25,6 +27,7 @@ class Didvan extends StatelessWidget {
],
child: Consumer<ThemeProvider>(
builder: (context, themeProvider, child) => MaterialApp(
navigatorKey: navigatorKey,
debugShowCheckedModeBanner: false,
title: 'Didvan',
theme: LightThemeConfig.themeData,

5
lib/models/enums.dart
View File

@ -3,3 +3,8 @@ enum AppState {
busy,
failed,
}
enum ButtonStyleMode {
primary,
flat,
}

25
lib/models/view/action_sheet_data.dart Normal file
View File

@ -0,0 +1,25 @@
import 'package:flutter/cupertino.dart';
class ActionSheetData {
final Widget content;
final String? confrimTitle;
final String? dismissTitle;
final VoidCallback? onConfirmed;
final VoidCallback? onDismissed;
final String title;
final IconData? titleIcon;
final Color? titleColor;
final bool hasDismissButton;
ActionSheetData({
required this.content,
required this.title,
this.confrimTitle,
this.onConfirmed,
this.titleColor,
this.hasDismissButton = true,
this.titleIcon,
this.dismissTitle,
this.onDismissed,
});
}

75
lib/pages/home/profile/settings/settings.dart
View File

@ -1,11 +1,15 @@
import 'package:day_night_time_picker/lib/constants.dart';
import 'package:day_night_time_picker/lib/daynight_timepicker.dart';
import 'package:didvan/config/design_config.dart';
import 'package:didvan/config/theme_data.dart';
import 'package:didvan/constants/app_icons.dart';
import 'package:didvan/constants/assets.dart';
import 'package:didvan/models/view/action_sheet_data.dart';
import 'package:didvan/models/view/app_bar_data.dart';
import 'package:didvan/pages/home/profile/settings/settings_state.dart';
import 'package:didvan/pages/home/profile/widgets/menu_item.dart';
import 'package:didvan/providers/theme_provider.dart';
import 'package:didvan/utils/actions_sheet.dart';
import 'package:didvan/widgets/didvan/card.dart';
import 'package:didvan/widgets/didvan/divider.dart';
import 'package:didvan/widgets/didvan/scaffold.dart';
@ -75,15 +79,78 @@ class Settings extends StatelessWidget {
);
}
Future<void> _pickTimeRange(context) async {
Future<void> _pickTimeRange(BuildContext context) async {
ActionSheetUtils.showBottomSheet(
data: ActionSheetData(
content: Row(
children: [
const SizedBox(width: 8),
Expanded(child: _timeFieldBuilder(context, 0)),
const SizedBox(width: 8),
const DidvanText('-'),
const SizedBox(width: 8),
Expanded(child: _timeFieldBuilder(context, 1)),
const SizedBox(width: 8),
],
),
title: 'زمان دریافت اعلان',
titleIcon: DidvanIcons.notification_regular,
),
);
}
Widget _timeFieldBuilder(BuildContext context, int index) {
final SettingsState state = context.read<SettingsState>();
Navigator.of(context).push(
return ChangeNotifierProvider.value(
value: state,
child: StatefulBuilder(
builder: (context, setState) => GestureDetector(
onTap: () async {
await _openTimePicker(context, index);
setState(() {});
},
child: Container(
alignment: Alignment.center,
padding: const EdgeInsets.all(24),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.splash,
borderRadius: DesignConfig.mediumBorderRadius,
border: Border.all(
color: Theme.of(context).colorScheme.border,
),
),
child: DidvanText(state.notificationTimeRange[index]),
),
),
),
);
}
Future<void> _openTimePicker(BuildContext context, int index) async {
final SettingsState state = context.read<SettingsState>();
await Navigator.of(context).push(
showPicker(
okText: 'تایید',
cancelText: 'بازگشت',
accentColor: Theme.of(context).colorScheme.primary,
okCancelStyle: Theme.of(context).textTheme.bodyText2!,
unselectedColor: Theme.of(context).colorScheme.text,
blurredBackground: true,
hourLabel: 'ساعت',
minuteLabel: 'دقیقه',
is24HrFormat: true,
iosStylePicker: true,
minuteInterval: MinuteInterval.FIFTEEN,
context: context,
value: const TimeOfDay(hour: 0, minute: 0),
themeData: Theme.of(context),
onChange: (time) {
String hour = time.toString().split(':')[0];
state.notificationTimeRange = [];
state.notificationTimeRange = state.notificationTimeRange
..replaceRange(
index,
index + 1,
['${time.hour}:${time.minute}'],
);
},
),
);

3
lib/pages/splash/splash.dart
View File

@ -1,7 +1,9 @@
import 'package:didvan/config/design_config.dart';
import 'package:didvan/main.dart';
import 'package:didvan/providers/theme_provider.dart';
import 'package:didvan/routes/routes.dart';
import 'package:didvan/services/app_initalizer.dart';
import 'package:didvan/utils/actions_sheet.dart';
import 'package:didvan/widgets/logos/didvan_horizontal_logo.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
@ -24,6 +26,7 @@ class _SplashState extends State<Splash> {
}
Future<void> _initialize() async {
ActionSheetUtils.context = navigatorKey.currentContext!;
await AppInitializer.setupServices();
final ThemeMode themeMode = await AppInitializer.initilizeSettings();
context.read<ThemeProvider>().themeMode = themeMode;

76
lib/utils/actions_sheet.dart
View File

@ -1,5 +1,12 @@
import 'package:didvan/config/design_config.dart';
import 'package:didvan/config/theme_data.dart';
import 'package:didvan/constants/assets.dart';
import 'package:didvan/main.dart';
import 'package:didvan/models/enums.dart';
import 'package:didvan/models/view/action_sheet_data.dart';
import 'package:didvan/widgets/didvan/button.dart';
import 'package:didvan/widgets/didvan/card.dart';
import 'package:didvan/widgets/didvan/text.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:rive/rive.dart';
@ -29,4 +36,73 @@ class ActionSheetUtils {
child: child,
);
}
static Future<void> showBottomSheet({required ActionSheetData data}) async {
await showModalBottomSheet(
context: context,
builder: (context) => Container(
padding: const EdgeInsets.all(20),
decoration: BoxDecoration(
color: Theme.of(context).colorScheme.surface,
borderRadius: const BorderRadius.vertical(
top: Radius.circular(
10,
),
),
),
child: Column(
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Center(
child: Container(
height: 3,
width: 50,
color: Theme.of(context).colorScheme.hint,
),
),
const SizedBox(height: 8),
Row(
children: [
if (data.titleIcon != null)
Icon(
data.titleIcon,
color:
data.titleColor ?? Theme.of(context).colorScheme.title,
),
if (data.titleIcon != null) const SizedBox(width: 8),
DidvanText(
data.title,
style: Theme.of(context).textTheme.subtitle1,
color: data.titleColor ?? Theme.of(context).colorScheme.title,
)
],
),
const SizedBox(height: 28),
data.content,
const SizedBox(height: 28),
Row(
children: [
if (data.hasDismissButton)
Expanded(
child: DidvanButton(
title: data.dismissTitle ?? 'بازگشت',
style: ButtonStyleMode.flat,
),
),
const SizedBox(width: 20),
Expanded(
child: DidvanButton(
style: ButtonStyleMode.primary,
onPressed: () {},
title: data.confrimTitle ?? 'تایید',
),
),
],
),
],
),
),
);
}
}

9
lib/widgets/didvan/button.dart
View File

@ -1,11 +1,18 @@
import 'package:didvan/config/design_config.dart';
import 'package:didvan/models/enums.dart';
import 'package:didvan/widgets/didvan/text.dart';
import 'package:flutter/material.dart';
class DidvanButton extends StatelessWidget {
final VoidCallback? onPressed;
final String? title;
const DidvanButton({Key? key, this.onPressed, this.title}) : super(key: key);
final ButtonStyleMode style;
const DidvanButton({
Key? key,
this.onPressed,
this.title,
this.style = ButtonStyleMode.primary,
}) : super(key: key);
@override
Widget build(BuildContext context) {