Merge branch 'test' into 'dev'
Test See merge request Didvan/didvan-app!5
This commit is contained in:
commit
b6c1bad0e7
|
|
@ -1,4 +1,3 @@
|
||||||
import 'dart:developer';
|
|
||||||
import 'dart:io';
|
import 'dart:io';
|
||||||
|
|
||||||
import 'package:didvan/models/enums.dart';
|
import 'package:didvan/models/enums.dart';
|
||||||
|
|
|
||||||
|
|
@ -102,7 +102,7 @@ class _TypingState extends State<_Typing> {
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
final state = context.read<DirectState>();
|
final state = context.watch<DirectState>();
|
||||||
return Row(
|
return Row(
|
||||||
children: [
|
children: [
|
||||||
Expanded(
|
Expanded(
|
||||||
|
|
@ -115,7 +115,6 @@ class _TypingState extends State<_Typing> {
|
||||||
),
|
),
|
||||||
child: state.text != null && state.text!.isNotEmpty
|
child: state.text != null && state.text!.isNotEmpty
|
||||||
? DidvanIconButton(
|
? DidvanIconButton(
|
||||||
key: const ValueKey(1),
|
|
||||||
icon: DidvanIcons.send_solid,
|
icon: DidvanIcons.send_solid,
|
||||||
onPressed: () {
|
onPressed: () {
|
||||||
_formKey.currentState!.reset();
|
_formKey.currentState!.reset();
|
||||||
|
|
@ -125,7 +124,6 @@ class _TypingState extends State<_Typing> {
|
||||||
color: Theme.of(context).colorScheme.focusedBorder,
|
color: Theme.of(context).colorScheme.focusedBorder,
|
||||||
)
|
)
|
||||||
: DidvanIconButton(
|
: DidvanIconButton(
|
||||||
key: const ValueKey(2),
|
|
||||||
icon: DidvanIcons.mic_solid,
|
icon: DidvanIcons.mic_solid,
|
||||||
onPressed: state.startRecording,
|
onPressed: state.startRecording,
|
||||||
size: 32,
|
size: 32,
|
||||||
|
|
|
||||||
|
|
@ -1,130 +1,26 @@
|
||||||
import 'package:didvan/constants/app_icons.dart';
|
import 'package:didvan/config/theme_data.dart';
|
||||||
import 'package:didvan/models/view/action_sheet_data.dart';
|
import 'package:didvan/constants/assets.dart';
|
||||||
import 'package:didvan/utils/action_sheet.dart';
|
|
||||||
import 'package:didvan/views/home/studio/studio_state.dart';
|
|
||||||
import 'package:didvan/views/home/studio/widgets/slider.dart';
|
|
||||||
import 'package:didvan/views/home/studio/widgets/tab_bar.dart';
|
|
||||||
import 'package:didvan/views/home/widgets/logo_app_bar.dart';
|
import 'package:didvan/views/home/widgets/logo_app_bar.dart';
|
||||||
import 'package:didvan/views/home/widgets/search_field.dart';
|
import 'package:didvan/views/widgets/state_handlers/empty_state.dart';
|
||||||
import 'package:didvan/views/widgets/didvan/divider.dart';
|
|
||||||
import 'package:didvan/views/widgets/didvan/icon_button.dart';
|
|
||||||
import 'package:didvan/views/widgets/didvan/radial_button.dart';
|
|
||||||
import 'package:didvan/views/widgets/item_title.dart';
|
|
||||||
import 'package:flutter/material.dart';
|
import 'package:flutter/material.dart';
|
||||||
import 'package:provider/provider.dart';
|
|
||||||
|
|
||||||
class Studio extends StatefulWidget {
|
class Studio extends StatelessWidget {
|
||||||
const Studio({Key? key}) : super(key: key);
|
const Studio({Key? key}) : super(key: key);
|
||||||
|
|
||||||
@override
|
|
||||||
State<Studio> createState() => _StudioState();
|
|
||||||
}
|
|
||||||
|
|
||||||
class _StudioState extends State<Studio> {
|
|
||||||
final FocusNode _focusNode = FocusNode();
|
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Widget build(BuildContext context) {
|
Widget build(BuildContext context) {
|
||||||
return CustomScrollView(
|
return Column(
|
||||||
slivers: [
|
|
||||||
SliverToBoxAdapter(
|
|
||||||
child: Row(
|
|
||||||
children: [
|
children: [
|
||||||
const Expanded(child: LogoAppBar(type: 'studio')),
|
const LogoAppBar(),
|
||||||
Padding(
|
Expanded(
|
||||||
padding:
|
child: EmptyState(
|
||||||
EdgeInsets.only(top: MediaQuery.of(context).padding.top),
|
asset: Assets.emptyStudio,
|
||||||
child: DidvanIconButton(
|
title: 'استودیو آینده',
|
||||||
icon: DidvanIcons.bookmark_regular,
|
subtitle: 'به زودی...',
|
||||||
onPressed: () {},
|
titleColor: Theme.of(context).colorScheme.title,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
],
|
],
|
||||||
),
|
|
||||||
),
|
|
||||||
const SliverToBoxAdapter(
|
|
||||||
child: StudioTabBar(),
|
|
||||||
),
|
|
||||||
SliverToBoxAdapter(
|
|
||||||
child: Padding(
|
|
||||||
padding: const EdgeInsets.all(16.0),
|
|
||||||
child: SearchField(
|
|
||||||
title: 'جستجو در استودیو',
|
|
||||||
onChanged: (value) {},
|
|
||||||
focusNode: _focusNode,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
const SliverToBoxAdapter(
|
|
||||||
child: StudioSlider(),
|
|
||||||
),
|
|
||||||
const SliverPadding(
|
|
||||||
padding: EdgeInsets.symmetric(horizontal: 16),
|
|
||||||
sliver: SliverToBoxAdapter(
|
|
||||||
child: DidvanDivider(
|
|
||||||
verticalPadding: 0,
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
SliverPadding(
|
|
||||||
padding: const EdgeInsets.symmetric(horizontal: 16),
|
|
||||||
sliver: SliverToBoxAdapter(
|
|
||||||
child: Row(
|
|
||||||
mainAxisAlignment: MainAxisAlignment.spaceBetween,
|
|
||||||
children: [
|
|
||||||
const ItemTitle(title: 'تازهترینها'),
|
|
||||||
DidvanIconButton(
|
|
||||||
gestureSize: 36,
|
|
||||||
icon: DidvanIcons.sort_regular,
|
|
||||||
onPressed: _showSortDialog,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
),
|
|
||||||
],
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
void _showSortDialog() {
|
|
||||||
final state = context.read<StudioState>();
|
|
||||||
ActionSheetUtils.showBottomSheet(
|
|
||||||
data: ActionSheetData(
|
|
||||||
content: StatefulBuilder(
|
|
||||||
builder: (context, setState) => Column(
|
|
||||||
children: [
|
|
||||||
DidvanRadialButton(
|
|
||||||
title: 'جدیدترینها',
|
|
||||||
onSelected: () => setState(
|
|
||||||
() => state.selectedSortTypeIndex = 0,
|
|
||||||
),
|
|
||||||
value: state.selectedSortTypeIndex == 0,
|
|
||||||
),
|
|
||||||
const SizedBox(height: 24),
|
|
||||||
DidvanRadialButton(
|
|
||||||
title: 'پربازدیدترینها',
|
|
||||||
onSelected: () => setState(
|
|
||||||
() => state.selectedSortTypeIndex = 1,
|
|
||||||
),
|
|
||||||
value: state.selectedSortTypeIndex == 1,
|
|
||||||
),
|
|
||||||
const SizedBox(height: 24),
|
|
||||||
DidvanRadialButton(
|
|
||||||
title: 'پربحثترینها',
|
|
||||||
onSelected: () => setState(
|
|
||||||
() => state.selectedSortTypeIndex = 2,
|
|
||||||
),
|
|
||||||
value: state.selectedSortTypeIndex == 2,
|
|
||||||
),
|
|
||||||
],
|
|
||||||
),
|
|
||||||
),
|
|
||||||
title: 'مرتبسازی',
|
|
||||||
titleIcon: DidvanIcons.sort_regular,
|
|
||||||
hasDismissButton: false,
|
|
||||||
confrimTitle: 'مرتب سازی',
|
|
||||||
onConfirmed: () {},
|
|
||||||
),
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
|
||||||
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
|
# In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
|
||||||
# Read more about iOS versioning at
|
# Read more about iOS versioning at
|
||||||
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
# https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
|
||||||
version: 1.0.0+1
|
version: 1.0.5+5
|
||||||
|
|
||||||
environment:
|
environment:
|
||||||
sdk: ">=2.12.0 <3.0.0"
|
sdk: ">=2.12.0 <3.0.0"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue